Revert "Update webrtc&libjingle 6774:6799."

content/renderer/media/mock_peer_connection_impl.cc

Index: content/renderer/media/mock_peer_connection_impl.cc
diff --git a/content/renderer/media/mock_peer_connection_impl.cc b/content/renderer/media/mock_peer_connection_impl.cc
index 831571b870373d86da09fa0476d7280f04e84068..7a09ea36126bb51b6c0cbd1e6059d2b98746ae2a 100644
--- a/content/renderer/media/mock_peer_connection_impl.cc
+++ b/content/renderer/media/mock_peer_connection_impl.cc
@@ -75,7 +75,7 @@ class MockStreamCollection : public webrtc::StreamCollectionInterface {
   virtual ~MockStreamCollection() {}
 
  private:
-  typedef std::vector<rtc::scoped_refptr<MediaStreamInterface> >
+  typedef std::vector<talk_base::scoped_refptr<MediaStreamInterface> >
       StreamVector;
   StreamVector streams_;
 };
@@ -194,7 +194,7 @@ class MockDtmfSender : public DtmfSenderInterface {
   virtual ~MockDtmfSender() {}
 
  private:
-  rtc::scoped_refptr<AudioTrackInterface> track_;
+  talk_base::scoped_refptr<AudioTrackInterface> track_;
   DtmfSenderObserverInterface* observer_;
   std::string tones_;
   int duration_;
@@ -207,8 +207,8 @@ const char MockPeerConnectionImpl::kDummyAnswer[] = "dummy answer";
 MockPeerConnectionImpl::MockPeerConnectionImpl(
     MockPeerConnectionDependencyFactory* factory)
     : dependency_factory_(factory),
-      local_streams_(new rtc::RefCountedObject<MockStreamCollection>),
-      remote_streams_(new rtc::RefCountedObject<MockStreamCollection>),
+      local_streams_(new talk_base::RefCountedObject<MockStreamCollection>),
+      remote_streams_(new talk_base::RefCountedObject<MockStreamCollection>),
       hint_audio_(false),
       hint_video_(false),
       getstats_result_(true),
@@ -221,12 +221,12 @@ MockPeerConnectionImpl::MockPeerConnectionImpl(
 
 MockPeerConnectionImpl::~MockPeerConnectionImpl() {}
 
-rtc::scoped_refptr<webrtc::StreamCollectionInterface>
+talk_base::scoped_refptr<webrtc::StreamCollectionInterface>
 MockPeerConnectionImpl::local_streams() {
   return local_streams_;
 }
 
-rtc::scoped_refptr<webrtc::StreamCollectionInterface>
+talk_base::scoped_refptr<webrtc::StreamCollectionInterface>
 MockPeerConnectionImpl::remote_streams() {
   return remote_streams_;
 }
@@ -247,18 +247,18 @@ void MockPeerConnectionImpl::RemoveStream(
   local_streams_->RemoveStream(local_stream);
 }
 
-rtc::scoped_refptr<DtmfSenderInterface>
+talk_base::scoped_refptr<DtmfSenderInterface>
 MockPeerConnectionImpl::CreateDtmfSender(AudioTrackInterface* track) {
   if (!track) {
     return NULL;
   }
-  return new rtc::RefCountedObject<MockDtmfSender>(track);
+  return new talk_base::RefCountedObject<MockDtmfSender>(track);
 }
 
-rtc::scoped_refptr<webrtc::DataChannelInterface>
+talk_base::scoped_refptr<webrtc::DataChannelInterface>
 MockPeerConnectionImpl::CreateDataChannel(const std::string& label,
                       const webrtc::DataChannelInit* config) {
-  return new rtc::RefCountedObject<MockDataChannel>(label, config);
+  return new talk_base::RefCountedObject<MockDataChannel>(label, config);
 }
 
 bool MockPeerConnectionImpl::GetStats(