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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/prefs/pref_service_syncable_unittest.cc

Issue 1302303002: Remove year+ old migration support of "session.urls_to_restore_on_startup". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_service_syncable_unittest
Patch Set: Created 5 years, 4 months 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
« chrome/browser/prefs/pref_model_associator.cc ('K') | « chrome/browser/prefs/pref_model_associator.cc ('k') | chrome/browser/prefs/session_startup_pref.cc » ('j') | chrome/browser/prefs/session_startup_pref.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/pref_service_syncable_unittest.cc
diff --git a/chrome/browser/prefs/pref_service_syncable_unittest.cc b/chrome/browser/prefs/pref_service_syncable_unittest.cc
index c3e744b6a7ef928e597b52d1fe0a577549aaa51d..051986c42e1be5cecb77b86d4ebba9e435b847b4 100644
--- a/chrome/browser/prefs/pref_service_syncable_unittest.cc
+++ b/chrome/browser/prefs/pref_service_syncable_unittest.cc
@@ -85,7 +85,6 @@ class PrefServiceSyncableTest : public testing::Test {
prefs_.registry()->RegisterListPref(
prefs::kURLsToRestoreOnStartup,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- prefs_.registry()->RegisterListPref(prefs::kURLsToRestoreOnStartupOld);
prefs_.registry()->RegisterStringPref(
prefs::kDefaultCharset,
l10n_util::GetStringUTF8(IDS_DEFAULT_ENCODING),
@@ -294,171 +293,6 @@ TEST_F(PrefServiceSyncableTest, ModelAssociationCloudHasData) {
prefs_.GetString(prefs::kDefaultCharset));
}
-TEST_F(PrefServiceSyncableTest, ModelAssociationMigrateOldData) {
gab 2015/08/24 21:48:45 If we do keep the code around (see comment in .cc)
sdefresne 2015/08/26 16:00:56 Implementation has been removed as recommended by
- ASSERT_TRUE(IsMigratedPreference(prefs::kURLsToRestoreOnStartup));
- ASSERT_TRUE(IsOldMigratedPreference(prefs::kURLsToRestoreOnStartupOld));
-
- syncer::SyncDataList in;
- syncer::SyncChangeList out;
- base::ListValue urls_to_restore;
- urls_to_restore.Append(new base::StringValue(kExampleUrl1));
- urls_to_restore.Append(new base::StringValue(kExampleUrl2));
- AddToRemoteDataList(prefs::kURLsToRestoreOnStartupOld, urls_to_restore,
- &in);
- InitWithSyncDataTakeOutput(in, &out);
-
- // Expect that the new preference data contains the old pref's values.
- scoped_ptr<base::ListValue> expected_urls(new base::ListValue);
- expected_urls->Append(new base::StringValue(kExampleUrl1));
- expected_urls->Append(new base::StringValue(kExampleUrl2));
-
- ASSERT_TRUE(HasSyncData(prefs::kURLsToRestoreOnStartup));
- scoped_ptr<base::Value> value(
- FindValue(prefs::kURLsToRestoreOnStartup, out));
- ASSERT_TRUE(value.get());
- EXPECT_TRUE(value->Equals(expected_urls.get()));
- EXPECT_TRUE(GetPreferenceValue(prefs::kURLsToRestoreOnStartup).
- Equals(expected_urls.get()));
-
- // The old preference value should be the same.
- expected_urls.reset(new base::ListValue);
- ASSERT_FALSE(FindValue(prefs::kURLsToRestoreOnStartupOld, out).get());
- EXPECT_TRUE(GetPreferenceValue(prefs::kURLsToRestoreOnStartupOld).
- Equals(expected_urls.get()));
-}
-
-TEST_F(PrefServiceSyncableTest, ModelAssociationCloudHasOldMigratedData) {
- ASSERT_TRUE(IsMigratedPreference(prefs::kURLsToRestoreOnStartup));
- ASSERT_TRUE(IsOldMigratedPreference(prefs::kURLsToRestoreOnStartupOld));
- prefs_.SetString(prefs::kHomePage, kExampleUrl0);
- {
- ListPrefUpdate update(GetPrefs(), prefs::kURLsToRestoreOnStartup);
- base::ListValue* url_list = update.Get();
- url_list->Append(new base::StringValue(kExampleUrl0));
- url_list->Append(new base::StringValue(kExampleUrl1));
- }
-
- syncer::SyncDataList in;
- syncer::SyncChangeList out;
- base::ListValue urls_to_restore;
- urls_to_restore.Append(new base::StringValue(kExampleUrl1));
- urls_to_restore.Append(new base::StringValue(kExampleUrl2));
- AddToRemoteDataList(prefs::kURLsToRestoreOnStartupOld, urls_to_restore, &in);
- AddToRemoteDataList(prefs::kHomePage, base::StringValue(kExampleUrl1), &in);
- InitWithSyncDataTakeOutput(in, &out);
-
- ASSERT_FALSE(FindValue(prefs::kHomePage, out).get());
-
- // Expect that the new preference data contains the merged old prefs values.
- scoped_ptr<base::ListValue> expected_urls(new base::ListValue);
- expected_urls->Append(new base::StringValue(kExampleUrl1));
- expected_urls->Append(new base::StringValue(kExampleUrl2));
- expected_urls->Append(new base::StringValue(kExampleUrl0));
-
- ASSERT_TRUE(HasSyncData(prefs::kURLsToRestoreOnStartup));
- scoped_ptr<base::Value> value(
- FindValue(prefs::kURLsToRestoreOnStartup, out));
- ASSERT_TRUE(value.get());
- EXPECT_TRUE(value->Equals(expected_urls.get()));
- EXPECT_TRUE(GetPreferenceValue(prefs::kURLsToRestoreOnStartup).
- Equals(expected_urls.get()));
-
- expected_urls.reset(new base::ListValue);
- value = FindValue(prefs::kURLsToRestoreOnStartupOld, out).Pass();
- ASSERT_TRUE(value.get());
- EXPECT_TRUE(GetPreferenceValue(prefs::kURLsToRestoreOnStartupOld).
- Equals(expected_urls.get()));
-}
-
-TEST_F(PrefServiceSyncableTest, ModelAssociationCloudHasNewMigratedData) {
- ASSERT_TRUE(IsMigratedPreference(prefs::kURLsToRestoreOnStartup));
- ASSERT_TRUE(IsOldMigratedPreference(prefs::kURLsToRestoreOnStartupOld));
- prefs_.SetString(prefs::kHomePage, kExampleUrl0);
- {
- ListPrefUpdate update(GetPrefs(), prefs::kURLsToRestoreOnStartupOld);
- base::ListValue* url_list = update.Get();
- url_list->Append(new base::StringValue(kExampleUrl0));
- url_list->Append(new base::StringValue(kExampleUrl1));
- }
-
- syncer::SyncDataList in;
- syncer::SyncChangeList out;
- base::ListValue urls_to_restore;
- urls_to_restore.Append(new base::StringValue(kExampleUrl1));
- urls_to_restore.Append(new base::StringValue(kExampleUrl2));
- AddToRemoteDataList(prefs::kURLsToRestoreOnStartupOld, urls_to_restore, &in);
- AddToRemoteDataList(prefs::kHomePage, base::StringValue(kExampleUrl1), &in);
- InitWithSyncDataTakeOutput(in, &out);
-
- scoped_ptr<base::Value> value(FindValue(prefs::kHomePage, out));
- ASSERT_FALSE(value.get());
-
- // Expect that the cloud data under the new migrated preference name sticks.
- scoped_ptr<base::ListValue> expected_urls(new base::ListValue);
- expected_urls->Append(new base::StringValue(kExampleUrl1));
- expected_urls->Append(new base::StringValue(kExampleUrl2));
-
- ASSERT_TRUE(HasSyncData(prefs::kURLsToRestoreOnStartup));
- value = FindValue(prefs::kURLsToRestoreOnStartup, out).Pass();
- ASSERT_TRUE(value.get());
- EXPECT_TRUE(value->Equals(expected_urls.get()));
- EXPECT_TRUE(GetPreferenceValue(prefs::kURLsToRestoreOnStartup).
- Equals(expected_urls.get()));
-
- // The old preference data should still be here, though not synced.
- expected_urls.reset(new base::ListValue);
- expected_urls->Append(new base::StringValue(kExampleUrl0));
- expected_urls->Append(new base::StringValue(kExampleUrl1));
-
- value = FindValue(prefs::kURLsToRestoreOnStartupOld, out).Pass();
- ASSERT_FALSE(value.get());
- EXPECT_TRUE(GetPreferenceValue(prefs::kURLsToRestoreOnStartupOld).
- Equals(expected_urls.get()));
-}
-
-TEST_F(PrefServiceSyncableTest,
- ModelAssociationCloudAddsOldAndNewMigratedData) {
- ASSERT_TRUE(IsMigratedPreference(prefs::kURLsToRestoreOnStartup));
- ASSERT_TRUE(IsOldMigratedPreference(prefs::kURLsToRestoreOnStartupOld));
- prefs_.SetString(prefs::kHomePage, kExampleUrl0);
- {
- ListPrefUpdate update_old(GetPrefs(), prefs::kURLsToRestoreOnStartupOld);
- base::ListValue* url_list_old = update_old.Get();
- url_list_old->Append(new base::StringValue(kExampleUrl0));
- url_list_old->Append(new base::StringValue(kExampleUrl1));
- ListPrefUpdate update(GetPrefs(), prefs::kURLsToRestoreOnStartup);
- base::ListValue* url_list = update.Get();
- url_list->Append(new base::StringValue(kExampleUrl1));
- url_list->Append(new base::StringValue(kExampleUrl2));
- }
-
- syncer::SyncDataList in;
- syncer::SyncChangeList out;
- AddToRemoteDataList(prefs::kHomePage, base::StringValue(kExampleUrl1), &in);
- InitWithSyncDataTakeOutput(in, &out);
-
- scoped_ptr<base::Value> value(FindValue(prefs::kHomePage, out));
- ASSERT_FALSE(value.get());
-
- // Expect that the cloud data under the new migrated preference name sticks.
- scoped_ptr<base::ListValue> expected_urls(new base::ListValue);
- expected_urls->Append(new base::StringValue(kExampleUrl1));
- expected_urls->Append(new base::StringValue(kExampleUrl2));
-
- ASSERT_TRUE(HasSyncData(prefs::kURLsToRestoreOnStartup));
- value = FindValue(prefs::kURLsToRestoreOnStartup, out).Pass();
- ASSERT_TRUE(value.get());
- EXPECT_TRUE(value->Equals(expected_urls.get()));
- EXPECT_TRUE(GetPreferenceValue(prefs::kURLsToRestoreOnStartup).
- Equals(expected_urls.get()));
-
- // Should not have synced in the old startup url values.
- value = FindValue(prefs::kURLsToRestoreOnStartupOld, out).Pass();
- ASSERT_FALSE(value.get());
- EXPECT_FALSE(GetPreferenceValue(prefs::kURLsToRestoreOnStartupOld).
- Equals(expected_urls.get()));
-}
-
TEST_F(PrefServiceSyncableTest, FailModelAssociation) {
syncer::SyncChangeList output;
TestSyncProcessorStub* stub = new TestSyncProcessorStub(&output);
« chrome/browser/prefs/pref_model_associator.cc ('K') | « chrome/browser/prefs/pref_model_associator.cc ('k') | chrome/browser/prefs/session_startup_pref.cc » ('j') | chrome/browser/prefs/session_startup_pref.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698