replace OVERRIDE and FINAL with override and final in sync/

BUG=417463

Review URL: https://codereview.chromium.org/629733002

Cr-Commit-Position: refs/heads/master@{#298300}

26 files changed, 103 insertions, 103 deletions

diff --git a/sync/test/accounts_client/test_accounts_client.cc b/sync/test/accounts_client/test_accounts_client.cc
index 9520bcf..7a5c1e7f 100644
--- a/sync/test/accounts_client/test_accounts_client.cc
+++ b/sync/test/accounts_client/test_accounts_client.cc
@@ -39,7 +39,7 @@ class AccountsRequestDelegate : public net::URLFetcherDelegate {
   AccountsRequestDelegate(base::RunLoop* run_loop) : response_(""),
       success_(false), run_loop_(run_loop) {}
 
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE {
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override {
     string url = source->GetURL().spec();
     source->GetResponseAsString(&response_);
 
diff --git a/sync/test/accounts_client/url_request_context_getter.h b/sync/test/accounts_client/url_request_context_getter.h
index 6891072..aecf658 100644
--- a/sync/test/accounts_client/url_request_context_getter.h
+++ b/sync/test/accounts_client/url_request_context_getter.h
@@ -25,9 +25,9 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
       scoped_refptr<base::SingleThreadTaskRunner> network_task_runner);
 
   // Overridden from net::URLRequestContextGetter:
-  virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
+  virtual net::URLRequestContext* GetURLRequestContext() override;
   virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetNetworkTaskRunner() const OVERRIDE;
+      GetNetworkTaskRunner() const override;
 
  private:
   virtual ~URLRequestContextGetter();
diff --git a/sync/test/engine/fake_model_worker.h b/sync/test/engine/fake_model_worker.h
index 9c621be..c85b666 100644
--- a/sync/test/engine/fake_model_worker.h
+++ b/sync/test/engine/fake_model_worker.h
@@ -22,12 +22,12 @@ class FakeModelWorker : public ModelSafeWorker, public base::NonThreadSafe {
   explicit FakeModelWorker(ModelSafeGroup group);
 
   // ModelSafeWorker implementation.
-  virtual void RegisterForLoopDestruction() OVERRIDE;
-  virtual ModelSafeGroup GetModelSafeGroup() OVERRIDE;
+  virtual void RegisterForLoopDestruction() override;
+  virtual ModelSafeGroup GetModelSafeGroup() override;
 
  protected:
   virtual SyncerError DoWorkAndWaitUntilDoneImpl(
-      const WorkCallback& work) OVERRIDE;
+      const WorkCallback& work) override;
 
  private:
   virtual ~FakeModelWorker();
diff --git a/sync/test/engine/fake_sync_scheduler.h b/sync/test/engine/fake_sync_scheduler.h
index 6abc402..3c1f34c 100644
--- a/sync/test/engine/fake_sync_scheduler.h
+++ b/sync/test/engine/fake_sync_scheduler.h
@@ -19,45 +19,45 @@ class FakeSyncScheduler : public SyncScheduler {
   FakeSyncScheduler();
   virtual ~FakeSyncScheduler();
 
-  virtual void Start(Mode mode) OVERRIDE;
-  virtual void Stop() OVERRIDE;
+  virtual void Start(Mode mode) override;
+  virtual void Stop() override;
   virtual void ScheduleLocalNudge(
       ModelTypeSet types,
-      const tracked_objects::Location& nudge_location) OVERRIDE;
+      const tracked_objects::Location& nudge_location) override;
   virtual void ScheduleLocalRefreshRequest(
       ModelTypeSet types,
-      const tracked_objects::Location& nudge_location) OVERRIDE;
+      const tracked_objects::Location& nudge_location) override;
   virtual void ScheduleInvalidationNudge(
       syncer::ModelType type,
       scoped_ptr<InvalidationInterface> interface,
-      const tracked_objects::Location& nudge_location) OVERRIDE;
+      const tracked_objects::Location& nudge_location) override;
   virtual void ScheduleConfiguration(
-      const ConfigurationParams& params) OVERRIDE;
-  virtual void ScheduleInitialSyncNudge(syncer::ModelType model_type) OVERRIDE;
-  virtual void SetNotificationsEnabled(bool notifications_enabled) OVERRIDE;
+      const ConfigurationParams& params) override;
+  virtual void ScheduleInitialSyncNudge(syncer::ModelType model_type) override;
+  virtual void SetNotificationsEnabled(bool notifications_enabled) override;
 
