Removed ConfigurationPolicyType and extended PolicyMap.

chrome/test/pyautolib/pyauto.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
 run pydoc on this file.
@@ skipping 3316 matching lines @@
 
     Raises:
       pyauto_errors.JSONInterfaceError if the automation call returns an error.
     """
     cmd_dict = {  # Prepare command for the json interface
       'command': 'GetMultiProfileInfo'
     }
     return self._GetResultFromJSONRequest(cmd_dict, windex=-1)
 
   def SetPolicies(self, managed_platform=None, recommended_platform=None,
-                  managed_cloud=None, recommended_cloud=None):
+                  managed_cloud=None, recommended_cloud=None,
+                  machine_scope=False):
     """Sets the policies on the browser. Always fails on official builds.
 
     Args:
       managed_platform: a dictionary with the policy values for the managed
                         platform provider.
       recommended_platform: a dictionary with the policy values for the
                             recommended platform provider.
       managed_cloud: a dictionary with the policy values for the managed
                      cloud provider.
       recommended_cloud: a dictionary with the policy values for the recommended
                          cloud provider.
+      machine_scope: True to set the policies as machine policies, False to set
+                     them as user policies.
 
     Leaving an argument to None will restore the default behavior for that
     provider.
     """
     assert not self.GetBrowserInfo()['properties']['is_official']
     cmd_dict = {
         'command': 'SetPolicies',
         'managed_cloud': managed_cloud,
         'managed_platform': managed_platform,
         'recommended_cloud': recommended_cloud,
-        'recommended_platform': recommended_platform
+        'recommended_platform': recommended_platform,
+        'machine_scope': machine_scope
     }
     return self._GetResultFromJSONRequest(cmd_dict)
 
   def GetPolicyDefinitionList(self):
     """Gets a dictionary of existing policies mapped to their value types.
 
     SAMPLE OUTPUT:
     {
       'ShowHomeButton': 'bool',
       'DefaultSearchProviderSearchURL': 'str',
@@ skipping 1483 matching lines @@
     successful = result.wasSuccessful()
     if not successful:
       pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename)
       print >>sys.stderr, 'Tests can be disabled by editing %s. ' \
                           'Ref: %s' % (pyauto_tests_file, _PYAUTO_DOC_URL)
     sys.exit(not successful)
 
 
 if __name__ == '__main__':
   Main()