Revert "Revert 142517 - [Sync] Refactor sync configuration logic."

sync/internal_api/public/sync_manager.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 SYNC_INTERNAL_API_PUBLIC_SYNC_MANAGER_H_
 #define SYNC_INTERNAL_API_PUBLIC_SYNC_MANAGER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 13 matching lines @@
 #include "sync/internal_api/public/util/unrecoverable_error_handler.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/protocol/sync_protocol_error.h"
 
 namespace syncer {
 class Encryptor;
 struct Experiments;
 class ExtensionsActivityMonitor;
 class JsBackend;
 class JsEventHandler;
+class SyncScheduler;
 
 namespace sessions {
 class SyncSessionSnapshot;
 }  // namespace sessions
 }  // namespace syncer
 
 namespace syncer {
 class SyncNotifier;
 }  // namespace syncer
 
@@ skipping 320 matching lines @@
   // |post_factory| will be owned internally and used to create
   // instances of an HttpPostProvider.
   // |model_safe_worker| ownership is given to the SyncManager.
   // |user_agent| is a 7-bit ASCII string suitable for use as the User-Agent
   // HTTP header. Used internally when collecting stats to classify clients.
   // |sync_notifier| is owned and used to listen for notifications.
   // |report_unrecoverable_error_function| may be NULL.
   //
   // TODO(akalin): Replace the |post_factory| parameter with a
   // URLFetcher parameter.
-  bool Init(const FilePath& database_location,
-            const syncer::WeakHandle<syncer::JsEventHandler>&
-                event_handler,
-            const std::string& sync_server_and_path,
-            int sync_server_port,
-            bool use_ssl,
-            const scoped_refptr<base::TaskRunner>& blocking_task_runner,
-            HttpPostProviderFactory* post_factory,
-            const syncer::ModelSafeRoutingInfo& model_safe_routing_info,
-            const std::vector<syncer::ModelSafeWorker*>& workers,
-            syncer::ExtensionsActivityMonitor*
-                extensions_activity_monitor,
-            ChangeDelegate* change_delegate,
-            const SyncCredentials& credentials,
-            syncer::SyncNotifier* sync_notifier,
-            const std::string& restored_key_for_bootstrapping,
-            TestingMode testing_mode,
-            syncer::Encryptor* encryptor,
-            syncer::UnrecoverableErrorHandler*
-                unrecoverable_error_handler,
-            syncer::ReportUnrecoverableErrorFunction
-                report_unrecoverable_error_function);
+  virtual bool Init(
+      const FilePath& database_location,
+      const syncer::WeakHandle<syncer::JsEventHandler>& event_handler,
+      const std::string& sync_server_and_path,
+      int sync_server_port,
+      bool use_ssl,
+      const scoped_refptr<base::TaskRunner>& blocking_task_runner,
+      scoped_ptr<HttpPostProviderFactory> post_factory,
+      const syncer::ModelSafeRoutingInfo& model_safe_routing_info,
+      const std::vector<syncer::ModelSafeWorker*>& workers,
+      syncer::ExtensionsActivityMonitor* extensions_activity_monitor,
+      ChangeDelegate* change_delegate,
+      const SyncCredentials& credentials,
+      scoped_ptr<syncer::SyncNotifier> sync_notifier,
+      const std::string& restored_key_for_bootstrapping,
+      TestingMode testing_mode,
+      syncer::Encryptor* encryptor,
+      syncer::UnrecoverableErrorHandler* unrecoverable_error_handler,
+      syncer::ReportUnrecoverableErrorFunction
+          report_unrecoverable_error_function);
 
   // Throw an unrecoverable error from a transaction (mostly used for
   // testing).
   void ThrowUnrecoverableError();
 
-  // Returns the set of types for which we have stored some sync data.
-  syncer::ModelTypeSet InitialSyncEndedTypes();
+  virtual syncer::ModelTypeSet InitialSyncEndedTypes();
+
+  // Returns those types within |types| that have an empty progress marker
+  // token.
+  virtual syncer::ModelTypeSet GetTypesWithEmptyProgressMarkerToken(
+      syncer::ModelTypeSet types);
 
   // Update tokens that we're using in Sync. Email must stay the same.
   void UpdateCredentials(const SyncCredentials& credentials);
 
   // Called when the user disables or enables a sync type.
