Clean up old legacy preference migration logic.

chrome/browser/prefs/profile_pref_store_manager.cc

Index: chrome/browser/prefs/profile_pref_store_manager.cc
diff --git a/chrome/browser/prefs/profile_pref_store_manager.cc b/chrome/browser/prefs/profile_pref_store_manager.cc
index d1cca84046663e7af2373bfa230a157d36622b35..faba02c8c1afb9a9bf0bc892bdd978d658fd4eb2 100644
--- a/chrome/browser/prefs/profile_pref_store_manager.cc
+++ b/chrome/browser/prefs/profile_pref_store_manager.cc
@@ -20,7 +20,6 @@
 #include "components/prefs/persistent_pref_store.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/user_prefs/tracked/pref_hash_store_impl.h"
-#include "components/user_prefs/tracked/pref_service_hash_store_contents.h"
 #include "components/user_prefs/tracked/segregated_pref_store.h"
 #include "components/user_prefs/tracked/tracked_preferences_migration.h"
 
@@ -63,21 +62,11 @@ ProfilePrefStoreManager::ProfilePrefStoreManager(
 ProfilePrefStoreManager::~ProfilePrefStoreManager() {}
 
 // static
-void ProfilePrefStoreManager::RegisterPrefs(PrefRegistrySimple* registry) {
-  PrefServiceHashStoreContents::RegisterPrefs(registry);
-}
-
-// static
 void ProfilePrefStoreManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   PrefHashFilter::RegisterProfilePrefs(registry);
 }
 
-// static
-void ProfilePrefStoreManager::ResetAllPrefHashStores(PrefService* local_state) {
-  PrefServiceHashStoreContents::ResetAllPrefHashStores(local_state);
-}
-
 //  static
 base::Time ProfilePrefStoreManager::GetResetTime(PrefService* pref_service) {
   return PrefHashFilter::GetResetTime(pref_service);
@@ -150,8 +139,6 @@ PersistentPrefStore* ProfilePrefStoreManager::CreateProfilePrefStore(
       base::Bind(&JsonPrefStore::RegisterOnNextSuccessfulWriteCallback,
                  protected_pref_store->AsWeakPtr()),
       GetPrefHashStore(false), GetPrefHashStore(true),
-      std::unique_ptr<HashStoreContents>(new PrefServiceHashStoreContents(
-          profile_path_.AsUTF8Unsafe(), local_state_)),
       raw_unprotected_pref_hash_filter, raw_protected_pref_hash_filter);
 
   return new SegregatedPrefStore(unprotected_pref_store, protected_pref_store,
@@ -195,24 +182,6 @@ bool ProfilePrefStoreManager::InitializePrefsFromMasterPrefs(
   return success;
 }
 
-PersistentPrefStore*
-ProfilePrefStoreManager::CreateDeprecatedCombinedProfilePrefStore(
-    const scoped_refptr<base::SequencedTaskRunner>& io_task_runner) {
-  std::unique_ptr<PrefFilter> pref_filter;
-  if (kPlatformSupportsPreferenceTracking) {
-    std::unique_ptr<PrefHashStoreImpl> pref_hash_store_impl(
-        new PrefHashStoreImpl(seed_, device_id_, true));
-    pref_hash_store_impl->set_legacy_hash_store_contents(

[gab, 2016/07/04 15:21:46]

Also rm set_legacy_hash_store_contents() (was only caller).

[proberge, 2016/07/04 20:31:42]

Done. I think there's some logic that could be cleaned up in
pref_hash_calculator as well, but I'll leave that to you.

[gab, 2016/07/04 20:46:45]

Yes there is, we were going to switch the device ID being used to one that
doesn't depend on RLZ at some point (ask alito/robertshield), device_id_win.cc
actually has all the logic but it isn't hooked up to anything but its own
unittest...

That is still a worthwhile effort IMO and I was hoping cleaning up the old
device ID migration support could be bundled with that.

-        std::unique_ptr<HashStoreContents>(new PrefServiceHashStoreContents(
-            profile_path_.AsUTF8Unsafe(), local_state_)));
-    pref_filter.reset(new PrefHashFilter(
-        std::move(pref_hash_store_impl), tracking_configuration_,
-        base::Closure(), NULL, reporting_ids_count_, false));
-  }
-  return new JsonPrefStore(profile_path_.Append(chrome::kPreferencesFilename),
-                           io_task_runner.get(), std::move(pref_filter));
-}
-
 std::unique_ptr<PrefHashStore> ProfilePrefStoreManager::GetPrefHashStore(
     bool use_super_mac) {
   DCHECK(kPlatformSupportsPreferenceTracking);