Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(155)

Unified Diff: chrome/browser/policy/policy_browsertest.cc

Issue 1312693005: Remove migration of obsolete value for "session.restore_on_startup". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@url-to-restore-on-startup
Patch Set: Re-enable the two tests Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/policy_browsertest.cc
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index dc61c6012be378227f4b05dca9e802e7994dff7f..03ad2851532a831b04f624d87126ce26d4646342 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -3269,56 +3269,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;
@@ -3405,9 +3355,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));
« no previous file with comments | « no previous file | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698