Revert of Pref service: add support for tracked prefs.

services/preferences/tracked/pref_hash_filter.cc

Index: services/preferences/tracked/pref_hash_filter.cc
diff --git a/services/preferences/tracked/pref_hash_filter.cc b/services/preferences/tracked/pref_hash_filter.cc
index 29d6b9ab830891d3388ed91e6c14957deed32465..69e622e8b3c8e841ceab793323e6fde473590f7b 100644
--- a/services/preferences/tracked/pref_hash_filter.cc
+++ b/services/preferences/tracked/pref_hash_filter.cc
@@ -55,7 +55,7 @@
     StoreContentsPair external_validation_hash_store_pair,
     const std::vector<prefs::mojom::TrackedPreferenceMetadataPtr>&
         tracked_preferences,
-    prefs::mojom::ResetOnLoadObserverPtr reset_on_load_observer,
+    const base::Closure& on_reset_on_load,
     prefs::mojom::TrackedPreferenceValidationDelegate* delegate,
     size_t reporting_ids_count,
     bool report_super_mac_validity)
@@ -65,7 +65,7 @@
               ? base::make_optional(
                     std::move(external_validation_hash_store_pair))
               : base::nullopt),
-      reset_on_load_observer_(std::move(reset_on_load_observer)),
+      on_reset_on_load_(on_reset_on_load),
       report_super_mac_validity_(report_super_mac_validity) {
   DCHECK(pref_hash_store_);
   DCHECK_GE(reporting_ids_count, tracked_preferences.size());
@@ -248,10 +248,10 @@
                                  base::Time::Now().ToInternalValue())));
     FilterUpdate(user_prefs::kPreferenceResetTime);
 
-    if (reset_on_load_observer_)
-      reset_on_load_observer_->OnResetOnLoad();
-  }
-  reset_on_load_observer_.reset();
+    if (!on_reset_on_load_.is_null())
+      on_reset_on_load_.Run();
+  }
+  on_reset_on_load_.Reset();
 
   UMA_HISTOGRAM_TIMES("Settings.FilterOnLoadTime",
                       base::TimeTicks::Now() - checkpoint);