| Index: sync/test/fake_sync_encryption_handler.h
|
| diff --git a/sync/test/fake_sync_encryption_handler.h b/sync/test/fake_sync_encryption_handler.h
|
| index df4c77041e144b31ced0cd28dbdcd1d146bde824..c3180a684dd4d13796e017430d15eb597d173d18 100644
|
| --- a/sync/test/fake_sync_encryption_handler.h
|
| +++ b/sync/test/fake_sync_encryption_handler.h
|
| @@ -26,32 +26,30 @@ class FakeSyncEncryptionHandler : public SyncEncryptionHandler,
|
| public syncable::NigoriHandler {
|
| public:
|
| FakeSyncEncryptionHandler();
|
| - virtual ~FakeSyncEncryptionHandler();
|
| + ~FakeSyncEncryptionHandler() override;
|
|
|
| // SyncEncryptionHandler implementation.
|
| - virtual void AddObserver(Observer* observer) override;
|
| - virtual void RemoveObserver(Observer* observer) override;
|
| - virtual void Init() override;
|
| - virtual void SetEncryptionPassphrase(const std::string& passphrase,
|
| - bool is_explicit) override;
|
| - virtual void SetDecryptionPassphrase(const std::string& passphrase) override;
|
| - virtual void EnableEncryptEverything() override;
|
| - virtual bool EncryptEverythingEnabled() const override;
|
| - virtual PassphraseType GetPassphraseType() const override;
|
| + void AddObserver(Observer* observer) override;
|
| + void RemoveObserver(Observer* observer) override;
|
| + void Init() override;
|
| + void SetEncryptionPassphrase(const std::string& passphrase,
|
| + bool is_explicit) override;
|
| + void SetDecryptionPassphrase(const std::string& passphrase) override;
|
| + void EnableEncryptEverything() override;
|
| + bool EncryptEverythingEnabled() const override;
|
| + PassphraseType GetPassphraseType() const override;
|
|
|
| // NigoriHandler implemenation.
|
| - virtual void ApplyNigoriUpdate(
|
| - const sync_pb::NigoriSpecifics& nigori,
|
| - syncable::BaseTransaction* const trans) override;
|
| - virtual void UpdateNigoriFromEncryptedTypes(
|
| + void ApplyNigoriUpdate(const sync_pb::NigoriSpecifics& nigori,
|
| + syncable::BaseTransaction* const trans) override;
|
| + void UpdateNigoriFromEncryptedTypes(
|
| sync_pb::NigoriSpecifics* nigori,
|
| syncable::BaseTransaction* const trans) const override;
|
| - virtual bool NeedKeystoreKey(
|
| - syncable::BaseTransaction* const trans) const override;
|
| - virtual bool SetKeystoreKeys(
|
| + bool NeedKeystoreKey(syncable::BaseTransaction* const trans) const override;
|
| + bool SetKeystoreKeys(
|
| const google::protobuf::RepeatedPtrField<google::protobuf::string>& keys,
|
| syncable::BaseTransaction* const trans) override;
|
| - virtual ModelTypeSet GetEncryptedTypes(
|
| + ModelTypeSet GetEncryptedTypes(
|
| syncable::BaseTransaction* const trans) const override;
|
|
|
| Cryptographer* cryptographer() { return &cryptographer_; }
|
|
|