| 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 831e6dd978e2116e7f413dbbfa48ac8ab144ce34..4e70d40edc7998fe962dd5a5bc13cc705d875a75 100644
|
| --- a/components/sync_bookmarks/bookmark_change_processor.h
|
| +++ b/components/sync_bookmarks/bookmark_change_processor.h
|
| @@ -17,7 +17,7 @@
|
| #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;
|
|
|
| @@ -45,7 +45,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
|
| public:
|
| BookmarkChangeProcessor(sync_driver::SyncClient* sync_client,
|
| BookmarkModelAssociator* model_associator,
|
| - sync_driver::DataTypeErrorHandler* error_handler);
|
| + syncer::DataTypeErrorHandler* error_handler);
|
| ~BookmarkChangeProcessor() override;
|
|
|
| // bookmarks::BookmarkModelObserver:
|
| @@ -149,21 +149,19 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
|
| // 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.
|
| @@ -215,7 +213,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
|
| 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,
|
|
|