Index: remoting/protocol/chromium_port_allocator_factory.cc |
diff --git a/remoting/host/chromium_port_allocator_factory.cc b/remoting/protocol/chromium_port_allocator_factory.cc |
similarity index 73% |
rename from remoting/host/chromium_port_allocator_factory.cc |
rename to remoting/protocol/chromium_port_allocator_factory.cc |
index 377c48bfc3867a1d144b61ad53dd46ad66085d56..b2626119b532c0e95593d27772c4a81ad4ff1b52 100644 |
--- a/remoting/host/chromium_port_allocator_factory.cc |
+++ b/remoting/protocol/chromium_port_allocator_factory.cc |
@@ -1,8 +1,8 @@ |
-// Copyright 2014 The Chromium Authors. All rights reserved. |
+// Copyright 2015 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "remoting/host/chromium_port_allocator_factory.h" |
+#include "remoting/protocol/chromium_port_allocator_factory.h" |
#include "base/logging.h" |
#include "net/url_request/url_request_context_getter.h" |
@@ -10,19 +10,19 @@ |
#include "remoting/protocol/network_settings.h" |
namespace remoting { |
+namespace protocol { |
ChromiumPortAllocatorFactory::ChromiumPortAllocatorFactory( |
- const protocol::NetworkSettings& network_settings, |
+ const NetworkSettings& network_settings, |
scoped_refptr<net::URLRequestContextGetter> url_request_context_getter) |
: network_settings_(network_settings), |
- url_request_context_getter_(url_request_context_getter) { |
-} |
+ url_request_context_getter_(url_request_context_getter) {} |
ChromiumPortAllocatorFactory::~ChromiumPortAllocatorFactory() {} |
rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface> |
ChromiumPortAllocatorFactory::Create( |
- const protocol::NetworkSettings& network_settings, |
+ const NetworkSettings& network_settings, |
scoped_refptr<net::URLRequestContextGetter> url_request_context_getter) { |
rtc::RefCountedObject<ChromiumPortAllocatorFactory>* allocator_factory = |
new rtc::RefCountedObject<ChromiumPortAllocatorFactory>( |
@@ -33,13 +33,12 @@ ChromiumPortAllocatorFactory::Create( |
cricket::PortAllocator* ChromiumPortAllocatorFactory::CreatePortAllocator( |
const std::vector<StunConfiguration>& stun_servers, |
const std::vector<TurnConfiguration>& turn_configurations) { |
- scoped_ptr<protocol::ChromiumPortAllocator> port_allocator( |
- protocol::ChromiumPortAllocator::Create(url_request_context_getter_, |
+ scoped_ptr<ChromiumPortAllocator> port_allocator( |
+ ChromiumPortAllocator::Create(url_request_context_getter_, |
network_settings_)); |
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(); |
+ for (auto stun_it = stun_servers.begin(); stun_it != stun_servers.end(); |
++stun_it) { |
stun_hosts.push_back(stun_it->server); |
} |
@@ -51,5 +50,6 @@ cricket::PortAllocator* ChromiumPortAllocatorFactory::CreatePortAllocator( |
return port_allocator.release(); |
} |
+} // namespace protocol |
} // namespace remoting |