-  virtual void OnCredentialsUpdated() OVERRIDE;
-  virtual void OnConnectionStatusChange() OVERRIDE;
+  virtual void OnCredentialsUpdated() override;
+  virtual void OnConnectionStatusChange() override;
 
   // SyncSession::Delegate implementation.
   virtual void OnThrottled(
-      const base::TimeDelta& throttle_duration) OVERRIDE;
+      const base::TimeDelta& throttle_duration) override;
   virtual void OnTypesThrottled(
       ModelTypeSet types,
-      const base::TimeDelta& throttle_duration) OVERRIDE;
-  virtual bool IsCurrentlyThrottled() OVERRIDE;
+      const base::TimeDelta& throttle_duration) override;
+  virtual bool IsCurrentlyThrottled() override;
   virtual void OnReceivedShortPollIntervalUpdate(
-      const base::TimeDelta& new_interval) OVERRIDE;
+      const base::TimeDelta& new_interval) override;
   virtual void OnReceivedLongPollIntervalUpdate(
-      const base::TimeDelta& new_interval) OVERRIDE;
+      const base::TimeDelta& new_interval) override;
   virtual void OnReceivedCustomNudgeDelays(
-      const std::map<ModelType, base::TimeDelta>& nudge_delays) OVERRIDE;
-  virtual void OnReceivedClientInvalidationHintBufferSize(int size) OVERRIDE;
+      const std::map<ModelType, base::TimeDelta>& nudge_delays) override;
+  virtual void OnReceivedClientInvalidationHintBufferSize(int size) override;
   virtual void OnSyncProtocolError(
-      const SyncProtocolError& error) OVERRIDE;
+      const SyncProtocolError& error) override;
   virtual void OnReceivedGuRetryDelay(
-      const base::TimeDelta& delay) OVERRIDE;
-  virtual void OnReceivedMigrationRequest(ModelTypeSet types) OVERRIDE;
+      const base::TimeDelta& delay) override;
+  virtual void OnReceivedMigrationRequest(ModelTypeSet types) override;
 };
 
 }  // namespace syncer
diff --git a/sync/test/engine/injectable_sync_context_proxy.h b/sync/test/engine/injectable_sync_context_proxy.h
index a6303f1..29bb8c2 100644
--- a/sync/test/engine/injectable_sync_context_proxy.h
+++ b/sync/test/engine/injectable_sync_context_proxy.h
@@ -27,9 +27,9 @@ class InjectableSyncContextProxy : public syncer::SyncContextProxy {
       const DataTypeState& data_type_state,
       const UpdateResponseDataList& pending_updates,
       const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& type_sync_proxy)
-      OVERRIDE;
-  virtual void Disconnect(syncer::ModelType type) OVERRIDE;
-  virtual scoped_ptr<SyncContextProxy> Clone() const OVERRIDE;
+      override;
+  virtual void Disconnect(syncer::ModelType type) override;
+  virtual scoped_ptr<SyncContextProxy> Clone() const override;
 
   ModelTypeSyncWorker* GetWorker();
 
diff --git a/sync/test/engine/mock_connection_manager.h b/sync/test/engine/mock_connection_manager.h
index 6b95eab..4312080 100644
--- a/sync/test/engine/mock_connection_manager.h
+++ b/sync/test/engine/mock_connection_manager.h
@@ -42,7 +42,7 @@ class MockConnectionManager : public ServerConnectionManager {
       PostBufferParams*,
       const std::string& path,
       const std::string& auth_token,
-      ScopedServerStatusWatcher* watcher) OVERRIDE;
+      ScopedServerStatusWatcher* watcher) override;
 
   // Control of commit response.
   // NOTE: Commit callback is invoked only once then reset.
