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

Unified Diff: components/sync/core_impl/test/fake_sync_manager.cc

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_impl/test/fake_sync_manager.cc
diff --git a/components/sync/core_impl/test/fake_sync_manager.cc b/components/sync/core_impl/test/fake_sync_manager.cc
index 0360f7170a346fda26ad0d01ed7cd0e4512125ae..3077ebe22c45ae36ba2811ed43f4a1a80fa6c27a 100644
--- a/components/sync/core_impl/test/fake_sync_manager.cc
+++ b/components/sync/core_impl/test/fake_sync_manager.cc
@@ -199,9 +199,9 @@ UserShare* FakeSyncManager::GetUserShare() {
return test_user_share_.user_share();
}
-std::unique_ptr<ModelTypeConnector>
+std::unique_ptr<syncer_v2::ModelTypeConnector>
FakeSyncManager::GetModelTypeConnectorProxy() {
- return base::MakeUnique<FakeModelTypeConnector>();
+ return base::MakeUnique<syncer_v2::FakeModelTypeConnector>();
}
const std::string FakeSyncManager::cache_guid() {
@@ -231,20 +231,20 @@ void FakeSyncManager::RefreshTypes(ModelTypeSet types) {
}
void FakeSyncManager::RegisterDirectoryTypeDebugInfoObserver(
- TypeDebugInfoObserver* observer) {}
+ syncer::TypeDebugInfoObserver* observer) {}
void FakeSyncManager::UnregisterDirectoryTypeDebugInfoObserver(
- TypeDebugInfoObserver* observer) {}
+ syncer::TypeDebugInfoObserver* observer) {}
bool FakeSyncManager::HasDirectoryTypeDebugInfoObserver(
- TypeDebugInfoObserver* observer) {
+ syncer::TypeDebugInfoObserver* observer) {
return false;
}
void FakeSyncManager::RequestEmitDebugInfo() {}
void FakeSyncManager::OnIncomingInvalidation(
- ModelType type,
+ syncer::ModelType type,
std::unique_ptr<InvalidationInterface> invalidation) {
num_invalidations_received_++;
}

Powered by Google App Engine
This is Rietveld 408576698