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

Unified Diff: components/sync/core/test/fake_sync_manager.h

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: Created 4 years, 2 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/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 19a444ffa55eb84250481515029b0541ce70f7cc..1687b93935e03f74b3ad2357dc0cfd4728e9bf55 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(
- ModelType type,
+ syncer::ModelType type,
std::unique_ptr<InvalidationInterface> interface) override;
void SetInvalidatorEnabled(bool invalidator_enabled) override;
void AddObserver(Observer* observer) override;
@@ -98,7 +98,8 @@ class FakeSyncManager : public SyncManager {
void SaveChanges() override;
void ShutdownOnSyncThread(ShutdownReason reason) override;
UserShare* GetUserShare() override;
- std::unique_ptr<ModelTypeConnector> GetModelTypeConnectorProxy() override;
+ std::unique_ptr<syncer_v2::ModelTypeConnector> GetModelTypeConnectorProxy()
+ override;
const std::string cache_guid() override;
bool ReceivedExperiment(Experiments* experiments) override;
bool HasUnsyncedItems() override;
@@ -107,11 +108,11 @@ class FakeSyncManager : public SyncManager {
override;
void RefreshTypes(ModelTypeSet types) override;
void RegisterDirectoryTypeDebugInfoObserver(
- TypeDebugInfoObserver* observer) override;
+ syncer::TypeDebugInfoObserver* observer) override;
void UnregisterDirectoryTypeDebugInfoObserver(
- TypeDebugInfoObserver* observer) override;
+ syncer::TypeDebugInfoObserver* observer) override;
bool HasDirectoryTypeDebugInfoObserver(
- TypeDebugInfoObserver* observer) override;
+ syncer::TypeDebugInfoObserver* observer) override;
void RequestEmitDebugInfo() override;
void ClearServerData(const ClearServerDataCallback& callback) override;
void OnCookieJarChanged(bool account_mismatch, bool empty_jar) override;
« no previous file with comments | « components/sync/core/test/fake_model_type_processor.h ('k') | components/sync/core/test/model_type_store_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698