diff --git a/sync/test/engine/mock_model_type_sync_proxy.h b/sync/test/engine/mock_model_type_sync_proxy.h
index 140904b..fd09927 100644
--- a/sync/test/engine/mock_model_type_sync_proxy.h
+++ b/sync/test/engine/mock_model_type_sync_proxy.h
@@ -33,11 +33,11 @@ class MockModelTypeSyncProxy : public ModelTypeSyncProxy {
   // Implementation of ModelTypeSyncProxy.
   virtual void OnCommitCompleted(
       const DataTypeState& type_state,
-      const CommitResponseDataList& response_list) OVERRIDE;
+      const CommitResponseDataList& response_list) override;
   virtual void OnUpdateReceived(
       const DataTypeState& type_state,
       const UpdateResponseDataList& response_list,
-      const UpdateResponseDataList& pending_updates) OVERRIDE;
+      const UpdateResponseDataList& pending_updates) override;
 
   // By default, this object behaves as if all messages are processed
   // immediately.  Sometimes it is useful to defer work until later, as might
diff --git a/sync/test/engine/mock_model_type_sync_worker.h b/sync/test/engine/mock_model_type_sync_worker.h
index b33e548..2078c84 100644
--- a/sync/test/engine/mock_model_type_sync_worker.h
+++ b/sync/test/engine/mock_model_type_sync_worker.h
@@ -24,7 +24,7 @@ class MockModelTypeSyncWorker : public ModelTypeSyncWorker {
   virtual ~MockModelTypeSyncWorker();
 
   // Implementation of ModelTypeSyncWorker.
-  virtual void EnqueueForCommit(const CommitRequestDataList& list) OVERRIDE;
+  virtual void EnqueueForCommit(const CommitRequestDataList& list) override;
 
   // Getters to inspect the requests sent to this object.
   size_t GetNumCommitRequestLists() const;
diff --git a/sync/test/engine/mock_nudge_handler.h b/sync/test/engine/mock_nudge_handler.h
index bbde8ed..11f502c 100644
--- a/sync/test/engine/mock_nudge_handler.h
+++ b/sync/test/engine/mock_nudge_handler.h
@@ -17,9 +17,9 @@ class MockNudgeHandler : public NudgeHandler {
   MockNudgeHandler();
   virtual ~MockNudgeHandler();
 
-  virtual void NudgeForInitialDownload(syncer::ModelType type) OVERRIDE;
-  virtual void NudgeForCommit(syncer::ModelType type) OVERRIDE;
-  virtual void NudgeForRefresh(syncer::ModelType type) OVERRIDE;
+  virtual void NudgeForInitialDownload(syncer::ModelType type) override;
+  virtual void NudgeForCommit(syncer::ModelType type) override;
+  virtual void NudgeForRefresh(syncer::ModelType type) override;
 
   int GetNumInitialDownloadNudges() const;
   int GetNumCommitNudges() const;
diff --git a/sync/test/engine/mock_update_handler.h b/sync/test/engine/mock_update_handler.h
index 64654ad..74393df 100644
--- a/sync/test/engine/mock_update_handler.h
+++ b/sync/test/engine/mock_update_handler.h
@@ -19,16 +19,16 @@ class MockUpdateHandler : public UpdateHandler {
 
   // UpdateHandler implementation.
   virtual void GetDownloadProgress(
-      sync_pb::DataTypeProgressMarker* progress_marker) const OVERRIDE;
+      sync_pb::DataTypeProgressMarker* progress_marker) const override;
   virtual void GetDataTypeContext(sync_pb::DataTypeContext* context) const
-      OVERRIDE;
+      override;
   virtual SyncerError ProcessGetUpdatesResponse(
       const sync_pb::DataTypeProgressMarker& progress_marker,
       const sync_pb::DataTypeContext& mutated_context,
       const SyncEntityList& applicable_updates,
-      sessions::StatusController* status) OVERRIDE;
-  virtual void ApplyUpdates(sessions::StatusController* status) OVERRIDE;
-  virtual void PassiveApplyUpdates(sessions::StatusController* status) OVERRIDE;
+      sessions::StatusController* status) override;
+  virtual void ApplyUpdates(sessions::StatusController* status) override;
+  virtual void PassiveApplyUpdates(sessions::StatusController* status) override;
 
   // Returns the number of times ApplyUpdates() was invoked.
   int GetApplyUpdatesCount();
diff --git a/sync/test/fake_encryptor.h b/sync/test/fake_encryptor.h
index a1117ef..d607113 100644
--- a/sync/test/fake_encryptor.h
+++ b/sync/test/fake_encryptor.h
@@ -17,10 +17,10 @@ class FakeEncryptor : public Encryptor {
   virtual ~FakeEncryptor();
 
   virtual bool EncryptString(const std::string& plaintext,
-                             std::string* ciphertext) OVERRIDE;
+                             std::string* ciphertext) override;
 
   virtual bool DecryptString(const std::string& ciphertext,
-                             std::string* plaintext) OVERRIDE;
+                             std::string* plaintext) override;
 };
 
 }  // namespace syncer
