Update RestoreOnStartupPolicyHandler to translate to the correct preferences

chrome/test/functional/policy.py

Index: chrome/test/functional/policy.py
diff --git a/chrome/test/functional/policy.py b/chrome/test/functional/policy.py
index 6d6474b80b3867e358593269eafd70992352c094..8622326ad84ff0c683838d24c2e24e56094f315f 100755
--- a/chrome/test/functional/policy.py
+++ b/chrome/test/functional/policy.py
@@ -266,8 +266,10 @@ class PolicyTest(policy_base.PolicyTestBase):
     self._RestartRenderer()
     self.assertFalse(self._IsWebGLEnabled())
 
-  def testStartupOptions(self):
-    """Verify that user cannot modify the startup page options."""
+  def testStartupOptionsURLs(self):
+    """Verify that user cannot modify the startup page options if "Open the
+    following URLs" is set by a policy.
+    """
     policy = {
       'RestoreOnStartup': 4,
       'RestoreOnStartupURLs': ['http://chromium.org']
@@ -278,9 +280,18 @@ class PolicyTest(policy_base.PolicyTestBase):
     self.assertRaises(
         pyauto.JSONInterfaceError,
         lambda: self.SetPrefs(pyauto.kRestoreOnStartup, 1))
-    policy['RestoreOnStartup'] = 0
+
+  def testStartupOptionsHomepage(self):
+    """Verify that user cannot modify the startup page options if the
+    deprecated "Open the homepage" option is set by a policy.
+    """
+    policy = {
+      'RestoreOnStartup': 0,
+      'HomepageLocation': 'http://chromium.org',
+      'HomepageIsNewTabPage': False,
+    }
     self.SetUserPolicy(policy)
-    self.assertEquals(0, self.GetPrefsInfo().Prefs(pyauto.kRestoreOnStartup))
+    self.assertEquals(4, self.GetPrefsInfo().Prefs(pyauto.kRestoreOnStartup))
     self.assertRaises(
         pyauto.JSONInterfaceError,
         lambda: self.SetPrefs(pyauto.kRestoreOnStartup, 1))