Commit changes after a reset.

chrome/browser/prefs/pref_hash_filter.h

 // 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.
 
 #ifndef CHROME_BROWSER_PREFS_PREF_HASH_FILTER_H_
 #define CHROME_BROWSER_PREFS_PREF_HASH_FILTER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 76 matching lines @@
   // Migrates protected values from |source| to |destination|. Values are
   // migrated if they are protected according to this filter's configuration,
   // the corresponding key has no value in |destination|, and the value in
   // |source| is trusted according to this filter's PrefHashStore. Regardless of
   // the state of |destination| or the trust status, the protected values will
   // be removed from |source|.
   void MigrateValues(PersistentPrefStore* source,
                      PersistentPrefStore* destination);
 
   // PrefFilter implementation.
-  virtual void FilterOnLoad(base::DictionaryValue* pref_store_contents)
+  virtual bool FilterOnLoad(base::DictionaryValue* pref_store_contents)
       OVERRIDE;
   virtual void FilterUpdate(const std::string& path) OVERRIDE;
   virtual void FilterSerializeData(
       const base::DictionaryValue* pref_store_contents) OVERRIDE;
 
  private:
   // A map of paths to TrackedPreferences; this map owns this individual
   // TrackedPreference objects.
   typedef base::ScopedPtrHashMap<std::string, TrackedPreference>
       TrackedPreferencesMap;
   // A map from changed paths to their corresponding TrackedPreferences (which
   // aren't owned by this map).
   typedef std::map<std::string, const TrackedPreference*> ChangedPathsMap;
 
   scoped_ptr<PrefHashStore> pref_hash_store_;
 
   TrackedPreferencesMap tracked_paths_;
 
   // The set of all paths whose value has changed since the last call to
   // FilterSerializeData.
   ChangedPathsMap changed_paths_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefHashFilter);
 };
 
 #endif  // CHROME_BROWSER_PREFS_PREF_HASH_FILTER_H_