Commit changes after a reset.

chrome/browser/prefs/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 "chrome/browser/prefs/pref_hash_filter.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 134 matching lines @@
     const std::string& initialized_path = it->first;
     const TrackedPreference* initialized_preference = it->second;
     const base::Value* value = NULL;
     pref_store.GetValue(initialized_path, &value);
     initialized_preference->OnNewValue(value, hash_store_transaction.get());
   }
 }
 
 // Validates loaded preference values according to stored hashes, reports
 // validation results via UMA, and updates hashes in case of mismatch.
-void PrefHashFilter::FilterOnLoad(base::DictionaryValue* pref_store_contents) {
+bool PrefHashFilter::FilterOnLoad(base::DictionaryValue* pref_store_contents) {
   DCHECK(pref_store_contents);
   base::TimeTicks checkpoint = base::TimeTicks::Now();
 
   bool did_reset = false;
   {
     scoped_ptr<PrefHashStoreTransaction> hash_store_transaction(
         pref_hash_store_->BeginTransaction());
     for (TrackedPreferencesMap::const_iterator it = tracked_paths_.begin();
          it != tracked_paths_.end(); ++it) {
       if (it->second->EnforceAndReport(pref_store_contents,
                                        hash_store_transaction.get())) {
         did_reset = true;
       }
     }
   }
 
   if (did_reset) {
     pref_store_contents->Set(prefs::kPreferenceResetTime,
                              new base::StringValue(base::Int64ToString(
                                  base::Time::Now().ToInternalValue())));
   }
 
   // TODO(gab): Remove this histogram by Feb 21 2014; after sufficient timing
   // data has been gathered from the wild to be confident this doesn't
   // significantly affect startup.
   UMA_HISTOGRAM_TIMES("Settings.FilterOnLoadTime",
                       base::TimeTicks::Now() - checkpoint);
+
+  return did_reset;
 }
 
 // Marks |path| has having changed if it is part of |tracked_paths_|. A new hash
 // will be stored for it the next time FilterSerializeData() is invoked.
 void PrefHashFilter::FilterUpdate(const std::string& path) {
   TrackedPreferencesMap::const_iterator it = tracked_paths_.find(path);
   if (it != tracked_paths_.end())
     changed_paths_.insert(std::make_pair(path, it->second));
 }
 
@@ skipping 17 matching lines @@
       }
       changed_paths_.clear();
     }
     // TODO(gab): Remove this histogram by Feb 21 2014; after sufficient timing
     // data has been gathered from the wild to be confident this doesn't
     // significantly affect performance on the UI thread.
     UMA_HISTOGRAM_TIMES("Settings.FilterSerializeDataTime",
                         base::TimeTicks::Now() - checkpoint);
   }
 }