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

Unified Diff: remoting/protocol/chromium_port_allocator_factory.cc

Issue 1514853003: Revert of Removing references to webrtc::PortAllocatorFactoryInterface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/protocol/chromium_port_allocator_factory.h ('k') | remoting/protocol/port_allocator_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/chromium_port_allocator_factory.cc
diff --git a/remoting/protocol/chromium_port_allocator_factory.cc b/remoting/protocol/chromium_port_allocator_factory.cc
index 32c980b3f05e5dba669a2866944e14e5f4864fec..b2626119b532c0e95593d27772c4a81ad4ff1b52 100644
--- a/remoting/protocol/chromium_port_allocator_factory.cc
+++ b/remoting/protocol/chromium_port_allocator_factory.cc
@@ -20,17 +20,33 @@
ChromiumPortAllocatorFactory::~ChromiumPortAllocatorFactory() {}
-scoped_ptr<PortAllocatorFactory> ChromiumPortAllocatorFactory::Create(
+rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
+ChromiumPortAllocatorFactory::Create(
const NetworkSettings& network_settings,
scoped_refptr<net::URLRequestContextGetter> url_request_context_getter) {
- return scoped_ptr<PortAllocatorFactory>(new ChromiumPortAllocatorFactory(
- network_settings, url_request_context_getter));
+ rtc::RefCountedObject<ChromiumPortAllocatorFactory>* allocator_factory =
+ new rtc::RefCountedObject<ChromiumPortAllocatorFactory>(
+ network_settings, url_request_context_getter);
+ return allocator_factory;
}
-cricket::PortAllocator* ChromiumPortAllocatorFactory::CreatePortAllocator() {
+cricket::PortAllocator* ChromiumPortAllocatorFactory::CreatePortAllocator(
+ const std::vector<StunConfiguration>& stun_servers,
+ const std::vector<TurnConfiguration>& turn_configurations) {
scoped_ptr<ChromiumPortAllocator> port_allocator(
ChromiumPortAllocator::Create(url_request_context_getter_,
network_settings_));
+
+ std::vector<rtc::SocketAddress> stun_hosts;
+ for (auto stun_it = stun_servers.begin(); stun_it != stun_servers.end();
+ ++stun_it) {
+ stun_hosts.push_back(stun_it->server);
+ }
+ port_allocator->SetStunHosts(stun_hosts);
+
+ // TODO(aiguha): Figure out how to translate |turn_configurations| into
+ // turn hosts so we can set |port_allocator|'s relay hosts.
+
return port_allocator.release();
}
« no previous file with comments | « remoting/protocol/chromium_port_allocator_factory.h ('k') | remoting/protocol/port_allocator_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698