| Index: sync/internal_api/public/test/fake_sync_manager.h
|
| diff --git a/sync/internal_api/public/test/fake_sync_manager.h b/sync/internal_api/public/test/fake_sync_manager.h
|
| index be06ea5e745d571703895d7469869cf390962797..300921c2c89c8bbf84d49046aaccaa6b8dec9520 100644
|
| --- a/sync/internal_api/public/test/fake_sync_manager.h
|
| +++ b/sync/internal_api/public/test/fake_sync_manager.h
|
| @@ -92,7 +92,8 @@ class FakeSyncManager : public SyncManager {
|
| Encryptor* encryptor,
|
| scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler,
|
| ReportUnrecoverableErrorFunction report_unrecoverable_error_function,
|
| - bool use_oauth2_token) OVERRIDE;
|
| + bool use_oauth2_token,
|
| + CancelationSignal* cancelation_signal) OVERRIDE;
|
| virtual void ThrowUnrecoverableError() OVERRIDE;
|
| virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE;
|
| virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken(
|
| @@ -114,7 +115,6 @@ class FakeSyncManager : public SyncManager {
|
| virtual void RemoveObserver(Observer* observer) OVERRIDE;
|
| virtual SyncStatus GetDetailedStatus() const OVERRIDE;
|
| virtual void SaveChanges() OVERRIDE;
|
| - virtual void StopSyncingForShutdown() OVERRIDE;
|
| virtual void ShutdownOnSyncThread() OVERRIDE;
|
| virtual UserShare* GetUserShare() OVERRIDE;
|
| virtual const std::string cache_guid() OVERRIDE;
|
|
|