| Index: sync/internal_api/sync_encryption_handler_impl.h | 
| diff --git a/sync/internal_api/sync_encryption_handler_impl.h b/sync/internal_api/sync_encryption_handler_impl.h | 
| index 89621c740582e347b6c46e1804cb92292eb979b9..6cbf74ed8b60b4c5a2f445edbb3275e2f30e18ba 100644 | 
| --- a/sync/internal_api/sync_encryption_handler_impl.h | 
| +++ b/sync/internal_api/sync_encryption_handler_impl.h | 
| @@ -54,32 +54,32 @@ class SYNC_EXPORT_PRIVATE SyncEncryptionHandlerImpl | 
| virtual ~SyncEncryptionHandlerImpl(); | 
|  | 
| // SyncEncryptionHandler implementation. | 
| -  virtual void AddObserver(Observer* observer) OVERRIDE; | 
| -  virtual void RemoveObserver(Observer* observer) OVERRIDE; | 
| -  virtual void Init() OVERRIDE; | 
| +  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; | 
| +                                       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; | 
|  | 
| // NigoriHandler implementation. | 
| // Note: all methods are invoked while the caller holds a transaction. | 
| virtual void ApplyNigoriUpdate( | 
| const sync_pb::NigoriSpecifics& nigori, | 
| -      syncable::BaseTransaction* const trans) OVERRIDE; | 
| +      syncable::BaseTransaction* const trans) override; | 
| virtual void UpdateNigoriFromEncryptedTypes( | 
| sync_pb::NigoriSpecifics* nigori, | 
| -      syncable::BaseTransaction* const trans) const OVERRIDE; | 
| +      syncable::BaseTransaction* const trans) const override; | 
| virtual bool NeedKeystoreKey( | 
| -      syncable::BaseTransaction* const trans) const OVERRIDE; | 
| +      syncable::BaseTransaction* const trans) const override; | 
| virtual bool SetKeystoreKeys( | 
| const google::protobuf::RepeatedPtrField<google::protobuf::string>& keys, | 
| -      syncable::BaseTransaction* const trans) OVERRIDE; | 
| +      syncable::BaseTransaction* const trans) override; | 
| // Can be called from any thread. | 
| virtual ModelTypeSet GetEncryptedTypes( | 
| -      syncable::BaseTransaction* const trans) const OVERRIDE; | 
| +      syncable::BaseTransaction* const trans) const override; | 
|  | 
| // Unsafe getters. Use only if sync is not up and running and there is no risk | 
| // of other threads calling this. | 
|  |