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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/protocol/chromium_port_allocator_factory.h" 5 #include "remoting/protocol/chromium_port_allocator_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "net/url_request/url_request_context_getter.h" 8 #include "net/url_request/url_request_context_getter.h"
9 #include "remoting/protocol/chromium_port_allocator.h" 9 #include "remoting/protocol/chromium_port_allocator.h"
10 #include "remoting/protocol/network_settings.h" 10 #include "remoting/protocol/network_settings.h"
11 11
12 namespace remoting { 12 namespace remoting {
13 namespace protocol { 13 namespace protocol {
14 14
15 ChromiumPortAllocatorFactory::ChromiumPortAllocatorFactory( 15 ChromiumPortAllocatorFactory::ChromiumPortAllocatorFactory(
16 const NetworkSettings& network_settings, 16 const NetworkSettings& network_settings,
17 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter) 17 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter)
18 : network_settings_(network_settings), 18 : network_settings_(network_settings),
19 url_request_context_getter_(url_request_context_getter) {} 19 url_request_context_getter_(url_request_context_getter) {}
20 20
21 ChromiumPortAllocatorFactory::~ChromiumPortAllocatorFactory() {} 21 ChromiumPortAllocatorFactory::~ChromiumPortAllocatorFactory() {}
22 22
23 scoped_ptr<PortAllocatorFactory> ChromiumPortAllocatorFactory::Create( 23 rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
24 ChromiumPortAllocatorFactory::Create(
24 const NetworkSettings& network_settings, 25 const NetworkSettings& network_settings,
25 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter) { 26 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter) {
26 return scoped_ptr<PortAllocatorFactory>(new ChromiumPortAllocatorFactory( 27 rtc::RefCountedObject<ChromiumPortAllocatorFactory>* allocator_factory =
27 network_settings, url_request_context_getter)); 28 new rtc::RefCountedObject<ChromiumPortAllocatorFactory>(
29 network_settings, url_request_context_getter);
30 return allocator_factory;
28 } 31 }
29 32
30 cricket::PortAllocator* ChromiumPortAllocatorFactory::CreatePortAllocator() { 33 cricket::PortAllocator* ChromiumPortAllocatorFactory::CreatePortAllocator(
34 const std::vector<StunConfiguration>& stun_servers,
35 const std::vector<TurnConfiguration>& turn_configurations) {
31 scoped_ptr<ChromiumPortAllocator> port_allocator( 36 scoped_ptr<ChromiumPortAllocator> port_allocator(
32 ChromiumPortAllocator::Create(url_request_context_getter_, 37 ChromiumPortAllocator::Create(url_request_context_getter_,
33 network_settings_)); 38 network_settings_));
39
40 std::vector<rtc::SocketAddress> stun_hosts;
41 for (auto stun_it = stun_servers.begin(); stun_it != stun_servers.end();
42 ++stun_it) {
43 stun_hosts.push_back(stun_it->server);
44 }
45 port_allocator->SetStunHosts(stun_hosts);
46
47 // TODO(aiguha): Figure out how to translate |turn_configurations| into
48 // turn hosts so we can set |port_allocator|'s relay hosts.
49
34 return port_allocator.release(); 50 return port_allocator.release();
35 } 51 }
36 52
37 } // namespace protocol 53 } // namespace protocol
38 } // namespace remoting 54 } // namespace remoting
39 55
OLDNEW
« 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