commit d4e598d57aed714a599444a7eab5e8fdde52a950
author buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jul 29 17:36:52 2014
committer buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jul 29 17:36:52 2014
tree 67b1dcdcff833ff9e790a23ae35f5f1edeea0c28
parent fc8b0871d9142bb2ca66d4e6ebb278083141e9d3

(Auto)update libjingle 72097588-> 72159069

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6799 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/app/webrtc/mediastreaminterface.h

diff --git a/talk/app/webrtc/mediastreaminterface.h b/talk/app/webrtc/mediastreaminterface.h
index a3439c5..5d6c659 100644
--- a/talk/app/webrtc/mediastreaminterface.h
+++ b/talk/app/webrtc/mediastreaminterface.h
@@ -37,9 +37,9 @@
 #include <string>
 #include <vector>
 
-#include "talk/base/basictypes.h"
-#include "talk/base/refcount.h"
-#include "talk/base/scoped_ref_ptr.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/refcount.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 
 namespace cricket {
 
@@ -73,7 +73,7 @@
 // provide media. A source can be shared with multiple tracks.
 // TODO(perkj): Implement sources for local and remote audio tracks and
 // remote video tracks.
-class MediaSourceInterface : public talk_base::RefCountInterface,
+class MediaSourceInterface : public rtc::RefCountInterface,
                              public NotifierInterface {
  public:
   enum SourceState {
@@ -90,7 +90,7 @@
 };
 
 // Information about a track.
-class MediaStreamTrackInterface : public talk_base::RefCountInterface,
+class MediaStreamTrackInterface : public rtc::RefCountInterface,
                                   public NotifierInterface {
  public:
   enum TrackState {
@@ -176,7 +176,7 @@
 
 // Interface of the audio processor used by the audio track to collect
 // statistics.
-class AudioProcessorInterface : public talk_base::RefCountInterface {
+class AudioProcessorInterface : public rtc::RefCountInterface {
  public:
   struct AudioProcessorStats {
     AudioProcessorStats() : typing_noise_detected(false),
@@ -220,7 +220,7 @@
   // Get the audio processor used by the audio track. Return NULL if the track
   // does not have any processor.
   // TODO(xians): Make the interface pure virtual.
-  virtual talk_base::scoped_refptr<AudioProcessorInterface>
+  virtual rtc::scoped_refptr<AudioProcessorInterface>
       GetAudioProcessor() { return NULL; }
 
   // Get a pointer to the audio renderer of this AudioTrack.
@@ -233,21 +233,21 @@
   virtual ~AudioTrackInterface() {}
 };
 
-typedef std::vector<talk_base::scoped_refptr<AudioTrackInterface> >
+typedef std::vector<rtc::scoped_refptr<AudioTrackInterface> >
     AudioTrackVector;
-typedef std::vector<talk_base::scoped_refptr<VideoTrackInterface> >
+typedef std::vector<rtc::scoped_refptr<VideoTrackInterface> >
     VideoTrackVector;
 
-class MediaStreamInterface : public talk_base::RefCountInterface,
+class MediaStreamInterface : public rtc::RefCountInterface,
                              public NotifierInterface {
  public:
   virtual std::string label() const = 0;
 
   virtual AudioTrackVector GetAudioTracks() = 0;
   virtual VideoTrackVector GetVideoTracks() = 0;
-  virtual talk_base::scoped_refptr<AudioTrackInterface>
+  virtual rtc::scoped_refptr<AudioTrackInterface>
       FindAudioTrack(const std::string& track_id) = 0;
-  virtual talk_base::scoped_refptr<VideoTrackInterface>
+  virtual rtc::scoped_refptr<VideoTrackInterface>
       FindVideoTrack(const std::string& track_id) = 0;
 
   virtual bool AddTrack(AudioTrackInterface* track) = 0;