Index: components/sync_bookmarks/bookmark_data_type_controller.cc |
diff --git a/components/sync_bookmarks/bookmark_data_type_controller.cc b/components/sync_bookmarks/bookmark_data_type_controller.cc |
index 1a2e494eb6b6ddc7b9b435e98947c2dff4fc9aaa..5d906d394df8dfdff28d33498f4bd3c94df56aaf 100644 |
--- a/components/sync_bookmarks/bookmark_data_type_controller.cc |
+++ b/components/sync_bookmarks/bookmark_data_type_controller.cc |
@@ -16,10 +16,8 @@ namespace sync_bookmarks { |
BookmarkDataTypeController::BookmarkDataTypeController( |
const base::Closure& dump_stack, |
- syncer::SyncClient* sync_client) |
- : syncer::FrontendDataTypeController(syncer::BOOKMARKS, |
- dump_stack, |
- sync_client), |
+ sync_driver::SyncClient* sync_client) |
+ : FrontendDataTypeController(syncer::BOOKMARKS, dump_stack, sync_client), |
history_service_observer_(this), |
bookmark_model_observer_(this) {} |
@@ -46,7 +44,7 @@ void BookmarkDataTypeController::CleanUpState() { |
void BookmarkDataTypeController::CreateSyncComponents() { |
DCHECK(CalledOnValidThread()); |
- syncer::SyncApiComponentFactory::SyncComponents sync_components = |
+ sync_driver::SyncApiComponentFactory::SyncComponents sync_components = |
sync_client_->GetSyncApiComponentFactory()->CreateBookmarkSyncComponents( |
sync_client_->GetSyncService(), CreateErrorHandler()); |
set_model_associator(sync_components.model_associator); |