| Index: components/sync_driver/sync_api_component_factory_mock.h
|
| diff --git a/components/sync_driver/sync_api_component_factory_mock.h b/components/sync_driver/sync_api_component_factory_mock.h
|
| index 3f4ad829ee44430cb03f280b5f5297e8885fa852..e3be767b63bcfa112cf415514ce123b90a5201d7 100644
|
| --- a/components/sync_driver/sync_api_component_factory_mock.h
|
| +++ b/components/sync_driver/sync_api_component_factory_mock.h
|
| @@ -8,9 +8,9 @@
|
| #include <memory>
|
|
|
| #include "components/sync_driver/data_type_controller.h"
|
| -#include "components/sync_driver/data_type_error_handler.h"
|
| #include "components/sync_driver/sync_api_component_factory.h"
|
| #include "sync/internal_api/public/base/model_type.h"
|
| +#include "sync/internal_api/public/data_type_error_handler.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| namespace sync_driver {
|
| @@ -59,13 +59,12 @@ class SyncApiComponentFactoryMock
|
| syncer::ModelType model_type,
|
| syncer::AttachmentService::Delegate* delegate) override;
|
| MOCK_METHOD2(CreateBookmarkSyncComponents,
|
| - SyncComponents(sync_driver::SyncService* sync_service,
|
| - sync_driver::DataTypeErrorHandler* error_handler));
|
| + SyncComponents(sync_driver::SyncService* sync_service,
|
| + syncer::DataTypeErrorHandler* error_handler));
|
| MOCK_METHOD3(CreateTypedUrlSyncComponents,
|
| - SyncComponents(
|
| - sync_driver::SyncService* sync_service,
|
| - history::HistoryBackend* history_backend,
|
| - sync_driver::DataTypeErrorHandler* error_handler));
|
| + SyncComponents(sync_driver::SyncService* sync_service,
|
| + history::HistoryBackend* history_backend,
|
| + syncer::DataTypeErrorHandler* error_handler));
|
|
|
| private:
|
| sync_driver::SyncApiComponentFactory::SyncComponents MakeSyncComponents();
|
|
|