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..3c4f1195602eee2247985484b276ee27a66cf89a 100644
--- a/remoting/jingle_glue/chromium_port_allocator.cc
+++ b/remoting/jingle_glue/chromium_port_allocator.cc
@@ -149,8 +149,13 @@ scoped_ptr<ChromiumPortAllocator> ChromiumPortAllocator::Create(
               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.nat_traversal_mode ==
+        NetworkSettings::NAT_TRAVERSAL_ENABLED_NO_RELAY) {
+      flags |= cricket::PORTALLOCATOR_DISABLE_RELAY;
+    } else {
+      flags |= cricket::PORTALLOCATOR_DISABLE_STUN |
+          cricket::PORTALLOCATOR_DISABLE_RELAY;
+    }
   }
   result->set_flags(flags);
   result->SetPortRange(network_settings.min_port,