Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(624)

Unified Diff: components/sync_bookmarks/bookmark_change_processor.h

Issue 2289143003: [Sync] Convert DTCs to be not RefCounted and NonThreadSafe. (Closed)
Patch Set: Rebase. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 4102b78896f6fb2d56c79fb73c9d8d5ca85a4a5a..bcb6e6fcd55a1a69e08ca0dc032bf34452083bc0 100644
--- a/components/sync_bookmarks/bookmark_change_processor.h
+++ b/components/sync_bookmarks/bookmark_change_processor.h
@@ -8,6 +8,7 @@
#include <stdint.h>
#include <memory>
+#include <set>
#include <vector>
#include "base/compiler_specific.h"
@@ -15,7 +16,7 @@
#include "base/threading/thread_checker.h"
#include "components/bookmarks/browser/bookmark_model_observer.h"
#include "components/bookmarks/browser/bookmark_node.h"
-#include "components/sync/core/data_type_error_handler.h"
+#include "components/sync/api/data_type_error_handler.h"
#include "components/sync/driver/change_processor.h"
#include "components/sync_bookmarks/bookmark_model_associator.h"
@@ -43,9 +44,10 @@ namespace browser_sync {
class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver,
public sync_driver::ChangeProcessor {
public:
- BookmarkChangeProcessor(sync_driver::SyncClient* sync_client,
- BookmarkModelAssociator* model_associator,
- syncer::DataTypeErrorHandler* error_handler);
+ BookmarkChangeProcessor(
+ sync_driver::SyncClient* sync_client,
+ BookmarkModelAssociator* model_associator,
+ std::unique_ptr<syncer::DataTypeErrorHandler> error_handler);
~BookmarkChangeProcessor() override;
// bookmarks::BookmarkModelObserver:
« no previous file with comments | « components/sync/driver/ui_model_type_controller_unittest.cc ('k') | components/sync_bookmarks/bookmark_change_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698