Index: components/sync_bookmarks/bookmark_model_associator.h |
diff --git a/components/sync_bookmarks/bookmark_model_associator.h b/components/sync_bookmarks/bookmark_model_associator.h |
index dc0d65a4d5683b03d00880d472bdf3855b73b6be..926a3510037271754c91a2d31aaeeca83dd7af2e 100644 |
--- a/components/sync_bookmarks/bookmark_model_associator.h |
+++ b/components/sync_bookmarks/bookmark_model_associator.h |
@@ -36,12 +36,9 @@ class BookmarkNode; |
namespace syncer { |
class BaseNode; |
class BaseTransaction; |
-struct UserShare; |
-class WriteTransaction; |
-} |
- |
-namespace sync_driver { |
class SyncClient; |
+class WriteTransaction; |
+struct UserShare; |
} |
namespace sync_bookmarks { |
@@ -51,8 +48,8 @@ namespace sync_bookmarks { |
// * Methods to get a bookmark node for a given sync node and vice versa. |
// * Persisting model associations and loading them back. |
class BookmarkModelAssociator |
- : public sync_driver:: |
- PerDataTypeAssociatorInterface<bookmarks::BookmarkNode, int64_t> { |
+ : public syncer::PerDataTypeAssociatorInterface<bookmarks::BookmarkNode, |
+ int64_t> { |
public: |
static syncer::ModelType model_type() { return syncer::BOOKMARKS; } |
// |expect_mobile_bookmarks_folder| controls whether or not we |
@@ -60,7 +57,7 @@ class BookmarkModelAssociator |
// Should be set to true only by mobile clients. |
BookmarkModelAssociator( |
bookmarks::BookmarkModel* bookmark_model, |
- sync_driver::SyncClient* sync_client, |
+ syncer::SyncClient* sync_client, |
syncer::UserShare* user_share, |
std::unique_ptr<syncer::DataTypeErrorHandler> unrecoverable_error_handler, |
bool expect_mobile_bookmarks_folder); |
@@ -293,7 +290,7 @@ class BookmarkModelAssociator |
base::ThreadChecker thread_checker_; |
bookmarks::BookmarkModel* bookmark_model_; |
- sync_driver::SyncClient* sync_client_; |
+ syncer::SyncClient* sync_client_; |
syncer::UserShare* user_share_; |
std::unique_ptr<syncer::DataTypeErrorHandler> unrecoverable_error_handler_; |
const bool expect_mobile_bookmarks_folder_; |