| Index: chrome/browser/sync/profile_sync_components_factory_mock.h
|
| diff --git a/chrome/browser/sync/profile_sync_components_factory_mock.h b/chrome/browser/sync/profile_sync_components_factory_mock.h
|
| index 8a7f767819437886ded7f8eef12c0f20ce942684..52ee949dddb0b56d758ef1f9c119de4d2468069f 100644
|
| --- a/chrome/browser/sync/profile_sync_components_factory_mock.h
|
| +++ b/chrome/browser/sync/profile_sync_components_factory_mock.h
|
| @@ -12,7 +12,7 @@
|
| #include "components/sync_driver/data_type_error_handler.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| -namespace browser_sync {
|
| +namespace sync_driver {
|
| class AssociatorInterface;
|
| class ChangeProcessor;
|
| class DataTypeEncryptionHandler;
|
| @@ -23,19 +23,19 @@ class ProfileSyncComponentsFactoryMock : public ProfileSyncComponentsFactory {
|
| public:
|
| ProfileSyncComponentsFactoryMock();
|
| ProfileSyncComponentsFactoryMock(
|
| - browser_sync::AssociatorInterface* model_associator,
|
| - browser_sync::ChangeProcessor* change_processor);
|
| + sync_driver::AssociatorInterface* model_associator,
|
| + sync_driver::ChangeProcessor* change_processor);
|
| virtual ~ProfileSyncComponentsFactoryMock();
|
|
|
| MOCK_METHOD1(RegisterDataTypes, void(ProfileSyncService*));
|
| MOCK_METHOD6(CreateDataTypeManager,
|
| - browser_sync::DataTypeManager*(
|
| + sync_driver::DataTypeManager*(
|
| const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&,
|
| - const browser_sync::DataTypeController::TypeMap*,
|
| - const browser_sync::DataTypeEncryptionHandler*,
|
| + const sync_driver::DataTypeController::TypeMap*,
|
| + const sync_driver::DataTypeEncryptionHandler*,
|
| browser_sync::SyncBackendHost*,
|
| - browser_sync::DataTypeManagerObserver* observer,
|
| - browser_sync::FailedDataTypesHandler*
|
| + sync_driver::DataTypeManagerObserver* observer,
|
| + sync_driver::FailedDataTypesHandler*
|
| failed_datatypes_handler));
|
| MOCK_METHOD5(CreateSyncBackendHost,
|
| browser_sync::SyncBackendHost*(
|
| @@ -51,23 +51,23 @@ class ProfileSyncComponentsFactoryMock : public ProfileSyncComponentsFactory {
|
| syncer::AttachmentService::Delegate* delegate) OVERRIDE;
|
| MOCK_METHOD2(CreateBookmarkSyncComponents,
|
| SyncComponents(ProfileSyncService* profile_sync_service,
|
| - browser_sync::DataTypeErrorHandler* error_handler));
|
| + sync_driver::DataTypeErrorHandler* error_handler));
|
| #if defined(ENABLE_THEMES)
|
| MOCK_METHOD2(CreateThemeSyncComponents,
|
| SyncComponents(ProfileSyncService* profile_sync_service,
|
| - browser_sync::DataTypeErrorHandler* error_handler));
|
| + sync_driver::DataTypeErrorHandler* error_handler));
|
| #endif
|
| MOCK_METHOD3(CreateTypedUrlSyncComponents,
|
| SyncComponents(
|
| ProfileSyncService* profile_sync_service,
|
| history::HistoryBackend* history_backend,
|
| - browser_sync::DataTypeErrorHandler* error_handler));
|
| + sync_driver::DataTypeErrorHandler* error_handler));
|
|
|
| private:
|
| SyncComponents MakeSyncComponents();
|
|
|
| - scoped_ptr<browser_sync::AssociatorInterface> model_associator_;
|
| - scoped_ptr<browser_sync::ChangeProcessor> change_processor_;
|
| + scoped_ptr<sync_driver::AssociatorInterface> model_associator_;
|
| + scoped_ptr<sync_driver::ChangeProcessor> change_processor_;
|
| };
|
|
|
| #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_MOCK_H__
|
|
|