Componentize //chrome/browser/prefs/tracked.

components/prefs_tracker/tracked_preferences_migration.cc

Index: components/prefs_tracker/tracked_preferences_migration.cc
diff --git a/chrome/browser/prefs/tracked/tracked_preferences_migration.cc b/components/prefs_tracker/tracked_preferences_migration.cc
similarity index 86%
rename from chrome/browser/prefs/tracked/tracked_preferences_migration.cc
rename to components/prefs_tracker/tracked_preferences_migration.cc
index e1401ef244dc34e3c408c2483247baccc238095c..fec24e18f2cc145e6f93887bc48438d53f67f709 100644
--- a/chrome/browser/prefs/tracked/tracked_preferences_migration.cc
+++ b/components/prefs_tracker/tracked_preferences_migration.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/prefs/tracked/tracked_preferences_migration.h"
+#include "components/prefs_tracker/tracked_preferences_migration.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ -10,11 +10,11 @@
 #include "base/memory/ref_counted.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
-#include "chrome/browser/prefs/tracked/dictionary_hash_store_contents.h"
-#include "chrome/browser/prefs/tracked/hash_store_contents.h"
-#include "chrome/browser/prefs/tracked/interceptable_pref_filter.h"
-#include "chrome/browser/prefs/tracked/pref_hash_store.h"
-#include "chrome/browser/prefs/tracked/pref_hash_store_transaction.h"
+#include "components/prefs_tracker/dictionary_hash_store_contents.h"
+#include "components/prefs_tracker/hash_store_contents.h"
+#include "components/prefs_tracker/interceptable_pref_filter.h"
+#include "components/prefs_tracker/pref_hash_store.h"
+#include "components/prefs_tracker/pref_hash_store_transaction.h"
 
 namespace {
 
@@ -41,10 +41,7 @@ class TrackedPreferencesMigrator
  private:
   friend class base::RefCounted<TrackedPreferencesMigrator>;
 
-  enum PrefFilterID {
-    UNPROTECTED_PREF_FILTER,
-    PROTECTED_PREF_FILTER
-  };
+  enum PrefFilterID { UNPROTECTED_PREF_FILTER, PROTECTED_PREF_FILTER };
 
   ~TrackedPreferencesMigrator();
 
@@ -124,8 +121,7 @@ void CleanupMigratedHashes(const std::set<std::string>& migrated_pref_names,
       origin_pref_hash_store->BeginTransaction(scoped_ptr<HashStoreContents>(
           new DictionaryHashStoreContents(origin_pref_store))));
   for (std::set<std::string>::const_iterator it = migrated_pref_names.begin();
-       it != migrated_pref_names.end();
-       ++it) {
+       it != migrated_pref_names.end(); ++it) {
     transaction->ClearHash(*it);
   }
 }
