Change configuration of user prefs to use mojo.

components/user_prefs/tracked/pref_hash_filter.cc

Index: components/user_prefs/tracked/pref_hash_filter.cc
diff --git a/components/user_prefs/tracked/pref_hash_filter.cc b/components/user_prefs/tracked/pref_hash_filter.cc
index 7b108c48b8af89e5e05e0f50a98ce10f9ddcf3df..1a2e347a5353b68f8427fc783f606d757cdb1393 100644
--- a/components/user_prefs/tracked/pref_hash_filter.cc
+++ b/components/user_prefs/tracked/pref_hash_filter.cc
@@ -78,7 +78,7 @@ PrefHashFilter::PrefHashFilter(
 
     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,
@@ -87,7 +87,7 @@ PrefHashFilter::PrefHashFilter(
                                         metadata.value_type,
                                         delegate));
         break;
-      case TRACKING_STRATEGY_SPLIT:
+      case PrefTrackingStrategy::SPLIT:
         tracked_preference.reset(
             new TrackedSplitPreference(metadata.name,
                                        metadata.reporting_id,
@@ -256,6 +256,7 @@ void PrefHashFilter::FinalizeFilterOnLoad(
     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);