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/mediastreamhandler_unittest.cc

diff --git a/talk/app/webrtc/mediastreamhandler_unittest.cc b/talk/app/webrtc/mediastreamhandler_unittest.cc
index 9a53f35..7727086 100644
--- a/talk/app/webrtc/mediastreamhandler_unittest.cc
+++ b/talk/app/webrtc/mediastreamhandler_unittest.cc
@@ -35,7 +35,7 @@
 #include "talk/app/webrtc/streamcollection.h"
 #include "talk/app/webrtc/videosource.h"
 #include "talk/app/webrtc/videotrack.h"
-#include "talk/base/gunit.h"
+#include "webrtc/base/gunit.h"
 #include "talk/media/base/fakevideocapturer.h"
 #include "talk/media/base/mediachannel.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -79,8 +79,8 @@
 
 class FakeVideoSource : public Notifier<VideoSourceInterface> {
  public:
-  static talk_base::scoped_refptr<FakeVideoSource> Create() {
-    return new talk_base::RefCountedObject<FakeVideoSource>();
+  static rtc::scoped_refptr<FakeVideoSource> Create() {
+    return new rtc::RefCountedObject<FakeVideoSource>();
   }
   virtual cricket::VideoCapturer* GetVideoCapturer() {
     return &fake_capturer_;
@@ -109,7 +109,7 @@
 
   virtual void SetUp() {
     stream_ = MediaStream::Create(kStreamLabel1);
-    talk_base::scoped_refptr<VideoSourceInterface> source(
+    rtc::scoped_refptr<VideoSourceInterface> source(
         FakeVideoSource::Create());
     video_track_ = VideoTrack::Create(kVideoTrackId, source);
     EXPECT_TRUE(stream_->AddTrack(video_track_));
@@ -175,9 +175,9 @@
   MockAudioProvider audio_provider_;
   MockVideoProvider video_provider_;
   MediaStreamHandlerContainer handlers_;
-  talk_base::scoped_refptr<MediaStreamInterface> stream_;
-  talk_base::scoped_refptr<VideoTrackInterface> video_track_;
-  talk_base::scoped_refptr<AudioTrackInterface> audio_track_;
+  rtc::scoped_refptr<MediaStreamInterface> stream_;
+  rtc::scoped_refptr<VideoTrackInterface> video_track_;
+  rtc::scoped_refptr<AudioTrackInterface> audio_track_;
 };
 
 // Test that |audio_provider_| is notified when an audio track is associated