Move PortAllocator creation out of LibjingleTransportFactory.

Host will have host-specific port allocator, so PortAllocator creation
has to be moved out of protocol code. Since  PortAllocator needs to be
configured with network settings (nat traversal and port range), I
refactored how these settings are passed between layers.

BUG=103991

Review URL: https://chromiumcodereview.appspot.com/10233021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134608 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 32 deletions

diff --git a/remoting/protocol/session_manager.h b/remoting/protocol/session_manager.h
index 0efc553..eb0c9db 100644
--- a/remoting/protocol/session_manager.h
+++ b/remoting/protocol/session_manager.h
@@ -70,36 +70,6 @@ namespace protocol {
 class Authenticator;
 class AuthenticatorFactory;
 
-// TODO(sergeyu): Remove this struct and use TransportConfig instead.
-struct NetworkSettings {
-  NetworkSettings()
-      : nat_traversal_mode(TransportConfig::NAT_TRAVERSAL_DISABLED),
-        min_port(0),
-        max_port(0) {
-  }
-
-  explicit NetworkSettings(bool allow_nat_traversal)
-      : nat_traversal_mode(allow_nat_traversal ?
-                           TransportConfig::NAT_TRAVERSAL_ENABLED :
-                           TransportConfig::NAT_TRAVERSAL_DISABLED),
-        min_port(0),
-        max_port(0) {
-  }
-
-  explicit NetworkSettings(TransportConfig::NatTraversalMode nat_traversal_mode)
-      : nat_traversal_mode(nat_traversal_mode),
-        min_port(0),
-        max_port(0) {
-  }
-
-  TransportConfig::NatTraversalMode nat_traversal_mode;
-
-  // |min_port| and |max_port| specify range (inclusive) of ports used by
-  // P2P sessions. Any port can be used when both values are set to 0.
-  int min_port;
-  int max_port;
-};
-
 // Generic interface for Chromoting session manager.
 //
 // TODO(sergeyu): Split this into two separate interfaces: one for the
@@ -150,8 +120,7 @@ class SessionManager : public base::NonThreadSafe {
   // Initializes the session client. Caller retains ownership of the
   // |signal_strategy| and |listener|.
   virtual void Init(SignalStrategy* signal_strategy,
-                    Listener* listener,
-                    const NetworkSettings& network_settings) = 0;
+                    Listener* listener) = 0;
 
   // Tries to create a session to the host |jid|. Must be called only
   // after initialization has finished successfully, i.e. after