WIP: Pref service user prefs.

components/user_prefs/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 "components/user_prefs/tracked/pref_hash_filter.h"
 
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
 
@@ skipping 60 matching lines @@
   // 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) {
     const TrackedPreferenceMetadata& metadata = tracked_preferences[i];
 
     std::unique_ptr<TrackedPreference> tracked_preference;
     switch (metadata.strategy) {
-      case TRACKING_STRATEGY_ATOMIC:
+      case PrefTrackingStrategy::ATOMIC:
         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:
+      case PrefTrackingStrategy::SPLIT:
         tracked_preference.reset(
             new TrackedSplitPreference(metadata.name,
                                        metadata.reporting_id,
                                        reporting_ids_count,
                                        metadata.enforcement_level,
                                        metadata.value_type,
                                        delegate));
         break;
     }
     DCHECK(tracked_preference);
@@ skipping 148 matching lines @@
 
   if (did_reset) {
     pref_store_contents->Set(user_prefs::kPreferenceResetTime,
                              new base::Value(base::Int64ToString(
                                  base::Time::Now().ToInternalValue())));
     FilterUpdate(user_prefs::kPreferenceResetTime);
 
     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);
 
   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)));
 }