| Index: chrome/browser/policy/policy_browsertest.cc
|
| diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
|
| index 875bed1754758c857c17761de6b38e19e5ebb10e..9218cd76060786f93c91e8a8162b2f3728a2b0e4 100644
|
| --- a/chrome/browser/policy/policy_browsertest.cc
|
| +++ b/chrome/browser/policy/policy_browsertest.cc
|
| @@ -3268,56 +3268,6 @@ class RestoreOnStartupPolicyTest
|
| RedirectHostsToTestData, kRestoredURLs, arraysize(kRestoredURLs)));
|
| }
|
|
|
| - void HomepageIsNotNTP() {
|
| - // 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,
|
| - POLICY_SOURCE_CLOUD,
|
| - new base::FundamentalValue(SessionStartupPref::kPrefValueHomePage),
|
| - NULL);
|
| - policies.Set(key::kHomepageIsNewTabPage,
|
| - POLICY_LEVEL_MANDATORY,
|
| - POLICY_SCOPE_USER,
|
| - POLICY_SOURCE_CLOUD,
|
| - new base::FundamentalValue(false),
|
| - NULL);
|
| - policies.Set(key::kHomepageLocation,
|
| - POLICY_LEVEL_MANDATORY,
|
| - POLICY_SCOPE_USER,
|
| - POLICY_SOURCE_CLOUD,
|
| - 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,
|
| - POLICY_SOURCE_CLOUD,
|
| - new base::FundamentalValue(SessionStartupPref::kPrefValueHomePage),
|
| - NULL);
|
| - policies.Set(key::kHomepageIsNewTabPage,
|
| - POLICY_LEVEL_MANDATORY,
|
| - POLICY_SCOPE_USER,
|
| - POLICY_SOURCE_CLOUD,
|
| - 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;
|
| @@ -3404,9 +3354,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));
|
|
|
|
|