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}

sync/api/fake_sync_change_processor.h

@@ -20,21 +20,21 @@ class FakeSyncChangeProcessor : public SyncChangeProcessor {
   // cleared.
   virtual syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
-      const syncer::SyncChangeList& change_list) OVERRIDE;
+      const syncer::SyncChangeList& change_list) override;
 
   // SyncChangeProcessor implementation.
   //
   // Returns data().
   virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type)
-      const OVERRIDE;
+      const override;
 
   // SyncChangeProcessor implementation.
   //
   // Updates context().
   virtual syncer::SyncError UpdateDataTypeContext(
       ModelType type,
       ContextRefreshStatus refresh_status,
-      const std::string& context) OVERRIDE;
+      const std::string& context) override;
 
   virtual const syncer::SyncChangeList& changes() const;
   virtual syncer::SyncChangeList& changes();

sync/api/fake_syncable_service.h

@@ -31,12 +31,12 @@ class FakeSyncableService : public SyncableService {
       ModelType type,
       const SyncDataList& initial_sync_data,
       scoped_ptr<SyncChangeProcessor> sync_processor,
-      scoped_ptr<SyncErrorFactory> sync_error_factory) OVERRIDE;
-  virtual void StopSyncing(ModelType type) OVERRIDE;
-  virtual SyncDataList GetAllSyncData(ModelType type) const OVERRIDE;
+      scoped_ptr<SyncErrorFactory> sync_error_factory) override;
+  virtual void StopSyncing(ModelType type) override;
+  virtual SyncDataList GetAllSyncData(ModelType type) const override;
   virtual SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
-      const SyncChangeList& change_list) OVERRIDE;
+      const SyncChangeList& change_list) override;
 
  private:
   scoped_ptr<SyncChangeProcessor> sync_processor_;

sync/api/sync_change_processor_wrapper_for_test.h

@@ -23,9 +23,9 @@ class SyncChangeProcessorWrapperForTest : public SyncChangeProcessor {
   // SyncChangeProcessor implementation.
   virtual syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
-      const syncer::SyncChangeList& change_list) OVERRIDE;
+      const syncer::SyncChangeList& change_list) override;
   virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type)
-      const OVERRIDE;
+      const override;
 
  private:
   syncer::SyncChangeProcessor* const wrapped_;

sync/api/syncable_service.h

@@ -64,7 +64,7 @@ class SYNC_EXPORT SyncableService
   //          otherwise.
   virtual SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
-      const SyncChangeList& change_list) OVERRIDE = 0;
+      const SyncChangeList& change_list) override = 0;
 
   // Returns AttachmentStore used by datatype. Attachment store is used by sync
   // when uploading or downloading attachments.

sync/engine/all_status.h

@@ -41,12 +41,12 @@ class AllStatus : public SyncEngineEventListener {
   virtual ~AllStatus();
 
   // SyncEngineEventListener implementation.
-  virtual void OnSyncCycleEvent(const SyncCycleEvent& event) OVERRIDE;
-  virtual void OnActionableError(const SyncProtocolError& error) OVERRIDE;
-  virtual void OnRetryTimeChanged(base::Time retry_time) OVERRIDE;
-  virtual void OnThrottledTypesChanged(ModelTypeSet throttled_types) OVERRIDE;
-  virtual void OnMigrationRequested(ModelTypeSet types) OVERRIDE;
-  virtual void OnProtocolEvent(const ProtocolEvent& event) OVERRIDE;
+  virtual void OnSyncCycleEvent(const SyncCycleEvent& event) override;
+  virtual void OnActionableError(const SyncProtocolError& error) override;
+  virtual void OnRetryTimeChanged(base::Time retry_time) override;
+  virtual void OnThrottledTypesChanged(ModelTypeSet throttled_types) override;
+  virtual void OnMigrationRequested(ModelTypeSet types) override;
+  virtual void OnProtocolEvent(const ProtocolEvent& event) override;
 
   SyncStatus status() const;
 

sync/engine/directory_commit_contribution.h

@@ -56,7 +56,7 @@ class SYNC_EXPORT_PRIVATE DirectoryCommitContribution
   // This function is not const.  It will update some state in this contribution
   // that will be used when processing the associated commit response.  This
   // function should not be called more than once.
-  virtual void AddToCommitMessage(sync_pb::ClientToServerMessage* msg) OVERRIDE;
+  virtual void AddToCommitMessage(sync_pb::ClientToServerMessage* msg) override;
 
   // Updates this contribution's contents in accordance with the provided
   // |response|.
@@ -66,14 +66,14 @@ class SYNC_EXPORT_PRIVATE DirectoryCommitContribution
   // This function should not be called more than once.
   virtual SyncerError ProcessCommitResponse(
       const sync_pb::ClientToServerResponse& response,
-      sessions::StatusController* status) OVERRIDE;
+      sessions::StatusController* status) override;
 
   // Cleans up any temporary state associated with the commit.  Must be called
   // before destruction.
