Merge 284507 "Invoke the StartSyncFlare for prefs when performin..."

chrome/browser/prefs/profile_pref_store_manager.h

 // Copyright 2014 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_PROFILE_PREF_STORE_MANAGER_H_
 #define CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 61 matching lines @@
   // was built by ProfilePrefStoreManager.
   // If no reset has occurred, returns a null |Time|.
   static base::Time GetResetTime(PrefService* pref_service);
 
   // Clears the time of the last preference reset event, if any, for
   // |pref_service|. Assumes that |pref_service| is backed by a PrefStore that
   // was built by ProfilePrefStoreManager.
   static void ClearResetTime(PrefService* pref_service);
 
   // Creates a PersistentPrefStore providing access to the user preferences of
-  // the managed profile. An optional |validation_delegate| will be notified
+  // the managed profile. If |on_reset| is provided, it will be invoked if a
+  // reset occurs as a result of loading the profile's prefs.
+  // An optional |validation_delegate| will be notified
   // of the status of each tracked preference as they are checked.
   PersistentPrefStore* CreateProfilePrefStore(
       const scoped_refptr<base::SequencedTaskRunner>& io_task_runner,
+      const base::Closure& on_reset_on_load,
       TrackedPreferenceValidationDelegate* validation_delegate);
 
   // Initializes the preferences for the managed profile with the preference
   // values in |master_prefs|. Acts synchronously, including blocking IO.
   // Returns true on success.
   bool InitializePrefsFromMasterPrefs(
       const base::DictionaryValue& master_prefs);
 
   // Creates a single-file PrefStore as was used in M34 and earlier. Used only
   // for testing migration.
@@ skipping 13 matching lines @@
       tracking_configuration_;
   const size_t reporting_ids_count_;
   const std::string seed_;
   const std::string device_id_;
   PrefService* local_state_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfilePrefStoreManager);
 };
 
 #endif  // CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_