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

Unified Diff: components/sync_driver/shared_change_processor_unittest.cc

Issue 1966023002: [Sync] Move DataTypeErrorHandler to //sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Found an unsaved buffer :( Created 4 years, 7 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_driver/shared_change_processor_unittest.cc
diff --git a/components/sync_driver/shared_change_processor_unittest.cc b/components/sync_driver/shared_change_processor_unittest.cc
index e4c6d2ea75e09bc88a91e3a800fd5e7d689ed1f1..562054e646246f1c28502de01df60d081b213af8 100644
--- a/components/sync_driver/shared_change_processor_unittest.cc
+++ b/components/sync_driver/shared_change_processor_unittest.cc
@@ -14,7 +14,6 @@
#include "base/single_thread_task_runner.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
-#include "components/sync_driver/data_type_error_handler_mock.h"
#include "components/sync_driver/fake_sync_client.h"
#include "components/sync_driver/generic_change_processor.h"
#include "components/sync_driver/generic_change_processor_factory.h"
@@ -25,6 +24,7 @@
#include "sync/api/fake_syncable_service.h"
#include "sync/internal_api/public/attachments/attachment_service_impl.h"
#include "sync/internal_api/public/base/model_type.h"
+#include "sync/internal_api/public/test/data_type_error_handler_mock.h"
#include "sync/internal_api/public/test/test_user_share.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -67,7 +67,7 @@ class TestSyncApiComponentFactory : public SyncApiComponentFactory {
}
SyncApiComponentFactory::SyncComponents CreateBookmarkSyncComponents(
sync_driver::SyncService* sync_service,
- sync_driver::DataTypeErrorHandler* error_handler) override {
+ syncer::DataTypeErrorHandler* error_handler) override {
return SyncApiComponentFactory::SyncComponents(nullptr, nullptr);
}
std::unique_ptr<syncer::AttachmentService> CreateAttachmentService(
@@ -207,7 +207,7 @@ class SyncSharedChangeProcessorTest :
TestSyncApiComponentFactory factory_;
scoped_refptr<SharedChangeProcessor> shared_change_processor_;
- StrictMock<DataTypeErrorHandlerMock> error_handler_;
+ StrictMock<syncer::DataTypeErrorHandlerMock> error_handler_;
GenericChangeProcessorFactory processor_factory_;
bool did_connect_;
« no previous file with comments | « components/sync_driver/shared_change_processor.cc ('k') | components/sync_driver/sync_api_component_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698