-  virtual void CleanUp() OVERRIDE;
+  virtual void CleanUp() override;
 
   // Returns the number of entries included in this contribution.
-  virtual size_t GetNumEntries() const OVERRIDE;
+  virtual size_t GetNumEntries() const override;
 
  private:
   class DirectoryCommitContributionTest;

sync/engine/directory_commit_contribution_unittest.cc

@@ -20,7 +20,7 @@ namespace syncer {
 
 class DirectoryCommitContributionTest : public ::testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     dir_maker_.SetUp();
 
     syncable::WriteTransaction trans(FROM_HERE, syncable::UNITTEST, dir());
@@ -30,7 +30,7 @@ class DirectoryCommitContributionTest : public ::testing::Test {
     CreateTypeRoot(&trans, dir(), BOOKMARKS);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     dir_maker_.TearDown();
   }
 

sync/engine/directory_commit_contributor.h

@@ -35,7 +35,7 @@ class DirectoryCommitContributor : public CommitContributor {
   virtual ~DirectoryCommitContributor();
 
   virtual scoped_ptr<CommitContribution> GetContribution(
-      size_t max_entries) OVERRIDE;
+      size_t max_entries) override;
 
  private:
   syncable::Directory* dir_;

sync/engine/directory_update_handler.h

@@ -51,16 +51,16 @@ class SYNC_EXPORT_PRIVATE DirectoryUpdateHandler : 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;
 
  private:
   friend class DirectoryUpdateHandlerApplyUpdateTest;

sync/engine/directory_update_handler_unittest.cc

@@ -46,11 +46,11 @@ class DirectoryUpdateHandlerProcessUpdateTest : public ::testing::Test {
 
   virtual ~DirectoryUpdateHandlerProcessUpdateTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     dir_maker_.SetUp();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     dir_maker_.TearDown();
   }
 
@@ -486,7 +486,7 @@ class DirectoryUpdateHandlerApplyUpdateTest : public ::testing::Test {
         articles_emitter_(ARTICLES, &type_observers_),
         update_handler_map_deleter_(&update_handler_map_) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     dir_maker_.SetUp();
     entry_factory_.reset(new TestEntryFactory(directory()));
 
@@ -506,7 +506,7 @@ class DirectoryUpdateHandlerApplyUpdateTest : public ::testing::Test {
             directory(), ARTICLES, ui_worker_, &articles_emitter_)));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     dir_maker_.TearDown();
   }
 

sync/engine/get_updates_delegate.h

