Remove year+ old migration support of "session.urls_to_restore_on_startup".

chrome/browser/prefs/pref_service_syncable_unittest.cc

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) {
-  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);