Componentize //chrome/browser/prefs/tracked.

components/prefs_tracker/pref_hash_filter.cc

Index: components/prefs_tracker/pref_hash_filter.cc
diff --git a/chrome/browser/prefs/tracked/pref_hash_filter.cc b/components/prefs_tracker/pref_hash_filter.cc
similarity index 81%
rename from chrome/browser/prefs/tracked/pref_hash_filter.cc
rename to components/prefs_tracker/pref_hash_filter.cc
index 5fe4fa14e0d156c8dcedb1de1ded23228706af8e..3ed64361d935e48076a2d9b4010c9ff72ff21f06 100644
--- a/chrome/browser/prefs/tracked/pref_hash_filter.cc
+++ b/components/prefs_tracker/pref_hash_filter.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/pref_hash_filter.h"
+#include "components/prefs_tracker/pref_hash_filter.h"
 
 #include <algorithm>
 
@@ -13,13 +13,13 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "chrome/browser/prefs/tracked/dictionary_hash_store_contents.h"
-#include "chrome/browser/prefs/tracked/pref_hash_store.h"
-#include "chrome/browser/prefs/tracked/pref_hash_store_transaction.h"
-#include "chrome/browser/prefs/tracked/tracked_atomic_preference.h"
-#include "chrome/browser/prefs/tracked/tracked_split_preference.h"
-#include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
+#include "components/prefs_tracker/dictionary_hash_store_contents.h"
+#include "components/prefs_tracker/pref_hash_store.h"
+#include "components/prefs_tracker/pref_hash_store_transaction.h"
+#include "components/prefs_tracker/pref_names.h"
+#include "components/prefs_tracker/tracked_atomic_preference.h"
+#include "components/prefs_tracker/tracked_split_preference.h"
 
 namespace {
 
@@ -29,10 +29,10 @@ void CleanupDeprecatedTrackedPreferences(
   // Add deprecated previously tracked preferences below for them to be cleaned
   // up from both the pref files and the hash store.
   static const char* const kDeprecatedTrackedPreferences[] = {

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

These used to move from c/b/prefs/chrome_pref_service_factory.cc to here in
c/b/prefs/tracked/pref_hash_filter.cc upon deprecation, this path is now a lot
more blurry...

[blundell, 2015/07/24 08:26:19]

Could you elaborate a bit? Are you saying more blurry because now that path is
crossing the line from the Chrome embedder into the component?

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

sorry i couldn't get this. Can you please elaborate more on this.

-    // TODO(grt): Remove in M44+.
-    "safebrowsing.incident_report_sent",
-    // TODO(mad): Remove in M48+.
-    "software_reporter.prompt_reason",
+      // TODO(grt): Remove in M44+.
+      "safebrowsing.incident_report_sent",
+      // TODO(mad): Remove in M48+.
+      "software_reporter.prompt_reason",
   };
 
   for (size_t i = 0; i < arraysize(kDeprecatedTrackedPreferences); ++i) {
@@ -63,28 +63,20 @@ PrefHashFilter::PrefHashFilter(
     scoped_ptr<TrackedPreference> tracked_preference;
     switch (metadata.strategy) {
       case TRACKING_STRATEGY_ATOMIC:
-        tracked_preference.reset(
-            new TrackedAtomicPreference(metadata.name,
-                                        metadata.reporting_id,
-                                        reporting_ids_count,
-                                        metadata.enforcement_level,
-                                        metadata.value_type,
-                                        delegate));
+        tracked_preference.reset(new TrackedAtomicPreference(
+            metadata.name, metadata.reporting_id, reporting_ids_count,
+            metadata.enforcement_level, metadata.value_type, delegate));
         break;
       case TRACKING_STRATEGY_SPLIT:
-        tracked_preference.reset(
-            new TrackedSplitPreference(metadata.name,
-                                       metadata.reporting_id,
-                                       reporting_ids_count,
-                                       metadata.enforcement_level,
-                                       metadata.value_type,
-                                       delegate));
+        tracked_preference.reset(new TrackedSplitPreference(
+            metadata.name, metadata.reporting_id, reporting_ids_count,
+            metadata.enforcement_level, metadata.value_type, delegate));
         break;
     }
     DCHECK(tracked_preference);
 
-    bool is_new = tracked_paths_.add(metadata.name,
-                                     tracked_preference.Pass()).second;
+    bool is_new =
+        tracked_paths_.add(metadata.name, tracked_preference.Pass()).second;
     DCHECK(is_new);
   }
 }
@@ -111,9 +103,8 @@ base::Time PrefHashFilter::GetResetTime(PrefService* user_prefs) {
   // (which we do via a PrefStore, preventing us from reusing
   // PrefService::SetInt64).
   int64 internal_value = base::Time().ToInternalValue();
-  if (!base::StringToInt64(
-          user_prefs->GetString(prefs::kPreferenceResetTime),
-          &internal_value)) {
+  if (!base::StringToInt64(user_prefs->GetString(prefs::kPreferenceResetTime),
+                           &internal_value)) {
     // Somehow the value stored on disk is not a valid int64.
     NOTREACHED();
     return base::Time();
@@ -190,8 +181,8 @@ void PrefHashFilter::FinalizeFilterOnLoad(
         pref_hash_store_->BeginTransaction(scoped_ptr<HashStoreContents>(
             new DictionaryHashStoreContents(pref_store_contents.get()))));
 
-    CleanupDeprecatedTrackedPreferences(
-        pref_store_contents.get(), hash_store_transaction.get());
+    CleanupDeprecatedTrackedPreferences(pref_store_contents.get(),
+                                        hash_store_transaction.get());
 
     if (report_super_mac_validity_) {
       UMA_HISTOGRAM_BOOLEAN("Settings.HashesDictionaryTrusted",