[Sync] Fix backup/rollback tests race conditions

chrome/browser/sync/profile_sync_service.h

 // Copyright (c) 2012 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_SYNC_PROFILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/sync/backend_unrecoverable_error_handler.h"
 #include "chrome/browser/sync/backup_rollback_controller.h"
 #include "chrome/browser/sync/glue/local_device_info_provider.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/glue/synced_device_tracker.h"
 #include "chrome/browser/sync/profile_sync_service_base.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
 #include "chrome/browser/sync/protocol_event_observer.h"
 #include "chrome/browser/sync/sessions/sessions_sync_manager.h"
 #include "chrome/browser/sync/startup_controller.h"
@@ skipping 735 matching lines @@
   // This function takes ownership of |network_resources|.
   void OverrideNetworkResourcesForTest(
       scoped_ptr<syncer::NetworkResources> network_resources);
 
   virtual bool IsSessionsDataTypeControllerRunning() const;
 
   BackendMode backend_mode() const {
     return backend_mode_;
   }
 
-  void SetClearingBrowseringDataForTesting(
-      base::Callback<void(Profile*, base::Time, base::Time)> c);
+  // Helpers for testing rollback.
+  void SetBrowsingDataRemoverObserverForTesting(
+      BrowsingDataRemover::Observer* observer);
+  void SetClearingBrowseringDataForTesting(base::Callback<
+      void(BrowsingDataRemover::Observer*, Profile*, base::Time, base::Time)>
+                                               c);
 
   // Return the base URL of the Sync Server.
   static GURL GetSyncServiceURL(const base::CommandLine& command_line);
 
   base::Time GetDeviceBackupTimeForTesting() const;
 
  protected:
   // Helper to configure the priority data types.
   void ConfigurePriorityDataTypes();
 
@@ skipping 352 matching lines @@
   BackendMode backend_mode_;
 
   // Whether backup is needed before sync starts.
   bool need_backup_;
 
   // Whether backup is finished.
   bool backup_finished_;
 
   base::Time backup_start_time_;
 
-  base::Callback<void(Profile*, base::Time, base::Time)> clear_browsing_data_;
+  base::Callback<
+      void(BrowsingDataRemover::Observer*, Profile*, base::Time, base::Time)>
+      clear_browsing_data_;
 
   // Last time when pre-sync data was saved. NULL pointer means backup data
   // state is unknown. If time value is null, backup data doesn't exist.
   scoped_ptr<base::Time> last_backup_time_;
 
+  BrowsingDataRemover::Observer* browsing_data_remover_observer_;
+
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 bool ShouldShowActionOnUI(
     const syncer::SyncProtocolError& error);
 
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_