@@ -47,17 +47,17 @@ class SYNC_EXPORT_PRIVATE NormalGetUpdatesDelegate : public GetUpdatesDelegate {
 
   // Uses the member NudgeTracker to populate some fields of this GU message.
   virtual void HelpPopulateGuMessage(
-      sync_pb::GetUpdatesMessage* get_updates) const OVERRIDE;
+      sync_pb::GetUpdatesMessage* get_updates) const override;
 
   // Applies pending updates on the appropriate data type threads.
   virtual void ApplyUpdates(
       ModelTypeSet gu_types,
       sessions::StatusController* status,
-      UpdateHandlerMap* update_handler_map) const OVERRIDE;
+      UpdateHandlerMap* update_handler_map) const override;
 
   virtual scoped_ptr<ProtocolEvent> GetNetworkRequestEvent(
       base::Time timestamp,
-      const sync_pb::ClientToServerMessage& request) const OVERRIDE;
+      const sync_pb::ClientToServerMessage& request) const override;
  private:
   DISALLOW_COPY_AND_ASSIGN(NormalGetUpdatesDelegate);
 
@@ -74,7 +74,7 @@ class SYNC_EXPORT_PRIVATE ConfigureGetUpdatesDelegate
 
   // Sets the 'source' and 'origin' fields for this request.
   virtual void HelpPopulateGuMessage(
-      sync_pb::GetUpdatesMessage* get_updates) const OVERRIDE;
+      sync_pb::GetUpdatesMessage* get_updates) const override;
 
   // Applies updates passively (ie. on the sync thread).
   //
@@ -83,11 +83,11 @@ class SYNC_EXPORT_PRIVATE ConfigureGetUpdatesDelegate
   virtual void ApplyUpdates(
       ModelTypeSet gu_types,
       sessions::StatusController* status,
-      UpdateHandlerMap* update_handler_map) const OVERRIDE;
+      UpdateHandlerMap* update_handler_map) const override;
 
   virtual scoped_ptr<ProtocolEvent> GetNetworkRequestEvent(
       base::Time timestamp,
-      const sync_pb::ClientToServerMessage& request) const OVERRIDE;
+      const sync_pb::ClientToServerMessage& request) const override;
  private:
   DISALLOW_COPY_AND_ASSIGN(ConfigureGetUpdatesDelegate);
 
@@ -105,17 +105,17 @@ class SYNC_EXPORT_PRIVATE PollGetUpdatesDelegate : public GetUpdatesDelegate {
 
   // Sets the 'source' and 'origin' to indicate this is a poll request.
   virtual void HelpPopulateGuMessage(
-      sync_pb::GetUpdatesMessage* get_updates) const OVERRIDE;
+      sync_pb::GetUpdatesMessage* get_updates) const override;
 
   // Applies updates on the appropriate data type thread.
   virtual void ApplyUpdates(
       ModelTypeSet gu_types,
       sessions::StatusController* status,
-      UpdateHandlerMap* update_handler_map) const OVERRIDE;
+      UpdateHandlerMap* update_handler_map) const override;
 
   virtual scoped_ptr<ProtocolEvent> GetNetworkRequestEvent(
       base::Time timestamp,
-      const sync_pb::ClientToServerMessage& request) const OVERRIDE;
+      const sync_pb::ClientToServerMessage& request) const override;
  private:
   DISALLOW_COPY_AND_ASSIGN(PollGetUpdatesDelegate);
 };

sync/engine/get_updates_processor_unittest.cc

@@ -389,7 +389,7 @@ class GetUpdatesProcessorApplyUpdatesTest : public GetUpdatesProcessorTest {
   GetUpdatesProcessorApplyUpdatesTest() {}
   virtual ~GetUpdatesProcessorApplyUpdatesTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     bookmarks_handler_ = AddUpdateHandler(BOOKMARKS);
     autofill_handler_ = AddUpdateHandler(AUTOFILL);
   }

sync/engine/model_type_sync_worker_impl.h

