| Index: components/sync/core_impl/sync_manager_impl.h | 
| diff --git a/components/sync/core_impl/sync_manager_impl.h b/components/sync/core_impl/sync_manager_impl.h | 
| index 4b1044f9498cbd61f87d372c0e71aff8f00c4bf1..cd9c8eeb4c4f2008cb02e340deae7be8caf91220 100644 | 
| --- a/components/sync/core_impl/sync_manager_impl.h | 
| +++ b/components/sync/core_impl/sync_manager_impl.h | 
| @@ -85,7 +85,7 @@ class SyncManagerImpl | 
| const base::Closure& retry_task) override; | 
| void SetInvalidatorEnabled(bool invalidator_enabled) override; | 
| void OnIncomingInvalidation( | 
| -      syncer::ModelType type, | 
| +      ModelType type, | 
| std::unique_ptr<InvalidationInterface> invalidation) override; | 
| void AddObserver(SyncManager::Observer* observer) override; | 
| void RemoveObserver(SyncManager::Observer* observer) override; | 
| @@ -93,8 +93,7 @@ class SyncManagerImpl | 
| 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; | 
| @@ -102,11 +101,11 @@ class SyncManagerImpl | 
| std::vector<std::unique_ptr<ProtocolEvent>> GetBufferedProtocolEvents() | 
| 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; | 
| @@ -171,9 +170,9 @@ class SyncManagerImpl | 
| net::NetworkChangeNotifier::ConnectionType) override; | 
|  | 
| // NudgeHandler implementation. | 
| -  void NudgeForInitialDownload(syncer::ModelType type) override; | 
| -  void NudgeForCommit(syncer::ModelType type) override; | 
| -  void NudgeForRefresh(syncer::ModelType type) override; | 
| +  void NudgeForInitialDownload(ModelType type) override; | 
| +  void NudgeForCommit(ModelType type) override; | 
| +  void NudgeForRefresh(ModelType type) override; | 
|  | 
| const SyncScheduler* scheduler() const; | 
|  | 
|  |