Revert of Pref service: add support for tracked prefs.

services/preferences/tracked/pref_hash_filter.cc

 // Copyright 2013 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 "services/preferences/tracked/pref_hash_filter.h"
 
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
 
@@ skipping 37 matching lines @@
 }  // namespace
 
 using PrefTrackingStrategy =
     prefs::mojom::TrackedPreferenceMetadata::PrefTrackingStrategy;
 
 PrefHashFilter::PrefHashFilter(
     std::unique_ptr<PrefHashStore> pref_hash_store,
     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)
     : pref_hash_store_(std::move(pref_hash_store)),
       external_validation_hash_store_pair_(
           external_validation_hash_store_pair.first
               ? 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());
   // Verify that, if |external_validation_hash_store_pair_| is present, both its
   // items are non-null.
   DCHECK(!external_validation_hash_store_pair_.has_value() ||
          (external_validation_hash_store_pair_->first &&
           external_validation_hash_store_pair_->second));
 
   for (size_t i = 0; i < tracked_preferences.size(); ++i) {
@@ skipping 162 matching lines @@
     if (hash_store_transaction->StampSuperMac())
       prefs_altered = true;
   }
 
   if (did_reset) {
     pref_store_contents->Set(user_prefs::kPreferenceResetTime,
                              new base::Value(base::Int64ToString(
                                  base::Time::Now().ToInternalValue())));
     FilterUpdate(user_prefs::kPreferenceResetTime);
 
-    if (reset_on_load_observer_)
-      reset_on_load_observer_->OnResetOnLoad();
+    if (!on_reset_on_load_.is_null())
+      on_reset_on_load_.Run();
   }
-  reset_on_load_observer_.reset();
+  on_reset_on_load_.Reset();
 
   UMA_HISTOGRAM_TIMES("Settings.FilterOnLoadTime",
                       base::TimeTicks::Now() - checkpoint);
 
   post_filter_on_load_callback.Run(std::move(pref_store_contents),
                                    prefs_altered);
 }
 
 // static
 void PrefHashFilter::ClearFromExternalStore(
@@ skipping 92 matching lines @@
   // which owns the pointers.
   HashStoreContents* raw_contents = hash_store_contents_copy.get();
   base::DictionaryValue* raw_changed_paths_macs = changed_paths_macs.get();
 
   return std::make_pair(
       base::Bind(&ClearFromExternalStore, base::Unretained(raw_contents),
                  base::Unretained(raw_changed_paths_macs)),
       base::Bind(&FlushToExternalStore, base::Passed(&hash_store_contents_copy),
                  base::Passed(&changed_paths_macs)));
 }