Policy: Add ProxyMode and deprecate ProxyServerMode.

chrome/app/policy/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
 # pair where the value has a given type. Chrome looks up the values using the
 # names of the policies. In the user interface where the values can be set,
 # related policies might appear together in policy groups. The grouping is not
 # visible to Chrome.
 #
 # This file contains a list of policies and groups. Each group contains a list
 # of policies under the key 'policies'. All the policies and groups must have
 # unique names. Group names are not exposed to Chrome at all.
 #
 # Each policy has a type. The currently implemented types:
 #   'group': - not a real policy, contains a list of policies
 #     NOTE: Currently nesting groups inside other groups is not supported.
 #   'string' - a string value
-#   'enum' - the user can select its value from a collection of items
+#   'int-enum' - the user can select an integer value from a collection of 
+#     items
+#   'string-enum' - the user can select a string value from a collection of 
+#     items
 #   'main' - a boolean value
 #   'list' - a list of string values
 #
 # Policy group descriptions, policy captions and similar texts are localized
 # strings taken from the <message> nodes of the .grd file. Their name
 # attributes are generated from the JSON keys.
 # Each item (policy or group) may have the following messages:
 #   - description:
 #     Describes the item it applies to.
 #   - caption
@@ skipping 30 matching lines @@
 #   supported under the key 'supported_on'. Each item of this list has the
 #   form of 'product:since_version-until_version', which means that support
 #   for the policy in 'product' was introduced in 'since_version' and removed
 #   after 'until_version'. Product names may contain a suffix specifying a
 #   platform name, e.g.: 'chrome.win' is read as 'Chrome on Windows'. Version
 #   numbers can be any string that does not contain ':' or '-' characters.
 #
 # Currently supported product names:
 #     'chrome_frame', 'chrome_os'
 #     'chrome.win', 'chrome.linux', 'chrome.mac', 'chrome.*'