diff --git a/sync/test/fake_server/bookmark_entity.h b/sync/test/fake_server/bookmark_entity.h
index 1ae449d..6161d16 100644
--- a/sync/test/fake_server/bookmark_entity.h
+++ b/sync/test/fake_server/bookmark_entity.h
@@ -49,10 +49,10 @@ class BookmarkEntity : public FakeServerEntity {
                  int64 last_modified_time);
 
   // FakeServerEntity implementation.
-  virtual std::string GetParentId() const OVERRIDE;
-  virtual void SerializeAsProto(sync_pb::SyncEntity* proto) OVERRIDE;
-  virtual bool IsDeleted() const OVERRIDE;
-  virtual bool IsFolder() const OVERRIDE;
+  virtual std::string GetParentId() const override;
+  virtual void SerializeAsProto(sync_pb::SyncEntity* proto) override;
+  virtual bool IsDeleted() const override;
+  virtual bool IsFolder() const override;
 
  private:
   // All member values have equivalent fields in SyncEntity.
diff --git a/sync/test/fake_server/bookmark_entity_builder.h b/sync/test/fake_server/bookmark_entity_builder.h
index cd6df22..ebf66ff 100644
--- a/sync/test/fake_server/bookmark_entity_builder.h
+++ b/sync/test/fake_server/bookmark_entity_builder.h
@@ -26,7 +26,7 @@ class BookmarkEntityBuilder : public EntityBuilder {
   virtual ~BookmarkEntityBuilder();
 
   // EntityBuilder
-  virtual scoped_ptr<FakeServerEntity> Build() OVERRIDE;
+  virtual scoped_ptr<FakeServerEntity> Build() override;
 
  private:
   // The bookmark's URL.
diff --git a/sync/test/fake_server/fake_server_http_post_provider.h b/sync/test/fake_server/fake_server_http_post_provider.h
index 8fd42e8..53117c2 100644
--- a/sync/test/fake_server/fake_server_http_post_provider.h
+++ b/sync/test/fake_server/fake_server_http_post_provider.h
@@ -26,17 +26,17 @@ class FakeServerHttpPostProvider
       scoped_refptr<base::SequencedTaskRunner> task_runner);
 
   // HttpPostProviderInterface implementation.
-  virtual void SetExtraRequestHeaders(const char* headers) OVERRIDE;
-  virtual void SetURL(const char* url, int port) OVERRIDE;
+  virtual void SetExtraRequestHeaders(const char* headers) override;
+  virtual void SetURL(const char* url, int port) override;
   virtual void SetPostPayload(const char* content_type, int content_length,
-                              const char* content) OVERRIDE;
+                              const char* content) override;
   virtual bool MakeSynchronousPost(int* error_code,
-                                   int* response_code) OVERRIDE;
-  virtual void Abort() OVERRIDE;
-  virtual int GetResponseContentLength() const OVERRIDE;
-  virtual const char* GetResponseContent() const OVERRIDE;
+                                   int* response_code) override;
+  virtual void Abort() override;
+  virtual int GetResponseContentLength() const override;
+  virtual const char* GetResponseContent() const override;
   virtual const std::string GetResponseHeaderValue(
-      const std::string& name) const OVERRIDE;
+      const std::string& name) const override;
 
  protected:
   friend class base::RefCountedThreadSafe<FakeServerHttpPostProvider>;
