[Sync] Move DataTypeErrorHandler to //sync.

components/sync_bookmarks/bookmark_change_processor.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 COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_CHANGE_PROCESSOR_H_
 #define COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_CHANGE_PROCESSOR_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "components/bookmarks/browser/bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_node.h"
 #include "components/sync_bookmarks/bookmark_model_associator.h"
 #include "components/sync_driver/change_processor.h"
-#include "components/sync_driver/data_type_error_handler.h"
+#include "sync/internal_api/public/data_type_error_handler.h"
 
 class Profile;
 
 namespace base {
 class RefCountedMemory;
 }
 
 namespace syncer {
 class WriteNode;
 class WriteTransaction;
 }  // namespace syncer
 
 namespace sync_driver {
 class SyncClient;
 }
 
 namespace browser_sync {
 
 // This class is responsible for taking changes from the BookmarkModel
 // and applying them to the sync API 'syncable' model, and vice versa.
 // All operations and use of this class are from the UI thread.
 // This is currently bookmarks specific.
 class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
                                 public sync_driver::ChangeProcessor {
  public:
   BookmarkChangeProcessor(sync_driver::SyncClient* sync_client,
                           BookmarkModelAssociator* model_associator,
-                          sync_driver::DataTypeErrorHandler* error_handler);
+                          syncer::DataTypeErrorHandler* error_handler);
   ~BookmarkChangeProcessor() override;
 
   // bookmarks::BookmarkModelObserver:
   // BookmarkModel -> sync API model change application.
   void BookmarkModelLoaded(bookmarks::BookmarkModel* model,
                            bool ids_reassigned) override;
   void BookmarkModelBeingDeleted(bookmarks::BookmarkModel* model) override;
   void BookmarkNodeMoved(bookmarks::BookmarkModel* model,
                          const bookmarks::BookmarkNode* old_parent,
                          int old_index,
@@ skipping 83 matching lines @@
   // Sets the favicon of the given sync node from the given bookmark node.
   static void SetSyncNodeFavicon(const bookmarks::BookmarkNode* bookmark_node,
                                  bookmarks::BookmarkModel* model,
                                  syncer::WriteNode* sync_node);
 
   // Treat the |index|th child of |parent| as a newly added node, and create a
   // corresponding node in the sync domain using |trans|.  All properties
   // will be transferred to the new node.  A node corresponding to |parent|
   // must already exist and be associated for this call to succeed.  Returns
   // the ID of the just-created node, or if creation fails, kInvalidID.
-  static int64_t CreateSyncNode(
-      const bookmarks::BookmarkNode* parent,
-      bookmarks::BookmarkModel* model,
-      int index,
-      syncer::WriteTransaction* trans,
-      BookmarkModelAssociator* associator,
-      sync_driver::DataTypeErrorHandler* error_handler);
+  static int64_t CreateSyncNode(const bookmarks::BookmarkNode* parent,
+                                bookmarks::BookmarkModel* model,
+                                int index,
+                                syncer::WriteTransaction* trans,
+                                BookmarkModelAssociator* associator,
+                                syncer::DataTypeErrorHandler* error_handler);
 
   // Update |bookmark_node|'s sync node.
-  static int64_t UpdateSyncNode(
-      const bookmarks::BookmarkNode* bookmark_node,
-      bookmarks::BookmarkModel* model,
-      syncer::WriteTransaction* trans,
-      BookmarkModelAssociator* associator,
-      sync_driver::DataTypeErrorHandler* error_handler);
+  static int64_t UpdateSyncNode(const bookmarks::BookmarkNode* bookmark_node,
+                                bookmarks::BookmarkModel* model,
+                                syncer::WriteTransaction* trans,
+                                BookmarkModelAssociator* associator,
+                                syncer::DataTypeErrorHandler* error_handler);
 
   // Tombstone |topmost_sync_node| node and all its children in the sync domain
   // using transaction |trans|. Returns the number of removed nodes.
   static int RemoveSyncNodeHierarchy(syncer::WriteTransaction* trans,
                                      syncer::WriteNode* topmost_sync_node,
                                      BookmarkModelAssociator* associator);
 
   // Update transaction version of |model| and |nodes| to |new_version| if
   // it's valid.
   static void UpdateTransactionVersion(
@@ skipping 31 matching lines @@
                             int index,
                             syncer::WriteTransaction* trans,
                             syncer::WriteNode* dst,
                             BookmarkModelAssociator* associator);
 
   // Copy properties (but not position) from |src| to |dst|.
   static void UpdateSyncNodeProperties(
       const bookmarks::BookmarkNode* src,
       bookmarks::BookmarkModel* model,
       syncer::WriteNode* dst,
-      sync_driver::DataTypeErrorHandler* error_handler);
+      syncer::DataTypeErrorHandler* error_handler);
 
   // Helper function to encode a bookmark's favicon into raw PNG data.
   static void EncodeFavicon(const bookmarks::BookmarkNode* src,
                             bookmarks::BookmarkModel* model,
                             scoped_refptr<base::RefCountedMemory>* dst);
 
   // Remove all sync nodes, except the permanent nodes.
   void RemoveAllSyncNodes();
 
   // Remove all the sync nodes associated with |node| and its children.
@@ skipping 25 matching lines @@
 
   // The two models should be associated according to this ModelAssociator.
   BookmarkModelAssociator* model_associator_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkChangeProcessor);
 };
 
 }  // namespace browser_sync
 
 #endif  // COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_CHANGE_PROCESSOR_H_