| 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 3077ebe22c45ae36ba2811ed43f4a1a80fa6c27a..0360f7170a346fda26ad0d01ed7cd0e4512125ae 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<syncer_v2::ModelTypeConnector> | 
| +std::unique_ptr<ModelTypeConnector> | 
| FakeSyncManager::GetModelTypeConnectorProxy() { | 
| -  return base::MakeUnique<syncer_v2::FakeModelTypeConnector>(); | 
| +  return base::MakeUnique<FakeModelTypeConnector>(); | 
| } | 
|  | 
| const std::string FakeSyncManager::cache_guid() { | 
| @@ -231,20 +231,20 @@ void FakeSyncManager::RefreshTypes(ModelTypeSet types) { | 
| } | 
|  | 
| void FakeSyncManager::RegisterDirectoryTypeDebugInfoObserver( | 
| -    syncer::TypeDebugInfoObserver* observer) {} | 
| +    TypeDebugInfoObserver* observer) {} | 
|  | 
| void FakeSyncManager::UnregisterDirectoryTypeDebugInfoObserver( | 
| -    syncer::TypeDebugInfoObserver* observer) {} | 
| +    TypeDebugInfoObserver* observer) {} | 
|  | 
| bool FakeSyncManager::HasDirectoryTypeDebugInfoObserver( | 
| -    syncer::TypeDebugInfoObserver* observer) { | 
| +    TypeDebugInfoObserver* observer) { | 
| return false; | 
| } | 
|  | 
| void FakeSyncManager::RequestEmitDebugInfo() {} | 
|  | 
| void FakeSyncManager::OnIncomingInvalidation( | 
| -    syncer::ModelType type, | 
| +    ModelType type, | 
| std::unique_ptr<InvalidationInterface> invalidation) { | 
| num_invalidations_received_++; | 
| } | 
|  |