Policy: Add ProxyMode and deprecate ProxyServerMode.

tools/grit/grit/format/policy_templates/writers/json_writer_unittest.py

 #!/usr/bin/python2.4
 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 '''Unit tests for grit.format.policy_templates.writers.json_writer'''
 
 
 import os
 import sys
@@ skipping 80 matching lines @@
         '  <message name="IDS_POLICY_STRINGPOLICY_CAPTION"></message>'
         '  <message name="IDS_POLICY_STRINGPOLICY_DESC"></message>'
         '</messages>')
     output = self.GetOutput(grd, 'fr', {'_chromium' : '1'}, 'json', 'en')
     expected_output = (
         '{\n'
         '  "StringPolicy": "hello, world!"\n'
         '}')
     self.CompareOutputs(output, expected_output)
 
-  def testEnumPolicy(self):
-    # Tests a policy group with a single policy of type 'enum'.
+  def testIntEnumPolicy(self):
+    # Tests a policy group with a single policy of type 'int-enum'.
     grd = self.PrepareTest(
         '{'
         '  "policy_definitions": ['
         '    {'
         '      "name": "EnumPolicy",'
-        '      "type": "enum",'
+        '      "type": "int-enum",'
         '      "items": ['
         '        {"name": "ProxyServerDisabled", "value": 0},'
         '        {"name": "ProxyServerAutoDetect", "value": 1},'
         '      ],'
         '      "supported_on": ["chrome.linux:8-"],'
         '      "annotations": {'
         '        "example_value": 1'
         '      }'
         '    },'
         '  ],'
         '  "placeholders": [],'
         '}',
         '<messages>'
         '  <message name="IDS_POLICY_ENUMPOLICY_CAPTION"></message>'
         '  <message name="IDS_POLICY_ENUMPOLICY_DESC"></message>'
         '  <message name="IDS_POLICY_ENUM_PROXYSERVERDISABLED_CAPTION">'
         '  </message>'
         '  <message name="IDS_POLICY_ENUM_PROXYSERVERAUTODETECT_CAPTION">'
         '  </message>'
         '</messages>')
     output = self.GetOutput(grd, 'fr', {'_google_chrome': '1'}, 'json', 'en')
     expected_output = (
         '{\n'
         '  "EnumPolicy": 1\n'
         '}')
     self.CompareOutputs(output, expected_output)
 
+  def testStringEnumPolicy(self):
+    # Tests a policy group with a single policy of type 'string-enum'.
+    grd = self.PrepareTest(
+        '{'
+        '  "policy_definitions": ['
+        '    {'
+        '      "name": "EnumPolicy",'
+        '      "type": "string-enum",'
+        '      "items": ['
+        '        {"name": "ProxyServerDisabled", "value": "one"},'
+        '        {"name": "ProxyServerAutoDetect", "value": "two"},'
+        '      ],'
+        '      "supported_on": ["chrome.linux:8-"],'
+        '      "annotations": {'
+        '        "example_value": "one"'
+        '      }'
+        '    },'
+        '  ],'
+        '  "placeholders": [],'
+        '}',
+        '<messages>'
+        '  <message name="IDS_POLICY_ENUMPOLICY_CAPTION"></message>'
+        '  <message name="IDS_POLICY_ENUMPOLICY_DESC"></message>'
+        '  <message name="IDS_POLICY_ENUM_PROXYSERVERDISABLED_CAPTION">'
+        '  </message>'
+        '  <message name="IDS_POLICY_ENUM_PROXYSERVERAUTODETECT_CAPTION">'
+        '  </message>'
+        '</messages>')
+    output = self.GetOutput(grd, 'fr', {'_google_chrome': '1'}, 'json', 'en')
+    expected_output = (
+        '{\n'
+        '  "EnumPolicy": "one"\n'
+        '}')
+    self.CompareOutputs(output, expected_output)
+
   def testListPolicy(self):
     # Tests a policy group with a single policy of type 'list'.
     grd = self.PrepareTest(
         '{'
         '  "policy_definitions": ['
         '    {'
         '      "name": "ListPolicy",'
         '      "type": "list",'
         '      "supported_on": ["chrome.linux:8-"],'
         '      "annotations": {'
@@ skipping 79 matching lines @@
     expected_output = (
         '{\n'
         '  "Policy1": ["a", "b"],\n'
         '  "Policy2": "c"\n'
         '}')
     self.CompareOutputs(output, expected_output)
 
 
 if __name__ == '__main__':
   unittest.main()