@@ -151,10 +147,9 @@ void MigratePrefsFromOldToNewStore(const std::set<std::string>& pref_names,
           new DictionaryHashStoreContents(new_store))));
 
   for (std::set<std::string>::const_iterator it = pref_names.begin();
-       it != pref_names.end();
-       ++it) {
-     const std::string& pref_name = *it;
-     const base::Value* value_in_old_store = NULL;
+       it != pref_names.end(); ++it) {
+    const std::string& pref_name = *it;
+    const base::Value* value_in_old_store = NULL;
 
     // If the destination does not have a hash for this pref we will
     // unconditionally attempt to move it.
@@ -233,16 +228,15 @@ TrackedPreferencesMigrator::TrackedPreferencesMigrator(
   // The callbacks bound below will own this TrackedPreferencesMigrator by
   // reference.
   unprotected_pref_filter->InterceptNextFilterOnLoad(
-      base::Bind(&TrackedPreferencesMigrator::InterceptFilterOnLoad,
-                 this,
+      base::Bind(&TrackedPreferencesMigrator::InterceptFilterOnLoad, this,
                  UNPROTECTED_PREF_FILTER));
   protected_pref_filter->InterceptNextFilterOnLoad(
-      base::Bind(&TrackedPreferencesMigrator::InterceptFilterOnLoad,
-                 this,
+      base::Bind(&TrackedPreferencesMigrator::InterceptFilterOnLoad, this,
                  PROTECTED_PREF_FILTER));
 }
 
-TrackedPreferencesMigrator::~TrackedPreferencesMigrator() {}
+TrackedPreferencesMigrator::~TrackedPreferencesMigrator() {
+}
 
 void TrackedPreferencesMigrator::InterceptFilterOnLoad(
     PrefFilterID id,
@@ -271,24 +265,18 @@ void TrackedPreferencesMigrator::MigrateIfReady() {
   bool used_legacy_pref_hashes = false;
   bool protected_prefs_need_cleanup = false;
   bool unprotected_prefs_altered = false;
-  MigratePrefsFromOldToNewStore(unprotected_pref_names_,
-                                protected_prefs_.get(),
-                                unprotected_prefs_.get(),
-                                unprotected_pref_hash_store_.get(),
-                                legacy_pref_hash_store_.get(),
-                                &protected_prefs_need_cleanup,
-                                &unprotected_prefs_altered,
-                                &used_legacy_pref_hashes);
+  MigratePrefsFromOldToNewStore(
+      unprotected_pref_names_, protected_prefs_.get(), unprotected_prefs_.get(),
+      unprotected_pref_hash_store_.get(), legacy_pref_hash_store_.get(),
+      &protected_prefs_need_cleanup, &unprotected_prefs_altered,
+      &used_legacy_pref_hashes);
   bool unprotected_prefs_need_cleanup = false;
   bool protected_prefs_altered = false;
-  MigratePrefsFromOldToNewStore(protected_pref_names_,

[gab, 2015/07/23 21:41:16]

I think this is also easier to read (easier to see the difference between the
two calls than the pack of arguments).

[Jitu( very slow this week), 2015/07/24 09:09:23]

Done.

-                                unprotected_prefs_.get(),
-                                protected_prefs_.get(),
-                                protected_pref_hash_store_.get(),
-                                legacy_pref_hash_store_.get(),
-                                &unprotected_prefs_need_cleanup,
-                                &protected_prefs_altered,
-                                &used_legacy_pref_hashes);
+  MigratePrefsFromOldToNewStore(
+      protected_pref_names_, unprotected_prefs_.get(), protected_prefs_.get(),
+      protected_pref_hash_store_.get(), legacy_pref_hash_store_.get(),
+      &unprotected_prefs_need_cleanup, &protected_prefs_altered,
+      &used_legacy_pref_hashes);
   UMA_HISTOGRAM_BOOLEAN("Settings.MigratedHashesFromLocalState",
                         used_legacy_pref_hashes);
 
@@ -320,8 +308,7 @@ void TrackedPreferencesMigrator::MigrateIfReady() {
     // do it immediately if |!protected_prefs_altered|).
     ScheduleSourcePrefStoreCleanup(
         register_on_successful_protected_store_write_callback_,
-        unprotected_store_cleaner_,
-        protected_pref_names_,
+        unprotected_store_cleaner_, protected_pref_names_,
         protected_prefs_altered);
   }
 
@@ -331,8 +318,7 @@ void TrackedPreferencesMigrator::MigrateIfReady() {
     // do it immediately if |!unprotected_prefs_altered|).
     ScheduleSourcePrefStoreCleanup(
         register_on_successful_unprotected_store_write_callback_,
-        protected_store_cleaner_,
-        unprotected_pref_names_,
+        protected_store_cleaner_, unprotected_pref_names_,
         unprotected_prefs_altered);
   }
 }
@@ -356,15 +342,11 @@ void SetupTrackedPreferencesMigration(
     InterceptablePrefFilter* protected_pref_filter) {
   scoped_refptr<TrackedPreferencesMigrator> prefs_migrator(
       new TrackedPreferencesMigrator(
-          unprotected_pref_names,
-          protected_pref_names,
-          unprotected_store_cleaner,
-          protected_store_cleaner,
+          unprotected_pref_names, protected_pref_names,
+          unprotected_store_cleaner, protected_store_cleaner,
           register_on_successful_unprotected_store_write_callback,
           register_on_successful_protected_store_write_callback,
-          unprotected_pref_hash_store.Pass(),
-          protected_pref_hash_store.Pass(),
-          legacy_pref_hash_store.Pass(),
-          unprotected_pref_filter,
+          unprotected_pref_hash_store.Pass(), protected_pref_hash_store.Pass(),
+          legacy_pref_hash_store.Pass(), unprotected_pref_filter,
           protected_pref_filter));
 }