Removed ConfigurationPolicyType and extended PolicyMap.

chrome/test/pyautolib/pyauto.py

Index: chrome/test/pyautolib/pyauto.py
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py
index 8f15d5dca1b483d6973ebf10184248ef5f789e7a..fb48e0066d229026cf8ea4e66f6b1510b020ec2c 100755
--- a/chrome/test/pyautolib/pyauto.py
+++ b/chrome/test/pyautolib/pyauto.py
@@ -3334,7 +3334,8 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
     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:
@@ -3346,6 +3347,8 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
                      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.
@@ -3356,7 +3359,8 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
         '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)