@@ -72,9 +72,9 @@ class FakeServerHttpPostProviderFactory
   virtual ~FakeServerHttpPostProviderFactory();
 
   // HttpPostProviderFactory:
-  virtual void Init(const std::string& user_agent) OVERRIDE;
-  virtual syncer::HttpPostProviderInterface* Create() OVERRIDE;
-  virtual void Destroy(syncer::HttpPostProviderInterface* http) OVERRIDE;
+  virtual void Init(const std::string& user_agent) override;
+  virtual syncer::HttpPostProviderInterface* Create() override;
+  virtual void Destroy(syncer::HttpPostProviderInterface* http) override;
 
  private:
   FakeServer* const fake_server_;
diff --git a/sync/test/fake_server/fake_server_network_resources.h b/sync/test/fake_server/fake_server_network_resources.h
index 8cfe4dc..a34d7bd 100644
--- a/sync/test/fake_server/fake_server_network_resources.h
+++ b/sync/test/fake_server/fake_server_network_resources.h
@@ -29,7 +29,7 @@ class FakeServerNetworkResources : public syncer::NetworkResources {
           const scoped_refptr<net::URLRequestContextGetter>&
               baseline_context_getter,
           const syncer::NetworkTimeUpdateCallback& network_time_update_callback,
-          syncer::CancelationSignal* cancelation_signal) OVERRIDE;
+          syncer::CancelationSignal* cancelation_signal) override;
 
  private:
   FakeServer* const fake_server_;
diff --git a/sync/test/fake_server/permanent_entity.h b/sync/test/fake_server/permanent_entity.h
index 66f9eb0..210e396 100644
--- a/sync/test/fake_server/permanent_entity.h
+++ b/sync/test/fake_server/permanent_entity.h
@@ -37,10 +37,10 @@ class PermanentEntity : public FakeServerEntity {
       FakeServerEntity* current_server_entity);
 
   // FakeServerEntity implementation.
