Sync: Remove NonBlockingDataTypeManager and any ProfileSyncService code related to it.

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>
@@ skipping 16 matching lines @@
 #include "chrome/browser/sync/sessions/sessions_sync_manager.h"
 #include "chrome/browser/sync/startup_controller.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "components/sync_driver/data_type_controller.h"
 #include "components/sync_driver/data_type_manager.h"
 #include "components/sync_driver/data_type_manager_observer.h"
 #include "components/sync_driver/data_type_status_table.h"
 #include "components/sync_driver/device_info_sync_service.h"
 #include "components/sync_driver/local_device_info_provider.h"
-#include "components/sync_driver/non_blocking_data_type_manager.h"
 #include "components/sync_driver/protocol_event_observer.h"
 #include "components/sync_driver/sync_frontend.h"
 #include "components/sync_driver/sync_prefs.h"
 #include "components/sync_driver/sync_service.h"
 #include "components/sync_driver/sync_stopped_reporter.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "net/base/backoff_entry.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
@@ skipping 279 matching lines @@
   void GetAllNodes(
       const base::Callback<void(scoped_ptr<base::ListValue>)>& callback);
 
   void RegisterAuthNotifications();
   void UnregisterAuthNotifications();
 
   // Return whether OAuth2 refresh token is loaded and available for the backend
   // to start up. Virtual to enable mocking in tests.
   virtual bool IsOAuthRefreshTokenAvailable();
 
-  // Registers a type whose sync storage will not be managed by the
-  // ProfileSyncService.  It declares that this sync type may be activated at
-  // some point in the future.  This function call does not enable or activate
-  // the syncing of this type
-  // TODO(stanisc): crbug.com/515962: this should merge with
-  // RegisterDataTypeController.
-  void RegisterNonBlockingType(syncer::ModelType type);
-
-  // Called by a component that supports non-blocking sync when it is ready to
-  // initialize its connection to the sync backend.
-  //
-  // If policy allows for syncing this type (ie. it is "preferred"), then this
-  // should result in a message to enable syncing for this type when the sync
-  // backend is available.  If the type is not to be synced, this should result
-  // in a message that allows the component to delete its local sync state.
-  // TODO(stanisc): crbug.com/515962: review usage of this.
-  void InitializeNonBlockingType(
-      syncer::ModelType type,
-      const scoped_refptr<base::SequencedTaskRunner>& task_runner,
-      const base::WeakPtr<syncer_v2::ModelTypeProcessorImpl>& type_processor);
-
   // Returns the SyncedWindowDelegatesGetter from the embedded sessions manager.
   virtual browser_sync::SyncedWindowDelegatesGetter*
   GetSyncedWindowDelegatesGetter() const;
 
   // Returns the SyncableService for syncer::SESSIONS.
   virtual syncer::SyncableService* GetSessionsSyncableService();
 
   // Returns the SyncableService for syncer::DEVICE_INFO.
   virtual syncer::SyncableService* GetDeviceInfoSyncableService();
 
@@ skipping 131 matching lines @@
   // SyncPrefObserver implementation.
   void OnSyncManagedPrefChange(bool is_sync_managed) override;
 
   // Changes which data types we're going to be syncing to |preferred_types|.
   // If it is running, the DataTypeManager will be instructed to reconfigure
   // the sync backend so that exactly these datatypes are actively synced.  See
   // class comment for more on what it means for a datatype to be Preferred.
   virtual void ChangePreferredDataTypes(
       syncer::ModelTypeSet preferred_types);
 
-  // Returns the set of directory types which are preferred for enabling.
-  virtual syncer::ModelTypeSet GetPreferredDirectoryDataTypes() const;
-
-  // Returns the set of off-thread types which are preferred for enabling.
-  virtual syncer::ModelTypeSet GetPreferredNonBlockingDataTypes() const;
-
   // Returns the set of types which are enforced programmatically and can not
   // be disabled by the user.
   virtual syncer::ModelTypeSet GetForcedDataTypes() const;
 
   // Gets the set of all data types that could be allowed (the set that
   // should be advertised to the user).  These will typically only change
   // via a command-line option.  See class comment for more on what it means
   // for a datatype to be Registered.
   virtual syncer::ModelTypeSet GetRegisteredDataTypes() const;
 
