Merging BaseSession code into WebRtcSession.

talk/app/webrtc/statscollector.h

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 136 matching lines @@
 
   // Helper method to update the timestamp of track records.
   void UpdateTrackReports();
 
   // A collection for all of our stats reports.
   StatsCollection reports_;
   TrackIdMap track_ids_;
   // Raw pointer to the session the statistics are gathered from.
   WebRtcSession* const session_;
   double stats_gathering_started_;
-  cricket::ProxyTransportMap proxy_to_transport_;
+  ProxyTransportMap proxy_to_transport_;
 
   // TODO(tommi): We appear to be holding on to raw pointers to reference
   // counted objects?  We should be using scoped_refptr here.
   typedef std::vector<std::pair<AudioTrackInterface*, uint32_t> >
       LocalAudioTrackVector;
   LocalAudioTrackVector local_audio_tracks_;
 };
 
 }  // namespace webrtc
 
 #endif  // TALK_APP_WEBRTC_STATSCOLLECTOR_H_