-  virtual std::string GetParentId() const OVERRIDE;
-  virtual void SerializeAsProto(sync_pb::SyncEntity* proto) OVERRIDE;
-  virtual bool IsDeleted() const OVERRIDE;
-  virtual bool IsFolder() const OVERRIDE;
+  virtual std::string GetParentId() const override;
+  virtual void SerializeAsProto(sync_pb::SyncEntity* proto) override;
+  virtual bool IsDeleted() const override;
+  virtual bool IsFolder() const override;
 
  private:
   PermanentEntity(const std::string& id,
diff --git a/sync/test/fake_server/tombstone_entity.h b/sync/test/fake_server/tombstone_entity.h
index b66d821..e7f86db 100644
--- a/sync/test/fake_server/tombstone_entity.h
+++ b/sync/test/fake_server/tombstone_entity.h
@@ -23,10 +23,10 @@ class TombstoneEntity : public FakeServerEntity {
   static FakeServerEntity* Create(const std::string& id);
 
   // FakeServerEntity implementation.
-  virtual std::string GetParentId() const OVERRIDE;
-  virtual void SerializeAsProto(sync_pb::SyncEntity* proto) OVERRIDE;
-  virtual bool IsDeleted() const OVERRIDE;
-  virtual bool IsFolder() const OVERRIDE;
+  virtual std::string GetParentId() const override;
+  virtual void SerializeAsProto(sync_pb::SyncEntity* proto) override;
+  virtual bool IsDeleted() const override;
+  virtual bool IsFolder() const override;
 
  private:
   TombstoneEntity(const std::string& id, const syncer::ModelType& model_type);
diff --git a/sync/test/fake_server/unique_client_entity.h b/sync/test/fake_server/unique_client_entity.h
index 67e0272..3d3f149 100644
--- a/sync/test/fake_server/unique_client_entity.h
+++ b/sync/test/fake_server/unique_client_entity.h
@@ -27,10 +27,10 @@ class UniqueClientEntity : public FakeServerEntity {
       const sync_pb::SyncEntity& entity);
 
   // FakeServerEntity implementation.
-  virtual std::string GetParentId() const OVERRIDE;
-  virtual void SerializeAsProto(sync_pb::SyncEntity* proto) OVERRIDE;
-  virtual bool IsDeleted() const OVERRIDE;
-  virtual bool IsFolder() const OVERRIDE;
+  virtual std::string GetParentId() const override;
+  virtual void SerializeAsProto(sync_pb::SyncEntity* proto) override;
+  virtual bool IsDeleted() const override;
+  virtual bool IsFolder() const override;
 
  private:
   UniqueClientEntity(const std::string& id,
diff --git a/sync/test/fake_sync_encryption_handler.h b/sync/test/fake_sync_encryption_handler.h
index ce1de21..df4c770 100644
--- a/sync/test/fake_sync_encryption_handler.h
+++ b/sync/test/fake_sync_encryption_handler.h
@@ -29,30 +29,30 @@ class FakeSyncEncryptionHandler : public SyncEncryptionHandler,
   virtual ~FakeSyncEncryptionHandler();
 
   // 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 implemenation.
   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;
   virtual ModelTypeSet GetEncryptedTypes(
-      syncable::BaseTransaction* const trans) const OVERRIDE;
+      syncable::BaseTransaction* const trans) const override;
 
   Cryptographer* cryptographer() { return &cryptographer_; }
 
diff --git a/sync/test/local_sync_test_server.h b/sync/test/local_sync_test_server.h
index 5d1e5ca..4b29476 100644
--- a/sync/test/local_sync_test_server.h
+++ b/sync/test/local_sync_test_server.h
@@ -27,10 +27,10 @@ class LocalSyncTestServer : public net::LocalTestServer {
 
   // Overriden from net::LocalTestServer.
   virtual bool AddCommandLineArguments(
-      base::CommandLine* command_line) const OVERRIDE;
-  virtual bool SetPythonPath() const OVERRIDE;
+      base::CommandLine* command_line) const override;
+  virtual bool SetPythonPath() const override;
   virtual bool GetTestServerPath(
-      base::FilePath* testserver_path) const OVERRIDE;
+      base::FilePath* testserver_path) const override;
 
   // Returns true if the path to |test_script_name| is successfully stored  in
   // |*test_script_path|. Used by the run_sync_testserver executable.
diff --git a/sync/test/mock_invalidation.h b/sync/test/mock_invalidation.h
index 808f02c..a499781 100644
--- a/sync/test/mock_invalidation.h
+++ b/sync/test/mock_invalidation.h
@@ -22,11 +22,11 @@ class MockInvalidation : public InvalidationInterface {
   virtual ~MockInvalidation();
 
   // Implementation of InvalidationInterface.
-  virtual bool IsUnknownVersion() const OVERRIDE;
-  virtual const std::string& GetPayload() const OVERRIDE;
-  virtual int64 GetVersion() const OVERRIDE;
-  virtual void Acknowledge() OVERRIDE;
-  virtual void Drop() OVERRIDE;
+  virtual bool IsUnknownVersion() const override;
+  virtual const std::string& GetPayload() const override;
+  virtual int64 GetVersion() const override;
+  virtual void Acknowledge() override;
+  virtual void Drop() override;
 
  protected:
   MockInvalidation(bool is_unknown_version,
diff --git a/sync/test/null_directory_change_delegate.h b/sync/test/null_directory_change_delegate.h
index 25ddd1b..c55b27e 100644
--- a/sync/test/null_directory_change_delegate.h
+++ b/sync/test/null_directory_change_delegate.h
@@ -19,16 +19,16 @@ class NullDirectoryChangeDelegate : public DirectoryChangeDelegate {
   virtual void HandleCalculateChangesChangeEventFromSyncApi(
       const ImmutableWriteTransactionInfo& write_transaction_info,
       BaseTransaction* trans,
-      std::vector<int64>* entries_changed) OVERRIDE;
+      std::vector<int64>* entries_changed) override;
   virtual void HandleCalculateChangesChangeEventFromSyncer(
       const ImmutableWriteTransactionInfo& write_transaction_info,
       BaseTransaction* trans,
-      std::vector<int64>* entries_changed) OVERRIDE;
+      std::vector<int64>* entries_changed) override;
   virtual ModelTypeSet HandleTransactionEndingChangeEvent(
       const ImmutableWriteTransactionInfo& write_transaction_info,
-      BaseTransaction* trans) OVERRIDE;
+      BaseTransaction* trans) override;
   virtual void HandleTransactionCompleteChangeEvent(
-      ModelTypeSet models_with_changes) OVERRIDE;
+      ModelTypeSet models_with_changes) override;
 };
 
 }  // namespace syncable