-  // Gets the set of directory types which could be allowed.
-  virtual syncer::ModelTypeSet GetRegisteredDirectoryDataTypes() const;
-
-  // Gets the set of off-thread types which could be allowed.
-  virtual syncer::ModelTypeSet GetRegisteredNonBlockingDataTypes() const;
-
   // Returns the actual passphrase type being used for encryption.
   virtual syncer::PassphraseType GetPassphraseType() const;
 
   // Note about setting passphrases: There are different scenarios under which
   // we might want to apply a passphrase. It could be for first-time encryption,
   // re-encryption, or for decryption by clients that sign in at a later time.
   // In addition, encryption can either be done using a custom passphrase, or by
   // reusing the GAIA password. Depending on what is happening in the system,
   // callers should determine which of the two methods below must be used.
 
@@ skipping 91 matching lines @@
   // Shuts down the backend sync components.
   // |reason| dictates if syncing is being disabled or not, and whether
   // to claim ownership of sync thread from backend.
   void ShutdownImpl(syncer::ShutdownReason reason);
 
   // Return SyncCredentials from the OAuth2TokenService.
   syncer::SyncCredentials GetCredentials();
 
   virtual syncer::WeakHandle<syncer::JsEventHandler> GetJsEventHandler();
 
-  const sync_driver::DataTypeController::TypeMap&
-      directory_data_type_controllers() {
-    return directory_data_type_controllers_;
+  const sync_driver::DataTypeController::TypeMap& data_type_controllers() {
+    return data_type_controllers_;
   }
 
   // Helper method for managing encryption UI.
   bool IsEncryptedDatatypeEnabled() const;
 
   // Helper for OnUnrecoverableError.
   // TODO(tim): Use an enum for |delete_sync_database| here, in ShutdownImpl,
   // and in SyncBackendHost::Shutdown.
   void OnUnrecoverableErrorImpl(
       const tracked_objects::Location& from_here,
@@ skipping 194 matching lines @@
 
   // The time that OnConfigureStart is called. This member is zero if
   // OnConfigureStart has not yet been called, and is reset to zero once
   // OnConfigureDone is called.
   base::Time sync_configure_start_time_;
 
   // Indicates if this is the first time sync is being configured.  This value
   // is equal to !HasSyncSetupCompleted() at the time of OnBackendInitialized().
   bool is_first_time_sync_configure_;
 
-  // List of available data type controllers for directory types.
-  sync_driver::DataTypeController::TypeMap directory_data_type_controllers_;
+  // List of available data type controllers.
+  sync_driver::DataTypeController::TypeMap data_type_controllers_;
 
   // Whether the SyncBackendHost has been initialized.
   bool backend_initialized_;
 
   // Set when sync receives DISABLED_BY_ADMIN error from server. Prevents
   // ProfileSyncService from starting backend till browser restarted or user
   // signed out.
   bool sync_disabled_by_admin_;
 
   // Set to true if a signin has completed but we're still waiting for the
   // backend to refresh its credentials.
   bool is_auth_in_progress_;
 
   // Encapsulates user signin - used to set/get the user's authenticated
   // email address.
   const scoped_ptr<SigninManagerWrapper> signin_;
 
   // Information describing an unrecoverable error.
   UnrecoverableErrorReason unrecoverable_error_reason_;
   std::string unrecoverable_error_message_;
   tracked_objects::Location unrecoverable_error_location_;
 
-  // Manages the start and stop of the directory data types.
-  scoped_ptr<sync_driver::DataTypeManager> directory_data_type_manager_;
-
-  // Manager for the non-blocking data types.
-  sync_driver_v2::NonBlockingDataTypeManager non_blocking_data_type_manager_;
+  // Manages the start and stop of the data types.
+  scoped_ptr<sync_driver::DataTypeManager> data_type_manager_;
 
   base::ObserverList<sync_driver::SyncServiceObserver> observers_;
   base::ObserverList<browser_sync::ProtocolEventObserver>
       protocol_event_observers_;
   base::ObserverList<syncer::TypeDebugInfoObserver> type_debug_info_observers_;
 
   std::set<SyncTypePreferenceProvider*> preference_providers_;
 
   syncer::SyncJsController sync_js_controller_;
 
@@ skipping 146 matching lines @@
   base::WeakPtrFactory<ProfileSyncService> startup_controller_weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 bool ShouldShowActionOnUI(
     const syncer::SyncProtocolError& error);
 
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_