Remove migration of obsolete value for "session.restore_on_startup".

chrome/browser/policy/policy_browsertest.cc

Index: chrome/browser/policy/policy_browsertest.cc
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 9b2ee7c1456e4b41d383229d687fc0bcf8c81d02..f466149c4f77be7bc0aa4aba4ee6841d140c38ab 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -3193,51 +3193,6 @@ class RestoreOnStartupPolicyTest
             RedirectHostsToTestData, kRestoredURLs, arraysize(kRestoredURLs)));
   }
 
-  void HomepageIsNotNTP() {

[gab, 2015/08/27 17:52:48]

Seems we're removing an unintentionally supported policy use case (pinged on
email thread to make sure this is okay -- no action required if they're okay
with it).

[bartfab (slow), 2015/08/31 15:36:43]

I did some analysis and pinged the thread with my findings.

-    // Verifies that policy can set the startup pages to the homepage, when
-    // the homepage is not the NTP.
-    PolicyMap policies;
-    policies.Set(
-        key::kRestoreOnStartup,
-        POLICY_LEVEL_MANDATORY,
-        POLICY_SCOPE_USER,
-        new base::FundamentalValue(SessionStartupPref::kPrefValueHomePage),
-        NULL);
-    policies.Set(key::kHomepageIsNewTabPage,
-                 POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER,
-                 new base::FundamentalValue(false),
-                 NULL);
-    policies.Set(key::kHomepageLocation,
-                 POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER,
-                 new base::StringValue(kRestoredURLs[1]),
-                 NULL);
-    provider_.UpdateChromePolicy(policies);
-
-    expected_urls_.push_back(GURL(kRestoredURLs[1]));
-  }
-
-  void HomepageIsNTP() {
-    // Verifies that policy can set the startup pages to the homepage, when
-    // the homepage is the NTP.
-    PolicyMap policies;
-    policies.Set(
-        key::kRestoreOnStartup,
-        POLICY_LEVEL_MANDATORY,
-        POLICY_SCOPE_USER,
-        new base::FundamentalValue(SessionStartupPref::kPrefValueHomePage),
-        NULL);
-    policies.Set(key::kHomepageIsNewTabPage,
-                 POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER,
-                 new base::FundamentalValue(true),
-                 NULL);
-    provider_.UpdateChromePolicy(policies);
-
-    expected_urls_.push_back(GURL(chrome::kChromeUINewTabURL));
-  }
-
   void ListOfURLs() {
     // Verifies that policy can set the startup pages to a list of URLs.
     base::ListValue urls;
@@ -3321,9 +3276,7 @@ IN_PROC_BROWSER_TEST_P(RestoreOnStartupPolicyTest, RunTest) {
 INSTANTIATE_TEST_CASE_P(
     RestoreOnStartupPolicyTestInstance,
     RestoreOnStartupPolicyTest,
-    testing::Values(&RestoreOnStartupPolicyTest::HomepageIsNotNTP,
-                    &RestoreOnStartupPolicyTest::HomepageIsNTP,
-                    &RestoreOnStartupPolicyTest::ListOfURLs,
+    testing::Values(&RestoreOnStartupPolicyTest::ListOfURLs,
                     &RestoreOnStartupPolicyTest::NTP,
                     &RestoreOnStartupPolicyTest::Last));