[Sync] Fix namespace for sync_driver component

chrome/browser/sync/glue/bookmark_model_associator.h

 // Copyright (c) 2012 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 CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 16 matching lines @@
 struct UserShare;
 }
 
 namespace browser_sync {
 
 // Contains all model association related logic:
 // * Algorithm to associate bookmark model and sync model.
 // * Methods to get a bookmark node for a given sync node and vice versa.
 // * Persisting model associations and loading them back.
 class BookmarkModelAssociator
-    : public PerDataTypeAssociatorInterface<BookmarkNode, int64> {
+    : public sync_driver::PerDataTypeAssociatorInterface<BookmarkNode, int64> {
  public:
   static syncer::ModelType model_type() { return syncer::BOOKMARKS; }
   // |expect_mobile_bookmarks_folder| controls whether or not we
   // expect the mobile bookmarks permanent folder to be created.
   // Should be set to true only by mobile clients.
   BookmarkModelAssociator(
       BookmarkModel* bookmark_model,
       Profile* profile_,
       syncer::UserShare* user_share,
-      DataTypeErrorHandler* unrecoverable_error_handler,
+      sync_driver::DataTypeErrorHandler* unrecoverable_error_handler,
       bool expect_mobile_bookmarks_folder);
   virtual ~BookmarkModelAssociator();
 
   // Updates the visibility of the permanents node in the BookmarkModel.
   void UpdatePermanentNodeVisibility();
 
   // AssociatorInterface implementation.
   //
   // AssociateModels iterates through both the sync and the browser
   // bookmark model, looking for matched pairs of items.  For any pairs it
@@ skipping 85 matching lines @@
   // their transaction versions.
   // Returns a PERSISTENCE_ERROR if a transaction mismatch was detected where
   // the native model has a newer transaction verison.
   syncer::SyncError CheckModelSyncState(
       syncer::SyncMergeResult* local_merge_result,
       syncer::SyncMergeResult* syncer_merge_result) const;
 
   BookmarkModel* bookmark_model_;
   Profile* profile_;
   syncer::UserShare* user_share_;
-  DataTypeErrorHandler* unrecoverable_error_handler_;
+  sync_driver::DataTypeErrorHandler* unrecoverable_error_handler_;
   const bool expect_mobile_bookmarks_folder_;
   BookmarkIdToSyncIdMap id_map_;
   SyncIdToBookmarkNodeMap id_map_inverse_;
   // Stores sync ids for dirty associations.
   DirtyAssociationsSyncIds dirty_associations_sync_ids_;
 
   // Used to post PersistAssociation tasks to the current message loop and
   // guarantees no invocations can occur if |this| has been deleted. (This
   // allows this class to be non-refcounted).
   base::WeakPtrFactory<BookmarkModelAssociator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_