New policies: enable/disable relay; port range

remoting/jingle_glue/chromium_port_allocator.cc

Index: remoting/jingle_glue/chromium_port_allocator.cc
diff --git a/remoting/jingle_glue/chromium_port_allocator.cc b/remoting/jingle_glue/chromium_port_allocator.cc
index a1796506cf7541038a8447f24af9ff78a5c0275b..278cb6c2550a45610c7d6aac4b0e18c0d42c4951 100644
--- a/remoting/jingle_glue/chromium_port_allocator.cc
+++ b/remoting/jingle_glue/chromium_port_allocator.cc
@@ -147,11 +147,13 @@ scoped_ptr<ChromiumPortAllocator> ChromiumPortAllocator::Create(
   int flags = cricket::PORTALLOCATOR_DISABLE_TCP |
               cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG |
               cricket::PORTALLOCATOR_ENABLE_IPV6;
-  if (network_settings.nat_traversal_mode !=
-      NetworkSettings::NAT_TRAVERSAL_ENABLED) {
-    flags |= cricket::PORTALLOCATOR_DISABLE_STUN |
-        cricket::PORTALLOCATOR_DISABLE_RELAY;
-  }
+
+  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.min_port,
                        network_settings.max_port);