[Sync] Make directory types registration explicit in ModelTypeRegistry

components/sync/engine/fake_sync_manager.h

Index: components/sync/engine/fake_sync_manager.h
diff --git a/components/sync/engine/fake_sync_manager.h b/components/sync/engine/fake_sync_manager.h
index 31f47440f80ccb7d52605abaae303cde972e1fad..095a348eec9e9d6e12d02d4f630cee198408f0d6 100644
--- a/components/sync/engine/fake_sync_manager.h
+++ b/components/sync/engine/fake_sync_manager.h
@@ -55,11 +55,6 @@ class FakeSyncManager : public SyncManager {
   // 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();
 
@@ -85,11 +80,10 @@ class FakeSyncManager : public SyncManager {
                           ModelTypeSet to_journal,
                           ModelTypeSet to_unapply) override;
   void UpdateCredentials(const SyncCredentials& credentials) override;
-  void StartSyncingNormally(const ModelSafeRoutingInfo& routing_info,
-                            base::Time last_poll_time) override;
+  void StartSyncingNormally(base::Time last_poll_time) override;
+  void StartConfiguration() 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(
@@ -140,8 +134,6 @@ class FakeSyncManager : public SyncManager {
   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_;