Index: remoting/protocol/chromium_port_allocator_factory.h |
diff --git a/remoting/host/chromium_port_allocator_factory.h b/remoting/protocol/chromium_port_allocator_factory.h |
similarity index 72% |
rename from remoting/host/chromium_port_allocator_factory.h |
rename to remoting/protocol/chromium_port_allocator_factory.h |
index 85b58d27e9d1f71cd7f1819595cbe281e96fdfa7..bbfa1b7f838052b8e7f6dd97eba6b79ed0412458 100644 |
--- a/remoting/host/chromium_port_allocator_factory.h |
+++ b/remoting/protocol/chromium_port_allocator_factory.h |
@@ -1,11 +1,13 @@ |
-// 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. |
-#ifndef REMOTING_HOST_CHROMIUM_PORT_ALLOCATOR_FACTORY_H_ |
-#define REMOTING_HOST_CHROMIUM_PORT_ALLOCATOR_FACTORY_H_ |
+#ifndef REMOTING_PROTOCOL_CHROMIUM_PORT_ALLOCATOR_FACTORY_H_ |
+#define REMOTING_PROTOCOL_CHROMIUM_PORT_ALLOCATOR_FACTORY_H_ |
+#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
+#include "remoting/protocol/network_settings.h" |
#include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h" |
namespace net { |
@@ -13,16 +15,13 @@ class URLRequestContextGetter; |
} // namespace net |
namespace remoting { |
- |
namespace protocol { |
-struct NetworkSettings; |
-} // namespace protocol |
class ChromiumPortAllocatorFactory |
: public webrtc::PortAllocatorFactoryInterface { |
public: |
static rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface> Create( |
- const protocol::NetworkSettings& network_settings, |
+ const NetworkSettings& network_settings, |
scoped_refptr<net::URLRequestContextGetter> url_request_context_getter); |
// webrtc::PortAllocatorFactoryInterface implementation. |
@@ -32,18 +31,19 @@ class ChromiumPortAllocatorFactory |
protected: |
ChromiumPortAllocatorFactory( |
- const protocol::NetworkSettings& network_settings, |
+ const NetworkSettings& network_settings, |
scoped_refptr<net::URLRequestContextGetter> url_request_context_getter); |
~ChromiumPortAllocatorFactory() override; |
private: |
- const protocol::NetworkSettings& network_settings_; |
+ NetworkSettings network_settings_; |
scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_; |
DISALLOW_COPY_AND_ASSIGN(ChromiumPortAllocatorFactory); |
}; |
+} // namespace protocol |
} // namespace remoting |
-#endif // REMOTING_HOST_CHROMIUM_PORT_ALLOCATOR_FACTORY_H_ |
+#endif // REMOTING_PROTOCOL_CHROMIUM_PORT_ALLOCATOR_FACTORY_H_ |