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

components/sync_bookmarks/bookmark_change_processor.h

Index: components/sync_bookmarks/bookmark_change_processor.h
diff --git a/components/sync_bookmarks/bookmark_change_processor.h b/components/sync_bookmarks/bookmark_change_processor.h
index df214019d201ffcfbfa43edb58bf5b98d3d19765..d0a015f443e3ca17cea5e718819e0903c2ec4035 100644
--- a/components/sync_bookmarks/bookmark_change_processor.h
+++ b/components/sync_bookmarks/bookmark_change_processor.h
@@ -24,14 +24,17 @@ class Profile;
 
 namespace base {
 class RefCountedMemory;
-}  // namespace base
+}
 
 namespace syncer {
-class SyncClient;
 class WriteNode;
 class WriteTransaction;
 }  // namespace syncer
 
+namespace sync_driver {
+class SyncClient;
+}
+
 namespace sync_bookmarks {
 
 // This class is responsible for taking changes from the BookmarkModel
@@ -39,10 +42,10 @@ namespace sync_bookmarks {
 // All operations and use of this class are from the UI thread.
 // This is currently bookmarks specific.
 class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
-                                public syncer::ChangeProcessor {
+                                public sync_driver::ChangeProcessor {
  public:
   BookmarkChangeProcessor(
-      syncer::SyncClient* sync_client,
+      sync_driver::SyncClient* sync_client,
       BookmarkModelAssociator* model_associator,
       std::unique_ptr<syncer::DataTypeErrorHandler> error_handler);
   ~BookmarkChangeProcessor() override;
@@ -97,7 +100,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
   static void UpdateBookmarkWithSyncData(const syncer::BaseNode& sync_node,
                                          bookmarks::BookmarkModel* model,
                                          const bookmarks::BookmarkNode* node,
-                                         syncer::SyncClient* sync_client);
+                                         sync_driver::SyncClient* sync_client);
 
   // Creates a bookmark node under the given parent node from the given sync
   // node. Returns the newly created node.  The created node is placed at the
@@ -106,7 +109,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
       const syncer::BaseNode* sync_node,
       const bookmarks::BookmarkNode* parent,
       bookmarks::BookmarkModel* model,
-      syncer::SyncClient* sync_client,
+      sync_driver::SyncClient* sync_client,
       int index);
 
   // Overload of CreateBookmarkNode function above that helps to avoid
@@ -117,7 +120,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
       const syncer::BaseNode* sync_node,
       const bookmarks::BookmarkNode* parent,
       bookmarks::BookmarkModel* model,
-      syncer::SyncClient* sync_client,
+      sync_driver::SyncClient* sync_client,
       int index);
 
   // Sets the favicon of the given bookmark node from the given sync node.
@@ -127,14 +130,14 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
   static bool SetBookmarkFavicon(const syncer::BaseNode* sync_node,
                                  const bookmarks::BookmarkNode* bookmark_node,
                                  bookmarks::BookmarkModel* model,
-                                 syncer::SyncClient* sync_client);
+                                 sync_driver::SyncClient* sync_client);
 
   // Applies the 1x favicon |bitmap_data| and |icon_url| to |bookmark_node|.
   // |profile| is the profile that contains the HistoryService and BookmarkModel
   // for the bookmark in question.
   static void ApplyBookmarkFavicon(
       const bookmarks::BookmarkNode* bookmark_node,
-      syncer::SyncClient* sync_client,
+      sync_driver::SyncClient* sync_client,
       const GURL& icon_url,
       const scoped_refptr<base::RefCountedMemory>& bitmap_data);
 
@@ -247,7 +250,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
   // |running_| is true.
   bookmarks::BookmarkModel* bookmark_model_;
 
-  syncer::SyncClient* sync_client_;
+  sync_driver::SyncClient* sync_client_;
 
   // The two models should be associated according to this ModelAssociator.
   BookmarkModelAssociator* model_associator_;