| 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 dcd877a844a013c07429c1ce182b8e88d57c47d8..91a25d1f3c4864edf7b9a12a2e8257b1645e0028 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:
|
| // |initial_sync_ended_types|: The set of types that have initial_sync_ended
|
| @@ -103,9 +105,6 @@ class FakeSyncManager : public SyncManager {
|
| SyncNotifierObserver* handler) 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,
|
| @@ -115,17 +114,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(
|
| @@ -156,6 +152,8 @@ class FakeSyncManager : public SyncManager {
|
| // Faked notifier state.
|
| SyncNotifierRegistrar registrar_;
|
|
|
| + scoped_ptr<FakeSyncEncryptionHandler> fake_encryption_handler_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(FakeSyncManager);
|
| };
|
|
|
|
|