-#     For example if 'chrome.*:5-10' is specified for a policy, then it should
-#     be read as:
+#   For example if 'chrome.*:5-10' is specified for a policy, then it should
+#   be read as:
 #     'chrome.linux:5-10,chrome.mac:5-10,chrome.win:5-10'
 #   The product name also affects in which templates will the policy be included.
 #     chrome.*, chrome.win, chrome_frame -> ADM,ADMX,ADML,doc
 #     chrome.*, chrome.linux -> JSON,doc
 #     chrome.*, chrome.mac -> plist, plist_strings,doc
 #     everything else -> doc
 #
   'policy_definitions': [
     {
       'name': 'Homepage',
@@ skipping 156 matching lines @@
       'annotations': {
         'features': {'dynamic_refresh': 1},
         'example_value': True,
       }
     },
     {
       'name': 'Proxy',
       'type': 'group',
       'policies': [
         {
+          'name': 'ProxyMode',
+          'type': 'string-enum',
+          'items': [
+            {'name': 'ProxyDisabled', 'value': 'direct'},
+            {'name': 'ProxyAutoDetect', 'value': 'auto_detect'},
+            {'name': 'ProxyPacScript', 'value': 'pac_script'},
+            {'name': 'ProxyFixedServers', 'value': 'fixed_servers'},
+            {'name': 'ProxyUseSystem', 'value': 'system'},
+          ],
+          'supported_on': ['chrome.*:10-'],
+          'annotations': {
+            'features': {'dynamic_refresh': 1},
+            'example_value': 'direct'
+          }
+        },
+        {
           'name': 'ProxyServerMode',
-          'type': 'enum',
+          'type': 'int-enum',
           'items': [
-            {'name': 'ProxyServerDisabled', 'value': '0'},
-            {'name': 'ProxyServerAutoDetect', 'value': '1'},
-            {'name': 'ProxyServerManual', 'value': '2'},
-            {'name': 'ProxyServerUseSystem', 'value': '3'},
+            {'name': 'ProxyServerDisabled', 'value': 0},
+            {'name': 'ProxyServerAutoDetect', 'value': 1},
+            {'name': 'ProxyServerManual', 'value': 2},
+            {'name': 'ProxyServerUseSystem', 'value': 3},
           ],
           'supported_on': ['chrome.*:8-'],
+          'deprecated' : True,
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 2,
           }
         },
         {
           'name': 'ProxyServer',
           'type': 'string',
           'supported_on': ['chrome.*:8-'],
           'annotations': {
@@ skipping 133 matching lines @@
       'annotations': {
         'features': {'dynamic_refresh': 1},
         'example_value': False,
       }
     },
     {
       'name': 'RestoreOnStartupGroup',
       'type': 'group',
       'policies': [{
         'name': 'RestoreOnStartup',
-        'type': 'enum',
+        'type': 'int-enum',
         'items': [
-          {'name': 'RestoreOnStartupIsNone', 'value': '0'},
-          {'name': 'RestoreOnStartupIsLastSession', 'value': '1'},
-          {'name': 'RestoreOnStartupIsURLs', 'value': '4'},
+          {'name': 'RestoreOnStartupIsNone', 'value': 0},
+          {'name': 'RestoreOnStartupIsLastSession', 'value': 1},
+          {'name': 'RestoreOnStartupIsURLs', 'value': 4},
         ],
         'supported_on': ['chrome.*:8-'],
         'annotations': {
           'features': {'dynamic_refresh': 1},
           'example_value': 4,
         }
       },{
         'name': 'RestoreOnStartupURLs',
         'type': 'list',
         'supported_on': ['chrome.*:8-'],
@@ skipping 71 matching lines @@
           }
         },
       ]
     },
     {
       'name': 'ContentSettings',
       'type': 'group',
       'policies': [
         {
           'name': 'DefaultCookiesSetting',
-          'type': 'enum',
+          'type': 'int-enum',
           'items': [
-            {'name': 'AllowCookies', 'value': '0'},
-            {'name': 'BlockCookies', 'value': '1'},
+            {'name': 'AllowCookies', 'value': 0},
+            {'name': 'BlockCookies', 'value': 1},
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 0,
           }
         },
         {
           'name': 'DefaultImagesSetting',
-          'type': 'enum',
+          'type': 'int-enum',
           'items': [
-            {'name': 'AllowImages', 'value': '0'},
-            {'name': 'BlockImages', 'value': '1'},
+            {'name': 'AllowImages', 'value': 0},
+            {'name': 'BlockImages', 'value': 1},
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 0,
           }
         },
         {
           'name': 'DefaultJavaScriptSetting',
-          'type': 'enum',
+          'type': 'int-enum',
           'items': [
-            {'name': 'AllowJavaScript', 'value': '0'},
-            {'name': 'BlockJavaScript', 'value': '1'},
+            {'name': 'AllowJavaScript', 'value': 0},
+            {'name': 'BlockJavaScript', 'value': 1},
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 0,
           }
         },
         {
           'name': 'DefaultPluginsSetting',
-          'type': 'enum',
+          'type': 'int-enum',
           'items': [
-            {'name': 'AllowPlugins', 'value': '0'},
-            {'name': 'BlockPlugins', 'value': '1'},
+            {'name': 'AllowPlugins', 'value': 0},
+            {'name': 'BlockPlugins', 'value': 1},
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 0,
           }
         },
         {
           'name': 'DefaultPopupsSetting',
-          'type': 'enum',
+          'type': 'int-enum',
           'items': [
-            {'name': 'AllowPopups', 'value': '0'},
-            {'name': 'BlockPopups', 'value': '1'},
+            {'name': 'AllowPopups', 'value': 0},
+            {'name': 'BlockPopups', 'value': 1},
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 1,
           }
         },
         {
           'name': 'DefaultNotificationSetting',
-          'type': 'enum',
+          'type': 'int-enum',
           'items': [
-            {'name': 'AllowNotifications', 'value': '0'},
-            {'name': 'BlockNotifications', 'value': '1'},
-            {'name': 'AskNotifications', 'value': '2'},
+            {'name': 'AllowNotifications', 'value': 0},
+            {'name': 'BlockNotifications', 'value': 1},
+            {'name': 'AskNotifications', 'value': 2},
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 2,
           }
         },
         {
           'name': 'DefaultGeolocationSetting',
-          'type': 'enum',
+          'type': 'int-enum',
           'items': [
-            {'name': 'AllowGeolocation', 'value': '0'},
-            {'name': 'BlockGeolocation', 'value': '1'},
-            {'name': 'AskGeolocation', 'value': '2'},
+            {'name': 'AllowGeolocation', 'value': 0},
+            {'name': 'BlockGeolocation', 'value': 1},
+            {'name': 'AskGeolocation', 'value': 2},
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 0,
           }
         },
       ]
     },
     {
       'name': 'Disable3DAPIs',
       'type': 'main',
       'supported_on': ['chrome.*:9-'],
       'annotations': {
         # It'll be difficult to support dynamically disabling access to these APIs.
         'features': {'dynamic_refresh': 0},
         'example_value': False,
       }
     },
     {
       'name': 'ChromeFrameRendererSettings',
       'type': 'group',
       'policies': [{
         'name': 'ChromeFrameRendererSettings',
-        'type': 'enum',
+        'type': 'int-enum',
         'items': [
-            {'name': 'RenderInHost', 'value': '0'},
-            {'name': 'RenderInChromeFrame', 'value': '1'},
+            {'name': 'RenderInHost', 'value': 0},
+            {'name': 'RenderInChromeFrame', 'value': 1},
         ],
         'supported_on': ['chrome_frame:8-'],
         'annotations': {
           'features': {'dynamic_refresh': 0},
           'example_value': 1,
         }
       }, {
         'name': 'RenderInChromeFrameList',
         'type': 'list',
         'supported_on': ['chrome_frame:8-'],
@@ skipping 44 matching lines @@
     {
       'key': '$4',
       'value': 'http://www.chromium.org/developers/how-tos/chrome-frame-getting-started'
     },
     {
       'key': '$5',
       'value': 'http://www.chromium.org/administrators/policy-templates'
     },
   ]
 }