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

components/sync/engine/fake_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 COMPONENTS_SYNC_ENGINE_FAKE_SYNC_MANAGER_H_
 #define COMPONENTS_SYNC_ENGINE_FAKE_SYNC_MANAGER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
-#include "components/sync/engine/fake_model_type_connector.h"
 #include "components/sync/engine/sync_manager.h"
 #include "components/sync/syncable/test_user_share.h"
-#include "components/sync/test/fake_sync_encryption_handler.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace syncer {
 
 class FakeSyncEncryptionHandler;
 
 class FakeSyncManager : public SyncManager {
@@ skipping 21 matching lines @@
 
   // Returns those types that have been unapplied as part of purging disabled
   // types since the last call to GetAndResetUnappliedTypes, or since startup if
   // never called.
   ModelTypeSet GetAndResetUnappliedTypes();
 
   // Returns those types that have been downloaded since the last call to
   // GetAndResetDownloadedTypes(), or since startup if never called.
   ModelTypeSet GetAndResetDownloadedTypes();
 
+  // Returns those types that have been marked as enabled since the
+  // last call to GetAndResetEnabledTypes(), or since startup if never
+  // called.
+  ModelTypeSet GetAndResetEnabledTypes();
+
   // Returns the types that have most recently received a refresh request.
   ModelTypeSet GetLastRefreshRequestTypes();
 
   // Returns the most recent configuration reason since the last call to
   // GetAndResetConfigureReason, or since startup if never called.
   ConfigureReason GetAndResetConfigureReason();
 
   // Returns the number of invalidations received since startup.
   int GetInvalidationCount() const;
 
   // Block until the sync thread has finished processing any pending messages.
   void WaitForSyncThread();
 
   // SyncManager implementation.
   // Note: we treat whatever message loop this is called from as the sync
   // loop for purposes of callbacks.
   void Init(InitArgs* args) override;
   ModelTypeSet InitialSyncEndedTypes() override;
   ModelTypeSet GetTypesWithEmptyProgressMarkerToken(
       ModelTypeSet types) override;
   void PurgePartiallySyncedTypes() override;
   void PurgeDisabledTypes(ModelTypeSet to_purge,
                           ModelTypeSet to_journal,
                           ModelTypeSet to_unapply) override;
   void UpdateCredentials(const SyncCredentials& credentials) override;
-  void StartSyncingNormally(base::Time last_poll_time) override;
-  void StartConfiguration() override;
+  void StartSyncingNormally(const ModelSafeRoutingInfo& routing_info,
+                            base::Time last_poll_time) override;
   void ConfigureSyncer(ConfigureReason reason,
                        ModelTypeSet to_download,
+                       const ModelSafeRoutingInfo& new_routing_info,
                        const base::Closure& ready_task,
                        const base::Closure& retry_task) override;
   void OnIncomingInvalidation(
       ModelType type,
       std::unique_ptr<InvalidationInterface> interface) override;
   void SetInvalidatorEnabled(bool invalidator_enabled) override;
   void AddObserver(Observer* observer) override;
   void RemoveObserver(Observer* observer) override;
   SyncStatus GetDetailedStatus() const override;
   void SaveChanges() override;
   void ShutdownOnSyncThread(ShutdownReason reason) override;
   UserShare* GetUserShare() override;
-  ModelTypeConnector* GetModelTypeConnector() override;
   std::unique_ptr<ModelTypeConnector> GetModelTypeConnectorProxy() override;
   const std::string cache_guid() override;
   bool ReceivedExperiment(Experiments* experiments) override;
   bool HasUnsyncedItems() override;
   SyncEncryptionHandler* GetEncryptionHandler() override;
   std::vector<std::unique_ptr<ProtocolEvent>> GetBufferedProtocolEvents()
       override;
   void RefreshTypes(ModelTypeSet types) override;
   void RegisterDirectoryTypeDebugInfoObserver(
       TypeDebugInfoObserver* observer) override;
@@ skipping 18 matching lines @@
   // Test specific state.
   // The types that should fail configuration attempts. These types will not
   // have their progress markers or initial_sync_ended bits set.
   ModelTypeSet configure_fail_types_;
   // The set of types that have been purged.
   ModelTypeSet purged_types_;
   // Subset of |purged_types_| that were unapplied.
   ModelTypeSet unapplied_types_;
   // The set of types that have been downloaded.
   ModelTypeSet downloaded_types_;
+  // The set of types that have been enabled.
+  ModelTypeSet enabled_types_;
 
   // The types for which a refresh was most recently requested.
   ModelTypeSet last_refresh_request_types_;
 
   // The most recent configure reason.
   ConfigureReason last_configure_reason_;
 
-  FakeModelTypeConnector fake_model_type_connector_;
-
-  FakeSyncEncryptionHandler fake_encryption_handler_;
+  std::unique_ptr<FakeSyncEncryptionHandler> fake_encryption_handler_;
 
   TestUserShare test_user_share_;
 
   // Number of invalidations received since startup.
   int num_invalidations_received_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeSyncManager);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_ENGINE_FAKE_SYNC_MANAGER_H_