Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co

components/sync/engine_impl/model_type_registry.h

Index: components/sync/engine_impl/model_type_registry.h
diff --git a/components/sync/engine_impl/model_type_registry.h b/components/sync/engine_impl/model_type_registry.h
index 70efd185115811d745f32f52de673444097ac6bb..66f6c22924485e1f74a1aedfb19475077daf6b3c 100644
--- a/components/sync/engine_impl/model_type_registry.h
+++ b/components/sync/engine_impl/model_type_registry.h
@@ -21,7 +21,7 @@
 #include "components/sync/engine/model_safe_worker.h"
 #include "components/sync/engine_impl/nudge_handler.h"
 
-namespace syncer {
+namespace syncer_v2 {
 struct DataTypeState;
 class ModelTypeProcessor;
 class ModelTypeWorker;
@@ -45,7 +45,7 @@ typedef std::map<ModelType, DirectoryTypeDebugInfoEmitter*>
     DirectoryTypeDebugInfoEmitterMap;
 
 // Keeps track of the sets of active update handlers and commit contributors.
-class ModelTypeRegistry : public ModelTypeConnector,
+class ModelTypeRegistry : public syncer_v2::ModelTypeConnector,
                           public SyncEncryptionHandler::Observer {
  public:
   // Constructs a ModelTypeRegistry that supports directory types.
@@ -61,15 +61,15 @@ class ModelTypeRegistry : public ModelTypeConnector,
   // and its task_runner to the newly created worker.
   //
   // Expects that the proxy's ModelType is not currently enabled.
-  void ConnectType(
-      ModelType type,
-      std::unique_ptr<ActivationContext> activation_context) override;
+  void ConnectType(syncer::ModelType type,
+                   std::unique_ptr<syncer_v2::ActivationContext>
+                       activation_context) override;
 
   // Disables the syncing of an off-thread type.
   //
   // Expects that the type is currently enabled.
   // Deletes the worker associated with the type.
-  void DisconnectType(ModelType type) override;
+  void DisconnectType(syncer::ModelType type) override;
 
   // Implementation of SyncEncryptionHandler::Observer.
   void OnPassphraseRequired(
@@ -99,11 +99,12 @@ class ModelTypeRegistry : public ModelTypeConnector,
   CommitContributorMap* commit_contributor_map();
   DirectoryTypeDebugInfoEmitterMap* directory_type_debug_info_emitter_map();
 
-  void RegisterDirectoryTypeDebugInfoObserver(TypeDebugInfoObserver* observer);
+  void RegisterDirectoryTypeDebugInfoObserver(
+      syncer::TypeDebugInfoObserver* observer);
   void UnregisterDirectoryTypeDebugInfoObserver(
-      TypeDebugInfoObserver* observer);
+      syncer::TypeDebugInfoObserver* observer);
   bool HasDirectoryTypeDebugInfoObserver(
-      const TypeDebugInfoObserver* observer) const;
+      const syncer::TypeDebugInfoObserver* observer) const;
   void RequestEmitDebugInfo();
 
   base::WeakPtr<ModelTypeConnector> AsWeakPtr();
@@ -120,7 +121,7 @@ class ModelTypeRegistry : public ModelTypeConnector,
   ScopedVector<DirectoryTypeDebugInfoEmitter>
       directory_type_debug_info_emitters_;
 
-  ScopedVector<ModelTypeWorker> model_type_workers_;
+  ScopedVector<syncer_v2::ModelTypeWorker> model_type_workers_;
 
   // Maps of UpdateHandlers and CommitContributors.
   // They do not own any of the objects they point to.