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

components/sync/driver/model_associator.h

Index: components/sync/driver/model_associator.h
diff --git a/components/sync/driver/model_associator.h b/components/sync/driver/model_associator.h
index 6acc04e7ea8083a036a0eb8e487ff4d9bd581faa..12631619da803cfdb5d67ce74ff7fc654c063edf 100644
--- a/components/sync/driver/model_associator.h
+++ b/components/sync/driver/model_associator.h
@@ -12,9 +12,11 @@
 #include "components/sync/base/model_type.h"
 
 namespace syncer {
-
 class BaseNode;
 class SyncMergeResult;
+}
+
+namespace sync_driver {
 
 // This represents the fundamental operations used for model association that
 // are common to all ModelAssociators and do not depend on types of the models
@@ -28,11 +30,12 @@ class AssociatorInterface {
   // should be identical and corresponding. Returns true on
   // success. On failure of this step, we should abort the sync
   // operation and report an error to the user.
-  virtual SyncError AssociateModels(SyncMergeResult* local_merge_result,
-                                    SyncMergeResult* syncer_merge_result) = 0;
+  virtual syncer::SyncError AssociateModels(
+      syncer::SyncMergeResult* local_merge_result,
+      syncer::SyncMergeResult* syncer_merge_result) = 0;
 
   // Clears all the associations between the chrome and sync models.
-  virtual SyncError DisassociateModels() = 0;
+  virtual syncer::SyncError DisassociateModels() = 0;
 
   // The has_nodes out parameter is set to true if the sync model has
   // nodes other than the permanent tagged nodes.  The method may
@@ -66,7 +69,7 @@ class PerDataTypeAssociatorInterface : public AssociatorInterface {
  public:
   virtual ~PerDataTypeAssociatorInterface() {}
   // Returns sync id for the given chrome model id.
-  // Returns kInvalidId if the sync node is not found for the given
+  // Returns syncer::kInvalidId if the sync node is not found for the given
   // chrome id.
   virtual int64_t GetSyncIdFromChromeId(const IDType& id) = 0;
 
@@ -78,15 +81,16 @@ class PerDataTypeAssociatorInterface : public AssociatorInterface {
   // Returns false if no sync node was found for the given chrome node id or
   // if the initialization of sync node fails.
   virtual bool InitSyncNodeFromChromeId(const IDType& node_id,
-                                        BaseNode* sync_node) = 0;
+                                        syncer::BaseNode* sync_node) = 0;
 
   // Associates the given chrome node with the given sync node.
-  virtual void Associate(const Node* node, const BaseNode& sync_node) = 0;
+  virtual void Associate(const Node* node,
+                         const syncer::BaseNode& sync_node) = 0;
 
   // Remove the association that corresponds to the given sync id.
   virtual void Disassociate(int64_t sync_id) = 0;
 };
 
-}  // namespace syncer
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATOR_H_