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

trunk/src/components/policy/resources/policy_templates.json

 {
 # policy_templates.json - Metafile for policy templates
 #
 # The content of this file is evaluated as a Python expression.
 #
 # This file is used as input to generate the following policy templates:
 # ADM, ADMX+ADML, MCX/plist and html documentation.
 #
 # Policy templates are user interface definitions or documents about the
 # policies that can be used to configure Chrome. Each policy is a name-value
@@ skipping 100 matching lines @@
 #   templates and documentation. The policy definition list that Chrome sees
 #   will include policies marked with 'future'. If a WIP policy isn't meant to
 #   be seen by the policy providers either, the 'supported_on' key should be set
 #   to an empty list.
 #
 # IDs:
 #   Since a Protocol Buffer definition is generated from this file, unique and
 #   persistent IDs for all fields (but not for groups!) are needed. These are
 #   specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs,
 #   because doing so would break the deployed wire format!
-#   For your editing convenience: highest ID currently used: 264
+#   For your editing convenience: highest ID currently used: 262
 #
 # Placeholders:
 #   The following placeholder strings are automatically substituted:
 #     $1 -> Google Chrome / Chromium
 #     $2 -> Google Chrome OS / Chromium OS
 #     $3 -> Google Chrome Frame / Chromium Frame
 #     $6 is reserved for doc_writer
 #
 # Device Policy:
 #   An additional flag device_only (optional, defaults to False) indicates
@@ skipping 403 matching lines @@
           'type': 'main',
           'schema': { 'type': 'boolean' },
           'supported_on': ['chrome.*:14-'],
           'features': {
             'dynamic_refresh': True,
             'per_profile': False,
           },
           'example_value': False,
           'id': 95,
           'caption': '''Enable firewall traversal from remote access host''',
-          'desc': '''Enables usage of STUN servers when remote clients are trying to establish a connection to this machine.
+          'desc': '''Enables usage of STUN and relay servers when remote clients are trying to establish a connection to this machine.
 
           If this setting is enabled, then remote clients can discover and connect to this machines even if they are separated by a firewall.
 
           If this setting is disabled and outgoing UDP connections are filtered by the firewall, then this machine will only allow connections from client machines within the local network.
 
           If this policy is left not set the setting will be enabled.''',
         },
         {
           'name': 'RemoteAccessHostDomain',
           'type': 'string',
@@ skipping 95 matching lines @@
             'dynamic_refresh': True,
             'per_profile': False,
           },
           'example_value': True,
           'id': 257,
           'caption': '''Allow gnubby authentication''',
           'desc': '''If this setting is enabled, then gnubby authentication requests will be proxied across a remote host connection.
 
           If this setting is disabled or not configured, gnubby authentication requests will not be proxied.''',
         },
-        {
-          'name': 'RemoteAccessHostAllowRelayedConnection',
-          'type': 'main',
-          'schema': { 'type': 'boolean' },
-          'supported_on': ['chrome.*:36-'],
-          'features': {
-            'dynamic_refresh': True,
-            'per_profile': False,
-          },
-          'example_value': False,
-          'id': 263,
-          'caption': '''Enable the use of relay servers by the remote access host''',
-          'desc': '''Enables usage of relay servers when remote clients are trying to establish a connection to this machine.
-
-          If this setting is enabled, then remote clients can use relay servers to connect to this machine when a direct connection is not available (e.g. due to firewall restrictions).
-
-          Note that if the policy <ph name="REMOTEACCESSHOSTFIREWALLTRAVERSAL_POLICY_NAME">RemoteAccessHostFirewallTraversal</ph> is disabled, this policy will be ignored.
-
-          If this policy is left not set the setting will be enabled.''',
-        },
-        {
-          'name': 'RemoteAccessHostUdpPortRange',
-          'type': 'string',
-          'schema': { 'type': 'string' },
-          'supported_on': ['chrome.*:36-'],
-          'features': {
-            'dynamic_refresh': True,
-            'per_profile': False,
-          },
-          'example_value': '12400-12409',
-          'id': 264,
-          'caption': '''Restrict the UDP port range used by the remote access host''',
-          'desc': '''Restricts the UDP port range used by the remote access host in this machine.
-
-          If this policy is left not set, or if it is set to an empty string, the remote access host will be allowed to use any available port, unless the policy <ph name="REMOTEACCESSHOSTFIREWALLTRAVERSAL_POLICY_NAME">RemoteAccessHostFirewallTraversal</ph> is disabled, in which case the remote access host will use UDP ports in the 12400-12409 range.''',
-        },
       ],
     },
     {
       'name': 'PrintingEnabled',
       'type': 'main',
       'schema': { 'type': 'boolean' },
       'supported_on': ['chrome.*:8-', 'chrome_os:11-'],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ skipping 5759 matching lines @@
       'desc': '''Text appended in parentheses to the policy name to indicate that it has been deprecated''',
       'text': 'deprecated',
     },
     'doc_recommended': {
       'desc': '''Text appended in parentheses next to the policies top-level container to indicate that those policies are of the Recommended level''',
       'text': 'Default Settings (users can override)',
     },
   },
   'placeholders': [],
 }