Revert 267234 "New policies: enable/disable relay; port range"

trunk/src/remoting/protocol/libjingle_transport_factory.cc

Index: trunk/src/remoting/protocol/libjingle_transport_factory.cc
===================================================================
--- trunk/src/remoting/protocol/libjingle_transport_factory.cc	(revision 267240)
+++ trunk/src/remoting/protocol/libjingle_transport_factory.cc	(working copy)
@@ -205,8 +205,10 @@
       this, &LibjingleStreamTransport::OnRouteChange);
   channel_->SignalWritableState.connect(
       this, &LibjingleStreamTransport::OnWritableState);
-  channel_->set_incoming_only(
-      !(network_settings_.flags & NetworkSettings::NAT_TRAVERSAL_OUTGOING));
+  if (network_settings_.nat_traversal_mode ==
+      NetworkSettings::NAT_TRAVERSAL_DISABLED) {
+    channel_->set_incoming_only(true);
+  }
 
   channel_->Connect();
 
@@ -450,9 +452,8 @@
 }
 
 void LibjingleTransportFactory::EnsureFreshJingleInfo() {
-  uint32 stun_or_relay_flags = NetworkSettings::NAT_TRAVERSAL_STUN |
-      NetworkSettings::NAT_TRAVERSAL_RELAY;
-  if (!(network_settings_.flags & stun_or_relay_flags) ||
+  if (network_settings_.nat_traversal_mode !=
+          NetworkSettings::NAT_TRAVERSAL_ENABLED ||
       jingle_info_request_) {
     return;
   }