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

components/sync/driver/model_associator.h

 // Copyright 2014 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_DRIVER_MODEL_ASSOCIATOR_H_
 #define COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATOR_H_
 
 #include <stdint.h>
 
 #include "base/synchronization/lock.h"
 #include "components/sync/api/sync_error.h"
 #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
 // being associated.
 class AssociatorInterface {
  public:
   virtual ~AssociatorInterface() {}
 
   // Iterates through both the sync and the chrome model looking for
   // matched pairs of items. After successful completion, the models
   // 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
   // return false if an error occurred.
   virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes) = 0;
 
   // Calling this method while AssociateModels() is in progress will
   // cause the method to exit early with a "false" return value.  This
   // is useful for aborting model associations for shutdown.  This
   // method is only implemented for model associators that are invoked
@@ skipping 13 matching lines @@
 // interface that encapsulates everything you need to implement to have a model
 // associator for a specific data type.
 // This template is appropriate for data types where a Node* makes sense for
 // referring to a particular item.  If we encounter a type that does not fit
 // in this world, we may want to have several PerDataType templates.
 template <class Node, class IDType>
 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;
 
   // Returns the chrome node for the given sync id.
   // Returns NULL if no node is found for the given sync id.
   virtual const Node* GetChromeNodeFromSyncId(int64_t sync_id) = 0;
 
   // Initializes the given sync node from the given chrome node id.
   // 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_