Move PortAllocator creation out of LibjingleTransportFactory.

remoting/protocol/pepper_transport_factory.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.
 
 #include "remoting/protocol/pepper_transport_factory.h"
 
 #include "base/bind.h"
 #include "crypto/hmac.h"
 #include "jingle/glue/utils.h"
 #include "net/base/cert_status_flags.h"
@@ skipping 131 matching lines @@
   if (transport->SetProperty(PP_TRANSPORTPROPERTY_TCP_NO_DELAY,
                              pp::Var(true)) != PP_OK) {
     LOG(ERROR) << "Failed to set TCP_NODELAY";
   }
 
   if (transport->SetProperty(PP_TRANSPORTPROPERTY_TCP_ACK_DELAY,
                              pp::Var(kTcpAckDelayMilliseconds)) != PP_OK) {
     LOG(ERROR) << "Failed to set TCP ACK delay.";
   }
 
-  if (config_.nat_traversal_mode == TransportConfig::NAT_TRAVERSAL_ENABLED) {
-    if (transport->SetProperty(
-            PP_TRANSPORTPROPERTY_STUN_SERVER,
-            pp::Var(config_.stun_server)) != PP_OK) {
-      LOG(ERROR) << "Failed to set STUN server.";
-    }
+  if (transport->SetProperty(
+          PP_TRANSPORTPROPERTY_STUN_SERVER,
+          pp::Var(config_.stun_server)) != PP_OK) {
+    LOG(ERROR) << "Failed to set STUN server.";
+  }
 
-    if (transport->SetProperty(
-            PP_TRANSPORTPROPERTY_RELAY_SERVER,
-            pp::Var(config_.relay_server)) != PP_OK) {
-      LOG(ERROR) << "Failed to set relay server.";
-    }
+  if (transport->SetProperty(
+          PP_TRANSPORTPROPERTY_RELAY_SERVER,
+          pp::Var(config_.relay_server)) != PP_OK) {
+    LOG(ERROR) << "Failed to set relay server.";
+  }
 
-    if (transport->SetProperty(
-            PP_TRANSPORTPROPERTY_RELAY_USERNAME,
-            pp::Var("1")) != PP_OK) {
-      LOG(ERROR) << "Failed to set relay username.";
-    }
+  if (transport->SetProperty(
+          PP_TRANSPORTPROPERTY_RELAY_USERNAME,
+          pp::Var("1")) != PP_OK) {
+    LOG(ERROR) << "Failed to set relay username.";
+  }
 
-    if (transport->SetProperty(
-            PP_TRANSPORTPROPERTY_RELAY_PASSWORD,
-            pp::Var(config_.relay_token)) != PP_OK) {
-      LOG(ERROR) << "Failed to set relay token.";
-    }
+  if (transport->SetProperty(
+          PP_TRANSPORTPROPERTY_RELAY_PASSWORD,
+          pp::Var(config_.relay_token)) != PP_OK) {
+    LOG(ERROR) << "Failed to set relay token.";
+  }
 
-    if (transport->SetProperty(
-            PP_TRANSPORTPROPERTY_RELAY_MODE,
-            pp::Var(PP_TRANSPORTRELAYMODE_GOOGLE)) != PP_OK) {
-      LOG(ERROR) << "Failed to set relay mode.";
-    }
+  if (transport->SetProperty(
+          PP_TRANSPORTPROPERTY_RELAY_MODE,
+          pp::Var(PP_TRANSPORTRELAYMODE_GOOGLE)) != PP_OK) {
+    LOG(ERROR) << "Failed to set relay mode.";
   }
 
   if (transport->SetProperty(PP_TRANSPORTPROPERTY_DISABLE_TCP_TRANSPORT,
                              pp::Var(true)) != PP_OK) {
     LOG(ERROR) << "Failed to set DISABLE_TCP_TRANSPORT flag.";
   }
 
   channel_ = new PepperTransportSocketAdapter(transport, name_, this);
   owned_channel_.reset(channel_);
 
@@ skipping 95 matching lines @@
 }
 
 scoped_ptr<DatagramTransport>
 PepperTransportFactory::CreateDatagramTransport() {
   NOTIMPLEMENTED();
   return scoped_ptr<DatagramTransport>(NULL);
 }
 
 }  // namespace protocol
 }  // namespace remoting