Add TransportContext class.

remoting/protocol/chromium_port_allocator.cc

 // Copyright 2014 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/protocol/chromium_port_allocator.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "remoting/protocol/chromium_socket_factory.h"
-#include "remoting/protocol/network_settings.h"
 #include "url/gurl.h"
 
 namespace remoting {
 namespace protocol {
 
 namespace {
 
 class ChromiumPortAllocatorSession
     : public cricket::HttpPortAllocatorSessionBase,
       public net::URLFetcherDelegate {
@@ skipping 98 matching lines @@
     return;
   }
 
   ReceiveSessionResponse(response);
 }
 
 }  // namespace
 
 // static
 scoped_ptr<ChromiumPortAllocator> ChromiumPortAllocator::Create(
-    const scoped_refptr<net::URLRequestContextGetter>& url_context,
-    const NetworkSettings& network_settings) {
+    const scoped_refptr<net::URLRequestContextGetter>& url_context) {
   scoped_ptr<rtc::NetworkManager> network_manager(
       new rtc::BasicNetworkManager());
   scoped_ptr<rtc::PacketSocketFactory> socket_factory(
       new ChromiumPacketSocketFactory());
-  scoped_ptr<ChromiumPortAllocator> result(
-      new ChromiumPortAllocator(url_context, network_manager.Pass(),
-                            socket_factory.Pass()));
-
-  // We always use PseudoTcp to provide a reliable channel. It provides poor
-  // performance when combined with TCP-based transport, so we have to disable
-  // TCP ports. ENABLE_SHARED_UFRAG flag is specified so that the same username
-  // fragment is shared between all candidates for this channel.
-  int flags = cricket::PORTALLOCATOR_DISABLE_TCP |
-              cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG |
-              cricket::PORTALLOCATOR_ENABLE_IPV6;
-
-  if (!(network_settings.flags & NetworkSettings::NAT_TRAVERSAL_STUN))
-    flags |= cricket::PORTALLOCATOR_DISABLE_STUN;
-
-  if (!(network_settings.flags & NetworkSettings::NAT_TRAVERSAL_RELAY))
-    flags |= cricket::PORTALLOCATOR_DISABLE_RELAY;
-
-  result->set_flags(flags);
-  result->SetPortRange(network_settings.port_range.min_port,
-                       network_settings.port_range.max_port);
-
-  return result.Pass();
+  return make_scoped_ptr(new ChromiumPortAllocator(
+      url_context, network_manager.Pass(), socket_factory.Pass()));
 }
 
 ChromiumPortAllocator::ChromiumPortAllocator(
     const scoped_refptr<net::URLRequestContextGetter>& url_context,
     scoped_ptr<rtc::NetworkManager> network_manager,
     scoped_ptr<rtc::PacketSocketFactory> socket_factory)
     : HttpPortAllocatorBase(network_manager.get(),
                             socket_factory.get(),
                             std::string()),
       url_context_(url_context),
       network_manager_(network_manager.Pass()),
       socket_factory_(socket_factory.Pass()) {}
 
-ChromiumPortAllocator::~ChromiumPortAllocator() {
-}
+ChromiumPortAllocator::~ChromiumPortAllocator() {}
 
 cricket::PortAllocatorSession* ChromiumPortAllocator::CreateSessionInternal(
     const std::string& content_name,
     int component,
     const std::string& ice_username_fragment,
     const std::string& ice_password) {
   return new ChromiumPortAllocatorSession(
       this, content_name, component, ice_username_fragment, ice_password,
       stun_hosts(), relay_hosts(), relay_token(), url_context_);
 }
 
+ChromiumPortAllocatorFactory::ChromiumPortAllocatorFactory(
+    scoped_refptr<net::URLRequestContextGetter> url_request_context_getter)
+    : url_request_context_getter_(url_request_context_getter) {}
+
+ChromiumPortAllocatorFactory::~ChromiumPortAllocatorFactory() {}
+
+scoped_ptr<cricket::HttpPortAllocatorBase>
+ChromiumPortAllocatorFactory::CreatePortAllocator() {
+  return ChromiumPortAllocator::Create(url_request_context_getter_);
+}
+
 }  // namespace protocol
 }  // namespace remoting