| Index: components/sync/core/test/fake_sync_manager.h
|
| diff --git a/components/sync/core/test/fake_sync_manager.h b/components/sync/core/test/fake_sync_manager.h
|
| index 1687b93935e03f74b3ad2357dc0cfd4728e9bf55..19a444ffa55eb84250481515029b0541ce70f7cc 100644
|
| --- a/components/sync/core/test/fake_sync_manager.h
|
| +++ b/components/sync/core/test/fake_sync_manager.h
|
| @@ -89,7 +89,7 @@ class FakeSyncManager : public SyncManager {
|
| const base::Closure& ready_task,
|
| const base::Closure& retry_task) override;
|
| void OnIncomingInvalidation(
|
| - syncer::ModelType type,
|
| + ModelType type,
|
| std::unique_ptr<InvalidationInterface> interface) override;
|
| void SetInvalidatorEnabled(bool invalidator_enabled) override;
|
| void AddObserver(Observer* observer) override;
|
| @@ -98,8 +98,7 @@ class FakeSyncManager : public SyncManager {
|
| void SaveChanges() override;
|
| void ShutdownOnSyncThread(ShutdownReason reason) override;
|
| UserShare* GetUserShare() override;
|
| - std::unique_ptr<syncer_v2::ModelTypeConnector> GetModelTypeConnectorProxy()
|
| - override;
|
| + std::unique_ptr<ModelTypeConnector> GetModelTypeConnectorProxy() override;
|
| const std::string cache_guid() override;
|
| bool ReceivedExperiment(Experiments* experiments) override;
|
| bool HasUnsyncedItems() override;
|
| @@ -108,11 +107,11 @@ class FakeSyncManager : public SyncManager {
|
| override;
|
| void RefreshTypes(ModelTypeSet types) override;
|
| void RegisterDirectoryTypeDebugInfoObserver(
|
| - syncer::TypeDebugInfoObserver* observer) override;
|
| + TypeDebugInfoObserver* observer) override;
|
| void UnregisterDirectoryTypeDebugInfoObserver(
|
| - syncer::TypeDebugInfoObserver* observer) override;
|
| + TypeDebugInfoObserver* observer) override;
|
| bool HasDirectoryTypeDebugInfoObserver(
|
| - syncer::TypeDebugInfoObserver* observer) override;
|
| + TypeDebugInfoObserver* observer) override;
|
| void RequestEmitDebugInfo() override;
|
| void ClearServerData(const ClearServerDataCallback& callback) override;
|
| void OnCookieJarChanged(bool account_mismatch, bool empty_jar) override;
|
|
|