Index: components/sync/driver/fake_sync_client.h |
diff --git a/components/sync/driver/fake_sync_client.h b/components/sync/driver/fake_sync_client.h |
index 7911d93cc5246b16e8cdfc169fac532a8429b5a0..3d929bb0a30371339e74e7c2728697280e830191 100644 |
--- a/components/sync/driver/fake_sync_client.h |
+++ b/components/sync/driver/fake_sync_client.h |
@@ -11,8 +11,7 @@ |
#include "components/sync/driver/sync_client.h" |
#include "components/syncable_prefs/testing_pref_service_syncable.h" |
-namespace syncer { |
- |
+namespace sync_driver { |
class FakeSyncService; |
// Fake implementation of SyncClient interface for tests. |
@@ -30,33 +29,33 @@ class FakeSyncClient : public SyncClient { |
favicon::FaviconService* GetFaviconService() override; |
history::HistoryService* GetHistoryService() override; |
base::Closure GetPasswordStateChangedCallback() override; |
- SyncApiComponentFactory::RegisterDataTypesMethod |
+ sync_driver::SyncApiComponentFactory::RegisterDataTypesMethod |
GetRegisterPlatformTypesCallback() override; |
autofill::PersonalDataManager* GetPersonalDataManager() override; |
BookmarkUndoService* GetBookmarkUndoServiceIfExists() override; |
invalidation::InvalidationService* GetInvalidationService() override; |
- scoped_refptr<ExtensionsActivity> GetExtensionsActivity() override; |
+ scoped_refptr<syncer::ExtensionsActivity> GetExtensionsActivity() override; |
sync_sessions::SyncSessionsClient* GetSyncSessionsClient() override; |
- base::WeakPtr<SyncableService> GetSyncableServiceForType( |
- ModelType type) override; |
- base::WeakPtr<ModelTypeService> GetModelTypeServiceForType( |
- ModelType type) override; |
- scoped_refptr<ModelSafeWorker> CreateModelWorkerForGroup( |
- ModelSafeGroup group, |
- WorkerLoopDestructionObserver* observer) override; |
+ base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType( |
+ syncer::ModelType type) override; |
+ base::WeakPtr<syncer_v2::ModelTypeService> GetModelTypeServiceForType( |
+ syncer::ModelType type) override; |
+ scoped_refptr<syncer::ModelSafeWorker> CreateModelWorkerForGroup( |
+ syncer::ModelSafeGroup group, |
+ syncer::WorkerLoopDestructionObserver* observer) override; |
SyncApiComponentFactory* GetSyncApiComponentFactory() override; |
- void SetModelTypeService(ModelTypeService* model_type_service); |
+ void SetModelTypeService(syncer_v2::ModelTypeService* model_type_service); |
private: |
syncable_prefs::TestingPrefServiceSyncable pref_service_; |
- ModelTypeService* model_type_service_; |
+ syncer_v2::ModelTypeService* model_type_service_; |
SyncApiComponentFactory* factory_; |
std::unique_ptr<FakeSyncService> sync_service_; |
DISALLOW_COPY_AND_ASSIGN(FakeSyncClient); |
}; |
-} // namespace syncer |
+} // namespace sync_driver |
#endif // COMPONENTS_SYNC_DRIVER_FAKE_SYNC_CLIENT_H_ |