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

components/sync/engine_impl/model_type_connector_proxy.h

Index: components/sync/engine_impl/model_type_connector_proxy.h
diff --git a/components/sync/engine_impl/model_type_connector_proxy.h b/components/sync/engine_impl/model_type_connector_proxy.h
index 6c2e4a9ffcbc41823d2197480ccf61f93c894031..ddf751b74c0b131bb875d492765dc49e60fe200c 100644
--- a/components/sync/engine_impl/model_type_connector_proxy.h
+++ b/components/sync/engine_impl/model_type_connector_proxy.h
@@ -10,7 +10,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner.h"
 #include "components/sync/base/model_type.h"
-#include "components/sync/engine/model_safe_worker.h"
 #include "components/sync/engine/model_type_connector.h"
 
 namespace syncer {
@@ -26,12 +25,10 @@
   ~ModelTypeConnectorProxy() override;
 
   // ModelTypeConnector implementation
-  void ConnectNonBlockingType(
+  void ConnectType(
       ModelType type,
       std::unique_ptr<ActivationContext> activation_context) override;
-  void DisconnectNonBlockingType(ModelType type) override;
-  void RegisterDirectoryType(ModelType type, ModelSafeGroup group) override;
-  void UnregisterDirectoryType(ModelType type) override;
+  void DisconnectType(ModelType type) override;
 
  private:
   // A SequencedTaskRunner representing the thread where the ModelTypeConnector