Revert of [Sync] Make directory types registration explicit in ModelTypeRegistry

components/sync/engine/sync_manager.h

 // Copyright 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 COMPONENTS_SYNC_ENGINE_SYNC_MANAGER_H_
 #define COMPONENTS_SYNC_ENGINE_SYNC_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 286 matching lines @@
   // types are saved into the delete journal, while |to_unapply| have only
   // their local data deleted, while their server data is preserved.
   virtual void PurgeDisabledTypes(ModelTypeSet to_purge,
                                   ModelTypeSet to_journal,
                                   ModelTypeSet to_unapply) = 0;
 
   // Update tokens that we're using in Sync. Email must stay the same.
   virtual void UpdateCredentials(const SyncCredentials& credentials) = 0;
 
   // Put the syncer in normal mode ready to perform nudges and polls.
-  virtual void StartSyncingNormally(base::Time last_poll_time) = 0;
-
-  // Put syncer in configuration mode. Only configuration sync cycles are
-  // performed. No local changes are committed to the server.
-  virtual void StartConfiguration() = 0;
+  virtual void StartSyncingNormally(const ModelSafeRoutingInfo& routing_info,
+                                    base::Time last_poll_time) = 0;
 
   // 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,
                                ModelTypeSet to_download,
+                               const ModelSafeRoutingInfo& new_routing_info,
                                const base::Closure& ready_task,
                                const base::Closure& retry_task) = 0;
 
   // Inform the syncer of a change in the invalidator's state.
   virtual void SetInvalidatorEnabled(bool invalidator_enabled) = 0;
 
   // Inform the syncer that its cached information about a type is obsolete.
   virtual void OnIncomingInvalidation(
       ModelType type,
       std::unique_ptr<InvalidationInterface> invalidation) = 0;
@@ skipping 14 matching lines @@
   // Call periodically from a database-safe thread to persist recent changes
   // to the syncapi model.
   virtual void SaveChanges() = 0;
 
   // Issue a final SaveChanges, and close sqlite handles.
   virtual void ShutdownOnSyncThread(ShutdownReason reason) = 0;
 
   // May be called from any thread.
   virtual UserShare* GetUserShare() = 0;
 
-  // Returns non-owning pointer to ModelTypeConnector. In contrast with
-  // ModelTypeConnectorProxy all calls are executed synchronously, thus the
-  // pointer should be used on sync thread.
-  virtual ModelTypeConnector* GetModelTypeConnector() = 0;
-
-  // Returns an instance of the main interface for registering sync types with
-  // sync engine.
+  // Returns an instance of the main interface for non-blocking sync types.
   virtual std::unique_ptr<ModelTypeConnector> GetModelTypeConnectorProxy() = 0;
 
   // Returns the cache_guid of the currently open database.
   // Requires that the SyncManager be initialized.
   virtual const std::string cache_guid() = 0;
 
   // Reads the nigori node to determine if any experimental features should
   // be enabled.
   // Note: opens a transaction.  May be called on any thread.
   virtual bool ReceivedExperiment(Experiments* experiments) = 0;
@@ skipping 36 matching lines @@
   // Note: this does not trigger a sync cycle. It just updates the sync context.
   virtual void OnCookieJarChanged(bool account_mismatch, bool empty_jar) = 0;
 
   // Adds memory usage statistics to |pmd| for chrome://tracing.
   virtual void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd) = 0;
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_ENGINE_SYNC_MANAGER_H_