Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c

1 files changed, 13 insertions, 2 deletions

diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 14882ba117..2160193ac3 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -591,9 +591,9 @@ class ProfileSyncService : public ProfileSyncServiceBase,
   // [ {"name": <name>, "value": <value>, "status": <status> }, ... ]
   // where <name> is a type's name, <value> is a string providing details for
   // the type's status, and <status> is one of "error", "warning" or "ok"
-  // dpending on the type's current status.
+  // depending on the type's current status.
   //
-  // This function is used by sync_ui_util.cc to help populate the about:sync
+  // This function is used by about_sync_util.cc to help populate the about:sync
   // page.  It returns a ListValue rather than a DictionaryValue in part to make
   // it easier to iterate over its elements when constructing that page.
   base::Value* GetTypeStatusMap() const;
@@ -766,6 +766,9 @@ class ProfileSyncService : public ProfileSyncServiceBase,
     return backend_mode_;
   }
 
+  void SetClearingBrowseringDataForTesting(
+      base::Callback<void(Profile*, base::Time, base::Time)> c);
+
  protected:
   // Helper to configure the priority data types.
   void ConfigurePriorityDataTypes();
@@ -935,6 +938,12 @@ class ProfileSyncService : public ProfileSyncServiceBase,
   // True if a syncing backend exists.
   bool HasSyncingBackend() const;
 
+  // Update first sync time stored in preferences
+  void UpdateFirstSyncTimePref();
+
+  // Clear browsing data since first sync during rollback.
+  void ClearBrowsingDataSinceFirstSync();
+
  // Factory used to create various dependent objects.
   scoped_ptr<ProfileSyncComponentsFactory> factory_;
 
@@ -1099,6 +1108,8 @@ class ProfileSyncService : public ProfileSyncServiceBase,
   // time.
   base::TimeDelta backup_start_delay_;
 
+  base::Callback<void(Profile*, base::Time, base::Time)> clear_browsing_data_;
+
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };