Allow setting of user and device policies in functional tests

chrome/test/functional/chromeos_onc.py

Index: chrome/test/functional/chromeos_onc.py
diff --git a/chrome/test/functional/chromeos_onc.py b/chrome/test/functional/chromeos_onc.py
index 542c0df985d24da91118dd6e0f2cf7ad9d59287e..0d8c0501f61db18cc0cfd4e796018081ee842fa2 100644
--- a/chrome/test/functional/chromeos_onc.py
+++ b/chrome/test/functional/chromeos_onc.py
@@ -25,6 +25,8 @@ class ChromeosONC(policy_base.PolicyTestBase):
   def setUp(self):
     policy_base.PolicyTestBase.setUp(self)
     self.CleanupFlimflamDirsOnChromeOS()
+    if self.IsChromeOS():

[Nirnimesh, 2012/04/05 19:05:30]

This file applies to chromeos only. This if is redundant.

[bartfab (slow), 2012/04/10 15:27:20]

Done.

+      self.LoginWithTestAccount()
 
   def _ReadONCFileAndSet(self, filename):
     """Reads the specified ONC file and sends it as a policy.
@@ -34,7 +36,7 @@ class ChromeosONC(policy_base.PolicyTestBase):
                 all be stored in the path defined by ONC_PATH.
     """
     with open(os.path.join(self.ONC_PATH, filename)) as fp:
-      self.SetPolicies({'OpenNetworkConfiguration': fp.read()})
+      self.SetUserPolicy({'OpenNetworkConfiguration': fp.read()})
 
   def _VerifyRememberedWifiNetworks(self, wifi_expect):
     """Verify the list of remembered networks contains those in wifi_expect.