[Sync] Make BackendMigrator not wait for full sync cycles

chrome/browser/sync/profile_sync_service.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/string16.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "base/tracked.h"
 #include "chrome/browser/prefs/pref_member.h"
+#include "chrome/browser/sync/backend_migrator.h"
 #include "chrome/browser/sync/engine/model_safe_worker.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/internal_api/sync_manager.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/sync_js_controller.h"
 #include "chrome/browser/sync/sync_setup_wizard.h"
 #include "chrome/browser/sync/unrecoverable_error_handler.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "content/common/content_notification_types.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 
 class NotificationDetails;
 class NotificationSource;
 class Profile;
 class ProfileSyncFactory;
 class SigninManager;
 struct ChromeCookieDetails;
 
 namespace browser_sync {
-class BackendMigrator;
 class ChangeProcessor;
 class DataTypeManager;
 class JsController;
 class SessionModelAssociator;
 namespace sessions { struct SyncSessionSnapshot; }
 }
 
 namespace sync_api {
 class BaseTransaction;
 struct SyncCredentials;
@@ skipping 37 matching lines @@
 //      actively installed ChangeProcessor that listens for changes to this
 //      datatype, propagating such changes into and out of the sync backend
 //      as necessary.
 //
 //      When a datatype is in the process of becoming active, it may be
 //      in some intermediate state.  Those finer-grained intermediate states
 //      are differentiated by the DataTypeController state.
 //
 class ProfileSyncService : public browser_sync::SyncFrontend,
                            public browser_sync::UnrecoverableErrorHandler,
+                           public browser_sync::MigrationObserver,
                            public NotificationObserver {
  public:
   typedef ProfileSyncServiceObserver Observer;
   typedef browser_sync::SyncBackendHost::Status Status;
 
   enum SyncEventCodes  {
     MIN_SYNC_EVENT_CODE = 0,
 
     // Events starting the sync service.
     START_FROM_NTP = 1,      // Sync was started from the ad in NTP
@@ skipping 231 matching lines @@
   // command-line switches).
   static bool IsSyncEnabled();
 
   // Returns whether sync is managed, i.e. controlled by configuration
   // management. If so, the user is not allowed to configure sync.
   bool IsManaged();
 
   // UnrecoverableErrorHandler implementation.
   virtual void OnUnrecoverableError(
       const tracked_objects::Location& from_here,
-      const std::string& message);
+      const std::string& message) OVERRIDE;
+
+  // MigrationObserver implementation.
+  virtual void OnMigrationStateChange() OVERRIDE;
 
   // The functions below (until ActivateDataType()) should only be
   // called if sync_initialized() is true.
 
   // TODO(akalin): This is called mostly by ModelAssociators and
   // tests.  Figure out how to pass the handle to the ModelAssociators
   // directly, figure out how to expose this to tests, and remove this
   // function.
   sync_api::UserShare* GetUserShare() const;
 
   // TODO(akalin): These two functions are used only by
   // ProfileSyncServiceHarness.  Figure out a different way to expose
   // this info to that class, and remove these functions.
 
   virtual const browser_sync::sessions::SyncSessionSnapshot*
       GetLastSessionSnapshot() const;
 
   // Returns whether or not the underlying sync engine has made any
   // local changes to items that have not yet been synced with the
   // server.
   bool HasUnsyncedItems() const;
 
   // Logs the current unsynced items in the sync database. Useful for debugging.
   void LogUnsyncedItems(int level) const;
 
   // Returns whether or not the sync service is reconfiguring due
   // to server-initiated resynchronization.
   bool HasPendingBackendMigration() const;
 
+  // Returns the types that are currently pending migration.  Used by
+  // tests.
+  syncable::ModelTypeSet GetPendingMigrationTypesForTest() const;
+
   // Get the current routing information for all enabled model types.
   // If a model type is not enabled (that is, if the syncer should not
   // be trying to sync it), it is not in this map.
   //
   // TODO(akalin): This function is used by
   // sync_ui_util::ConstructAboutInformation() and by some test
   // classes.  Figure out a different way to expose this info and
   // remove this function.
   void GetModelSafeRoutingInfo(
       browser_sync::ModelSafeRoutingInfo* out) const;
@@ skipping 266 matching lines @@
   // (OnEncryptionComplete) or the user cancels.
   syncable::ModelTypeSet pending_types_for_encryption_;
   bool set_backend_encrypted_types_;
 
   scoped_ptr<browser_sync::BackendMigrator> migrator_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_