Move PortAllocator creation out of LibjingleTransportFactory.

remoting/host/simple_host_process.cc

 // Copyright (c) 2012 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.
 //
 // This is an application of a minimal host process in a Chromoting
 // system. It serves the purpose of gluing different pieces together
 // to make a functional host process for testing.
 //
 // It peforms the following functionality:
 // 1. Connect to the GTalk network and register the machine as a host.
@@ skipping 44 matching lines @@
 #elif defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #elif defined(OS_WIN)
 // TODO(garykac) Make simple host into a proper GUI app on Windows so that we
 // have an hModule for the dialog resource.
 HMODULE g_hModule = NULL;
 #endif
 
 using remoting::protocol::CandidateSessionConfig;
 using remoting::protocol::ChannelConfig;
-using remoting::protocol::NetworkSettings;
 
 namespace {
 
 const FilePath::CharType kDefaultConfigPath[] =
     FILE_PATH_LITERAL(".ChromotingConfig.json");
 
 const char kHomeDrive[] = "HOMEDRIVE";
 const char kHomePath[] = "HOMEPATH";
 
 const char kFakeSwitchName[] = "fake";
@@ skipping 270 matching lines @@
       LOG(ERROR) << "Unknown video codec: " << video_codec;
       return 1;
     }
     config->mutable_video_configs()->push_back(ChannelConfig(
         transport, remoting::protocol::kDefaultStreamVersion, codec));
     simple_host.set_protocol_config(config.release());
   }
 
   simple_host.network_settings()->nat_traversal_mode =
       cmd_line->HasSwitch(kDisableNatTraversalSwitchName) ?
-      remoting::protocol::TransportConfig::NAT_TRAVERSAL_DISABLED :
-      remoting::protocol::TransportConfig::NAT_TRAVERSAL_ENABLED;
+      remoting::NetworkSettings::NAT_TRAVERSAL_DISABLED :
+      remoting::NetworkSettings::NAT_TRAVERSAL_ENABLED;
 
   if (cmd_line->HasSwitch(kMinPortSwitchName)) {
     std::string min_port_str =
         cmd_line->GetSwitchValueASCII(kMinPortSwitchName);
     int min_port = 0;
     if (!base::StringToInt(min_port_str, &min_port) ||
         min_port < 0 || min_port > 65535) {
       LOG(ERROR) << "Invalid min-port value: " << min_port
                  << ". Expected integer in range [0, 65535].";
       return 1;
     }
     simple_host.network_settings()->min_port = min_port;
   }
 
   if (cmd_line->HasSwitch(kMaxPortSwitchName)) {
     std::string max_port_str =
         cmd_line->GetSwitchValueASCII(kMaxPortSwitchName);
     int max_port = 0;
     if (!base::StringToInt(max_port_str, &max_port) ||
         max_port < 0 || max_port > 65535) {
       LOG(ERROR) << "Invalid max-port value: " << max_port
                  << ". Expected integer in range [0, 65535].";
       return 1;
     }
     simple_host.network_settings()->max_port = max_port;
   }
 
   return simple_host.Run();
 }