Index: chrome/browser/prefs/session_startup_pref_unittest.cc |
diff --git a/chrome/browser/prefs/session_startup_pref_unittest.cc b/chrome/browser/prefs/session_startup_pref_unittest.cc |
index 87124359b277bb6e3e3f7142d30f3aa7b4d24212..ed082966a16ebd3b04920c291dc113c5f1cbf28e 100644 |
--- a/chrome/browser/prefs/session_startup_pref_unittest.cc |
+++ b/chrome/browser/prefs/session_startup_pref_unittest.cc |
@@ -19,16 +19,10 @@ class SessionStartupPrefTest : public testing::Test { |
void SetUp() override { |
pref_service_.reset(new TestingPrefServiceSyncable); |
SessionStartupPref::RegisterProfilePrefs(registry()); |
- registry()->RegisterBooleanPref( |
- prefs::kHomePageIsNewTabPage, |
- true, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
+ registry()->RegisterBooleanPref(prefs::kHomePageIsNewTabPage, true); |
// Make the tests independent of the Mac startup pref migration (see |
// SessionStartupPref::MigrateMacDefaultPrefIfNecessary). |
- registry()->RegisterStringPref( |
- prefs::kProfileCreatedByVersion, |
- "22.0.0.0", |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
+ registry()->RegisterStringPref(prefs::kProfileCreatedByVersion, "22.0.0.0"); |
} |
bool IsUseLastOpenDefault() { |
@@ -89,10 +83,7 @@ TEST_F(SessionStartupPrefTest, URLListManagedOverridesUser) { |
// (so that, in effect, the default value "Open the homepage" was selected), |
// their preferences are migrated on upgrade to m19. |
TEST_F(SessionStartupPrefTest, DefaultMigration) { |
- registry()->RegisterStringPref( |
- prefs::kHomePage, |
- "http://google.com/", |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
+ registry()->RegisterStringPref(prefs::kHomePage, "http://google.com/"); |
pref_service_->SetString(prefs::kHomePage, "http://chromium.org/"); |
pref_service_->SetBoolean(prefs::kHomePageIsNewTabPage, false); |
@@ -116,10 +107,7 @@ TEST_F(SessionStartupPrefTest, DefaultMigration) { |
// and the NTP is being used for the homepage, their preferences are migrated |
// to "Open the New Tab Page" on upgrade to M19. |
TEST_F(SessionStartupPrefTest, DefaultMigrationHomepageIsNTP) { |
- registry()->RegisterStringPref( |
- prefs::kHomePage, |
- "http://google.com/", |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
+ registry()->RegisterStringPref(prefs::kHomePage, "http://google.com/"); |
pref_service_->SetString(prefs::kHomePage, "http://chromium.org/"); |
pref_service_->SetBoolean(prefs::kHomePageIsNewTabPage, true); |
@@ -140,10 +128,7 @@ TEST_F(SessionStartupPrefTest, DefaultMigrationHomepageIsNTP) { |
// Checks to make sure that if the user had previously selected "Open the |
// "homepage", their preferences are migrated on upgrade to M19. |
TEST_F(SessionStartupPrefTest, HomePageMigration) { |
- registry()->RegisterStringPref( |
- prefs::kHomePage, |
- "http://google.com/", |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
+ registry()->RegisterStringPref(prefs::kHomePage, "http://google.com/"); |
// By design, it's impossible to set the 'restore on startup' pref to 0 |
// ("open the homepage") using SessionStartupPref::SetStartupPref(), so set it |
@@ -164,10 +149,7 @@ TEST_F(SessionStartupPrefTest, HomePageMigration) { |
// "homepage", and the NTP is being used for the homepage, their preferences |
// are migrated on upgrade to M19. |
TEST_F(SessionStartupPrefTest, HomePageMigrationHomepageIsNTP) { |
- registry()->RegisterStringPref( |
- prefs::kHomePage, |
- "http://google.com/", |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
+ registry()->RegisterStringPref(prefs::kHomePage, "http://google.com/"); |
// By design, it's impossible to set the 'restore on startup' pref to 0 |
// ("open the homepage") using SessionStartupPref::SetStartupPref(), so set it |