-  void UpdateEnabledTypes(const syncer::ModelTypeSet& enabled_types);
+  virtual void UpdateEnabledTypes(const syncer::ModelTypeSet& enabled_types);
 
   // Put the syncer in normal mode ready to perform nudges and polls.
   void StartSyncingNormally(
       const syncer::ModelSafeRoutingInfo& routing_info);
 
   // Attempts to re-encrypt encrypted data types using the passphrase provided.
   // Notifies observers of the result of the operation via OnPassphraseAccepted
   // or OnPassphraseRequired, updates the nigori node, and does re-encryption as
   // appropriate. If an explicit password has been set previously, we drop
   // subsequent requests to set a passphrase. If the cryptographer has pending
   // keys, and a new implicit passphrase is provided, we try decrypting the
   // pending keys with it, and if that fails, we cache the passphrase for
   // re-encryption once the pending keys are decrypted.
   void SetEncryptionPassphrase(const std::string& passphrase, bool is_explicit);
 
   // Provides a passphrase for decrypting the user's existing sync data.
   // Notifies observers of the result of the operation via OnPassphraseAccepted
   // or OnPassphraseRequired, updates the nigori node, and does re-encryption as
   // appropriate if there is a previously cached encryption passphrase. It is an
   // error to call this when we don't have pending keys.
   void SetDecryptionPassphrase(const std::string& passphrase);
 
-  // Puts the SyncScheduler into a mode where no normal nudge or poll traffic
-  // will occur, but calls to RequestConfig will be supported.  If |callback|
-  // is provided, it will be invoked (from the internal SyncScheduler) when
-  // the thread has changed to configuration mode.
-  void StartConfigurationMode(const base::Closure& callback);
-
-  // Switches the mode of operation to CONFIGURATION_MODE and
-  // schedules a config task to fetch updates for |types|.
-  void RequestConfig(const syncer::ModelSafeRoutingInfo& routing_info,
-                     const syncer::ModelTypeSet& types,
-                     syncer::ConfigureReason reason);
-
-  void RequestCleanupDisabledTypes(
-      const syncer::ModelSafeRoutingInfo& routing_info);
+  // Switches the mode of operation to CONFIGURATION_MODE and performs
+  // any configuration tasks needed as determined by the params. Once complete,
+  // syncer will remain in CONFIGURATION_MODE until StartSyncingNormally is
+  // called.
+  // |ready_task| is invoked when the configuration completes.
+  // |retry_task| is invoked if the configuration job could not immediately
+  //              execute. |ready_task| will still be called when it eventually
+  //              does finish.
+  virtual void ConfigureSyncer(
+      ConfigureReason reason,
+      const syncer::ModelTypeSet& types_to_config,
+      const syncer::ModelSafeRoutingInfo& new_routing_info,
+      const base::Closure& ready_task,
+      const base::Closure& retry_task);
 
   // Adds a listener to be notified of sync events.
   // NOTE: It is OK (in fact, it's probably a good idea) to call this before
   // having received OnInitializationCompleted.
-  void AddObserver(Observer* observer);
+  virtual void AddObserver(Observer* observer);
 
   // Remove the given observer.  Make sure to call this if the
   // Observer is being destroyed so the SyncManager doesn't
   // potentially dereference garbage.
-  void RemoveObserver(Observer* observer);
+  virtual void RemoveObserver(Observer* observer);
 
   // Status-related getter.  May be called on any thread.
   SyncStatus GetDetailedStatus() const;
 
   // Whether or not the Nigori node is encrypted using an explicit passphrase.
   // May be called on any thread.
   bool IsUsingExplicitPassphrase();
 
   // Call periodically from a database-safe thread to persist recent changes
   // to the syncapi model.
   void SaveChanges();
 
   // Initiates shutdown of various components in the sync engine.  Must be
   // called from the main thread to allow preempting ongoing tasks on the sync
   // loop (that may be blocked on I/O).  The semantics of |callback| are the
   // same as with StartConfigurationMode. If provided and a scheduler / sync
   // loop exists, it will be invoked from the sync loop by the scheduler to
   // notify that all work has been flushed + cancelled, and it is idle.
   // If no scheduler exists, the callback is run immediately (from the loop
   // this was created on, which is the sync loop), as sync is effectively
   // stopped.
   void StopSyncingForShutdown(const base::Closure& callback);
 
   // Issue a final SaveChanges, and close sqlite handles.
