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

chrome/browser/prefs/pref_service_syncable_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prefs/pref_service_syncable.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 67 matching lines @@
   void SetUp() override {
     prefs_.registry()->RegisterStringPref(kUnsyncedPreferenceName,
                                           kUnsyncedPreferenceDefaultValue);
     prefs_.registry()->RegisterStringPref(
         prefs::kHomePage,
         std::string(),
         user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
     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),
         user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 
     pref_sync_service_ = reinterpret_cast<PrefModelAssociator*>(
         prefs_.GetSyncableService(syncer::PREFERENCES));
     ASSERT_TRUE(pref_sync_service_);
     next_pref_remote_sync_node_id_ = 0;
   }
@@ skipping 188 matching lines @@
   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()));
   EXPECT_EQ(kNonDefaultCharsetValue,
             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) though, we should keep the
tests around -- which I guess means dummy pref names in impl :-( or better mocks
for tests?

[sdefresne, 2015/08/26 16:00:56]

Implementation has been removed as recommended by zea@.

-  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);
   stub->FailNextProcessSyncChanges();
   syncer::SyncMergeResult r = pref_sync_service_->MergeDataAndStartSyncing(
       syncer::PREFERENCES, syncer::SyncDataList(),
       scoped_ptr<syncer::SyncChangeProcessor>(stub),
       scoped_ptr<syncer::SyncErrorFactory>(
           new syncer::SyncErrorFactoryMock()));
   EXPECT_TRUE(r.error().IsSet());
@@ skipping 237 matching lines @@
 
   InitWithNoSyncData();
 
   scoped_ptr<base::Value> null_value = base::Value::CreateNullValue();
   syncer::SyncChangeList list;
   list.push_back(MakeRemoteChange(
       1, prefs::kHomePage, *null_value, SyncChange::ACTION_DELETE));
   pref_sync_service_->ProcessSyncChanges(FROM_HERE, list);
   EXPECT_TRUE(pref->IsDefaultValue());
 }