| 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 12f3f70edea4f62e5d23027c499b05640d992516..8589f54d273876eed283684b8724c2a8f2342163 100644
|
| --- a/sync/internal_api/public/test/fake_sync_manager.h
|
| +++ b/sync/internal_api/public/test/fake_sync_manager.h
|
| @@ -18,6 +18,8 @@ class SequencedTaskRunner;
|
|
|
| namespace syncer {
|
|
|
| +class FakeSyncEncryptionHandler;
|
| +
|
| class FakeSyncManager : public SyncManager {
|
| public:
|
| explicit FakeSyncManager();
|
| @@ -99,9 +101,6 @@ class FakeSyncManager : public SyncManager {
|
| const ObjectIdSet& ids) OVERRIDE;
|
| virtual void StartSyncingNormally(
|
| const ModelSafeRoutingInfo& routing_info) OVERRIDE;
|
| - virtual void SetEncryptionPassphrase(const std::string& passphrase,
|
| - bool is_explicit) OVERRIDE;
|
| - virtual void SetDecryptionPassphrase(const std::string& passphrase) OVERRIDE;
|
| virtual void ConfigureSyncer(
|
| ConfigureReason reason,
|
| const ModelTypeSet& types_to_config,
|
| @@ -111,17 +110,14 @@ class FakeSyncManager : public SyncManager {
|
| virtual void AddObserver(Observer* observer) OVERRIDE;
|
| virtual void RemoveObserver(Observer* observer) OVERRIDE;
|
| virtual SyncStatus GetDetailedStatus() const OVERRIDE;
|
| - virtual bool IsUsingExplicitPassphrase() OVERRIDE;
|
| virtual bool GetKeystoreKeyBootstrapToken(std::string* token) OVERRIDE;
|
| virtual void SaveChanges() OVERRIDE;
|
| virtual void StopSyncingForShutdown(const base::Closure& callback) OVERRIDE;
|
| virtual void ShutdownOnSyncThread() OVERRIDE;
|
| virtual UserShare* GetUserShare() OVERRIDE;
|
| - virtual void RefreshNigori(const std::string& chrome_version,
|
| - const base::Closure& done_callback) OVERRIDE;
|
| - virtual void EnableEncryptEverything() OVERRIDE;
|
| virtual bool ReceivedExperiment(Experiments* experiments) OVERRIDE;
|
| virtual bool HasUnsyncedItems() OVERRIDE;
|
| + virtual SyncEncryptionHandler* GetEncryptionHandler() OVERRIDE;
|
|
|
| private:
|
| void InvalidateOnSyncThread(
|
| @@ -152,6 +148,8 @@ class FakeSyncManager : public SyncManager {
|
| // Faked notifier state.
|
| SyncNotifierHelper notifier_helper_;
|
|
|
| + scoped_ptr<FakeSyncEncryptionHandler> fake_encryption_handler_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(FakeSyncManager);
|
| };
|
|
|
|
|