diff --git a/sync/test/sessions/mock_debug_info_getter.h b/sync/test/sessions/mock_debug_info_getter.h
index e66a962..c0f8025 100644
--- a/sync/test/sessions/mock_debug_info_getter.h
+++ b/sync/test/sessions/mock_debug_info_getter.h
@@ -22,8 +22,8 @@ class MockDebugInfoGetter : public sessions::DebugInfoGetter {
   virtual ~MockDebugInfoGetter();
 
   // DebugInfoGetter implementation.
-  virtual void GetDebugInfo(sync_pb::DebugInfo* debug_info) OVERRIDE;
-  virtual void ClearDebugInfo() OVERRIDE;
+  virtual void GetDebugInfo(sync_pb::DebugInfo* debug_info) override;
+  virtual void ClearDebugInfo() override;
 
   void AddDebugEvent();
 
diff --git a/sync/test/test_directory_backing_store.h b/sync/test/test_directory_backing_store.h
index a1064aa..d26bf8d 100644
--- a/sync/test/test_directory_backing_store.h
+++ b/sync/test/test_directory_backing_store.h
@@ -28,7 +28,7 @@ class TestDirectoryBackingStore : public DirectoryBackingStore {
   virtual DirOpenResult Load(
       Directory::MetahandlesMap* handles_map,
       JournalIndex* delete_journals,
-      Directory::KernelLoadInfo* kernel_load_info) OVERRIDE;
+      Directory::KernelLoadInfo* kernel_load_info) override;
 
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion67To68);
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion68To69);
diff --git a/sync/test/test_transaction_observer.h b/sync/test/test_transaction_observer.h
index b76870c..7b78560 100644
--- a/sync/test/test_transaction_observer.h
+++ b/sync/test/test_transaction_observer.h
@@ -23,7 +23,7 @@ class TestTransactionObserver :
   virtual ~TestTransactionObserver();
   virtual void OnTransactionWrite(
       const ImmutableWriteTransactionInfo& write_transaction_info,
-      ModelTypeSet models_with_changes) OVERRIDE;
+      ModelTypeSet models_with_changes) override;
 
   // Returns the number of transactions observed.
   //
diff --git a/sync/test/trackable_mock_invalidation.h b/sync/test/trackable_mock_invalidation.h
index 1ad3697..5687866 100644
--- a/sync/test/trackable_mock_invalidation.h
+++ b/sync/test/trackable_mock_invalidation.h
@@ -26,10 +26,10 @@ class TrackableMockInvalidation : public MockInvalidation {
 
   // Forwards notice of the acknowledgement of this invalidation to the
   // |tracker_|.
-  virtual void Acknowledge() OVERRIDE;
+  virtual void Acknowledge() override;
 
   // Forwards notice of the drop of this invalidation to the |tracker_|.
-  virtual void Drop() OVERRIDE;
+  virtual void Drop() override;
 
   // Returns the integer used to identify this object with the |tracker_|.
   int GetTrackingId();