@@ -68,24 +68,24 @@ class SYNC_EXPORT ModelTypeSyncWorkerImpl : 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;
+      sync_pb::DataTypeContext* context) const 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;
 
   // ModelTypeSyncWorker implementation.
   virtual void EnqueueForCommit(
-      const CommitRequestDataList& request_list) OVERRIDE;
+      const CommitRequestDataList& request_list) override;
 
   // CommitContributor implementation.
   virtual scoped_ptr<CommitContribution> GetContribution(
-      size_t max_entries) OVERRIDE;
+      size_t max_entries) override;
 
   // Callback for when our contribution gets a response.
   void OnCommitResponse(const CommitResponseDataList& response_list);

sync/engine/net/server_connection_manager.h

@@ -217,7 +217,7 @@ class SYNC_EXPORT_PRIVATE ServerConnectionManager : public CancelationObserver {
   // We expect this to get called on a different thread than the valid
   // ThreadChecker thread, as we want to kill any pending http traffic without
   // having to wait for the request to complete.
-  virtual void OnSignalReceived() OVERRIDE FINAL;
+  virtual void OnSignalReceived() override final;
 
   void set_client_id(const std::string& client_id) {
     DCHECK(thread_checker_.CalledOnValidThread());

sync/engine/non_blocking_type_commit_contribution.h

@@ -29,12 +29,12 @@ class NonBlockingTypeCommitContribution : public CommitContribution {
   virtual ~NonBlockingTypeCommitContribution();
 
   // Implementation of CommitContribution
-  virtual void AddToCommitMessage(sync_pb::ClientToServerMessage* msg) OVERRIDE;
+  virtual void AddToCommitMessage(sync_pb::ClientToServerMessage* msg) override;
   virtual SyncerError ProcessCommitResponse(
       const sync_pb::ClientToServerResponse& response,
-      sessions::StatusController* status) OVERRIDE;
-  virtual void CleanUp() OVERRIDE;
-  virtual size_t GetNumEntries() const OVERRIDE;
+      sessions::StatusController* status) override;
+  virtual void CleanUp() override;
+  virtual size_t GetNumEntries() const override;
 
  private:
   // A non-owned pointer back to the object that created this contribution.

sync/engine/sync_scheduler_impl.h

@@ -51,43 +51,43 @@ class SYNC_EXPORT_PRIVATE SyncSchedulerImpl
   // Calls Stop().
   virtual ~SyncSchedulerImpl();
 
-  virtual void Start(Mode mode) OVERRIDE;
+  virtual void Start(Mode mode) override;
   virtual void ScheduleConfiguration(
-      const ConfigurationParams& params) OVERRIDE;
-  virtual void Stop() OVERRIDE;
+      const ConfigurationParams& params) 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> invalidation,
-      const tracked_objects::Location& nudge_location) OVERRIDE;
-  virtual void ScheduleInitialSyncNudge(syncer::ModelType model_type) OVERRIDE;
-  virtual void SetNotificationsEnabled(bool notifications_enabled) OVERRIDE;
+      const tracked_objects::Location& nudge_location) 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;
+  virtual void OnThrottled(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& sync_protocol_error) OVERRIDE;
-  virtual void OnReceivedGuRetryDelay(const base::TimeDelta& delay) OVERRIDE;
-  virtual void OnReceivedMigrationRequest(syncer::ModelTypeSet types) OVERRIDE;
+      const SyncProtocolError& sync_protocol_error) override;
+  virtual void OnReceivedGuRetryDelay(const base::TimeDelta& delay) override;
+  virtual void OnReceivedMigrationRequest(syncer::ModelTypeSet types) override;
 
   // Returns true if the client is currently in exponential backoff.
   bool IsBackingOff() const;

sync/engine/syncer_proto_util_unittest.cc

@@ -260,7 +260,7 @@ class DummyConnectionManager : public ServerConnectionManager {
   virtual ~DummyConnectionManager() {}
   virtual bool PostBufferWithCachedAuth(
       PostBufferParams* params,
-      ScopedServerStatusWatcher* watcher) OVERRIDE {
+      ScopedServerStatusWatcher* watcher) override {
     if (send_error_) {
       return false;
     }