Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(247)

Unified Diff: remoting/host/chromium_port_allocator_factory.cc

Issue 450463002: Update webrtc&libjingle 6774:6825. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/chromium_port_allocator_factory.h ('k') | remoting/protocol/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/chromium_port_allocator_factory.cc
===================================================================
--- remoting/host/chromium_port_allocator_factory.cc (revision 287594)
+++ remoting/host/chromium_port_allocator_factory.cc (working copy)
@@ -20,12 +20,12 @@
ChromiumPortAllocatorFactory::~ChromiumPortAllocatorFactory() {}
-talk_base::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
+rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
ChromiumPortAllocatorFactory::Create(
const protocol::NetworkSettings& network_settings,
scoped_refptr<net::URLRequestContextGetter> url_request_context_getter) {
- talk_base::RefCountedObject<ChromiumPortAllocatorFactory>* allocator_factory =
- new talk_base::RefCountedObject<ChromiumPortAllocatorFactory>(
+ rtc::RefCountedObject<ChromiumPortAllocatorFactory>* allocator_factory =
+ new rtc::RefCountedObject<ChromiumPortAllocatorFactory>(
network_settings, url_request_context_getter);
return allocator_factory;
}
@@ -37,7 +37,7 @@
protocol::ChromiumPortAllocator::Create(url_request_context_getter_,
network_settings_));
- std::vector<talk_base::SocketAddress> stun_hosts;
+ std::vector<rtc::SocketAddress> stun_hosts;
typedef std::vector<StunConfiguration>::const_iterator StunIt;
for (StunIt stun_it = stun_servers.begin(); stun_it != stun_servers.end();
++stun_it) {
« no previous file with comments | « remoting/host/chromium_port_allocator_factory.h ('k') | remoting/protocol/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698