-  void ShutdownOnSyncThread();
+  virtual void ShutdownOnSyncThread();
 
   // May be called from any thread.
   UserShare* GetUserShare() const;
 
   // Inform the cryptographer of the most recent passphrase and set of
   // encrypted types (from nigori node), then ensure all data that
   // needs encryption is encrypted with the appropriate passphrase.
   //
   // May trigger OnPassphraseRequired().  Otherwise, it will trigger
   // OnEncryptedTypesChanged() if necessary (see comments for
   // OnEncryptedTypesChanged()), and then OnEncryptionComplete().
   //
   // Also updates or adds device information to the nigori node.
   //
   // Note: opens a transaction, so must only be called after syncapi
   // has been initialized.
-  void RefreshNigori(const std::string& chrome_version,
-                     const base::Closure& done_callback);
+  virtual void RefreshNigori(const std::string& chrome_version,
+                             const base::Closure& done_callback);
 
   // Enable encryption of all sync data. Once enabled, it can never be
   // disabled without clearing the server data.
   //
   // This will trigger OnEncryptedTypesChanged() if necessary (see
   // comments for OnEncryptedTypesChanged()).  It then may trigger
   // OnPassphraseRequired(), but otherwise it will trigger
   // OnEncryptionComplete().
   void EnableEncryptEverything();
 
   // Returns true if we are currently encrypting all sync data.  May
   // be called on any thread.
   bool EncryptEverythingEnabledForTest() const;
 
   // Gets the set of encrypted types from the cryptographer
   // Note: opens a transaction.  May be called from any thread.
   syncer::ModelTypeSet GetEncryptedDataTypesForTest() const;
 
   // Reads the nigori node to determine if any experimental features should
   // be enabled.
   // Note: opens a transaction.  May be called on any thread.
-  bool ReceivedExperiment(syncer::Experiments* experiments) const;
+  virtual bool ReceivedExperiment(syncer::Experiments* experiments) const;
 
   // Uses a read-only transaction to determine if the directory being synced has
   // any remaining unsynced items.  May be called on any thread.
   bool HasUnsyncedItems() const;
 
   // Functions used for testing.
 
   void SimulateEnableNotificationsForTest();
 
   void SimulateDisableNotificationsForTest(int reason);
 
   void TriggerOnIncomingNotificationForTest(
       syncer::ModelTypeSet model_types);
 
   static const int kDefaultNudgeDelayMilliseconds;
   static const int kPreferencesNudgeDelayMilliseconds;
   static const int kPiggybackNudgeDelay;
 
   static const FilePath::CharType kSyncDatabaseFilename[];
 
  private:
+  friend class SyncManagerTest;
   FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, NudgeDelayTest);
 
   // For unit tests.
   base::TimeDelta GetNudgeDelayTimeDelta(const syncer::ModelType& model_type);
 
+  // Set the internal scheduler for testing purposes.
+  // TODO(sync): Use dependency injection instead. crbug.com/133061
+  void SetSyncSchedulerForTest(
+      scoped_ptr<syncer::SyncScheduler> scheduler);
+
   base::ThreadChecker thread_checker_;
 
   // An opaque pointer to the nested private class.
   SyncInternal* data_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncManager);
 };
 
 bool InitialSyncEndedForTypes(syncer::ModelTypeSet types, UserShare* share);
 
-syncer::ModelTypeSet GetTypesWithEmptyProgressMarkerToken(
-    syncer::ModelTypeSet types,
-    syncer::UserShare* share);
-
 const char* ConnectionStatusToString(ConnectionStatus status);
 
 // Returns the string representation of a PassphraseRequiredReason value.
 const char* PassphraseRequiredReasonToString(PassphraseRequiredReason reason);
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_PUBLIC_SYNC_MANAGER_H_