Revert "Update webrtc&libjingle 6774:6799."

remoting/host/chromium_port_allocator_factory.cc

Index: remoting/host/chromium_port_allocator_factory.cc
diff --git a/remoting/host/chromium_port_allocator_factory.cc b/remoting/host/chromium_port_allocator_factory.cc
index 377c48bfc3867a1d144b61ad53dd46ad66085d56..a7ed61e3ad8da32dca602977aa1f62e1904e364c 100644
--- a/remoting/host/chromium_port_allocator_factory.cc
+++ b/remoting/host/chromium_port_allocator_factory.cc
@@ -20,12 +20,12 @@ ChromiumPortAllocatorFactory::ChromiumPortAllocatorFactory(
 
 ChromiumPortAllocatorFactory::~ChromiumPortAllocatorFactory() {}
 
-rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
+talk_base::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
 ChromiumPortAllocatorFactory::Create(
     const protocol::NetworkSettings& network_settings,
     scoped_refptr<net::URLRequestContextGetter> url_request_context_getter) {
-  rtc::RefCountedObject<ChromiumPortAllocatorFactory>* allocator_factory =
-      new rtc::RefCountedObject<ChromiumPortAllocatorFactory>(
+  talk_base::RefCountedObject<ChromiumPortAllocatorFactory>* allocator_factory =
+      new talk_base::RefCountedObject<ChromiumPortAllocatorFactory>(
           network_settings, url_request_context_getter);
   return allocator_factory;
 }
@@ -37,7 +37,7 @@ cricket::PortAllocator* ChromiumPortAllocatorFactory::CreatePortAllocator(
       protocol::ChromiumPortAllocator::Create(url_request_context_getter_,
                                     network_settings_));
 
-  std::vector<rtc::SocketAddress> stun_hosts;
+  std::vector<talk_base::SocketAddress> stun_hosts;
   typedef std::vector<StunConfiguration>::const_iterator StunIt;
   for (StunIt stun_it = stun_servers.begin(); stun_it != stun_servers.end();
        ++stun_it) {