diff options
Diffstat (limited to 'sync')
113 files changed, 589 insertions, 589 deletions
diff --git a/sync/api/fake_sync_change_processor.h b/sync/api/fake_sync_change_processor.h index 521f018..498aef8 100644 --- a/sync/api/fake_sync_change_processor.h +++ b/sync/api/fake_sync_change_processor.h @@ -20,13 +20,13 @@ 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. // @@ -34,7 +34,7 @@ class FakeSyncChangeProcessor : public SyncChangeProcessor { 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(); diff --git a/sync/api/fake_syncable_service.h b/sync/api/fake_syncable_service.h index 3d77a80..1f1ffaf 100644 --- a/sync/api/fake_syncable_service.h +++ b/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_; diff --git a/sync/api/sync_change_processor_wrapper_for_test.h b/sync/api/sync_change_processor_wrapper_for_test.h index b975da2..8521df9 100644 --- a/sync/api/sync_change_processor_wrapper_for_test.h +++ b/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_; diff --git a/sync/api/syncable_service.h b/sync/api/syncable_service.h index 9b68d29..b5861e2 100644 --- a/sync/api/syncable_service.h +++ b/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. diff --git a/sync/engine/all_status.h b/sync/engine/all_status.h index 999f2f3..ba2dd74 100644 --- a/sync/engine/all_status.h +++ b/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; diff --git a/sync/engine/directory_commit_contribution.h b/sync/engine/directory_commit_contribution.h index 0b15358..b00b86b 100644 --- a/sync/engine/directory_commit_contribution.h +++ b/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; diff --git a/sync/engine/directory_commit_contribution_unittest.cc b/sync/engine/directory_commit_contribution_unittest.cc index 7c12f50..be04c73 100644 --- a/sync/engine/directory_commit_contribution_unittest.cc +++ b/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(); } diff --git a/sync/engine/directory_commit_contributor.h b/sync/engine/directory_commit_contributor.h index a1c9104..126709a 100644 --- a/sync/engine/directory_commit_contributor.h +++ b/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_; diff --git a/sync/engine/directory_update_handler.h b/sync/engine/directory_update_handler.h index 73c18a0..2706774 100644 --- a/sync/engine/directory_update_handler.h +++ b/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; diff --git a/sync/engine/directory_update_handler_unittest.cc b/sync/engine/directory_update_handler_unittest.cc index 6052da19..e7518ff 100644 --- a/sync/engine/directory_update_handler_unittest.cc +++ b/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(); } diff --git a/sync/engine/get_updates_delegate.h b/sync/engine/get_updates_delegate.h index d61f39a..a4f999a 100644 --- a/sync/engine/get_updates_delegate.h +++ b/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); }; diff --git a/sync/engine/get_updates_processor_unittest.cc b/sync/engine/get_updates_processor_unittest.cc index a09ab4e..d7de5ee 100644 --- a/sync/engine/get_updates_processor_unittest.cc +++ b/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); } diff --git a/sync/engine/model_type_sync_worker_impl.h b/sync/engine/model_type_sync_worker_impl.h index 10aa080..1116ade 100644 --- a/sync/engine/model_type_sync_worker_impl.h +++ b/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); diff --git a/sync/engine/net/server_connection_manager.h b/sync/engine/net/server_connection_manager.h index c081f8e..f7a7575 100644 --- a/sync/engine/net/server_connection_manager.h +++ b/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()); diff --git a/sync/engine/non_blocking_type_commit_contribution.h b/sync/engine/non_blocking_type_commit_contribution.h index d732130..5633277 100644 --- a/sync/engine/non_blocking_type_commit_contribution.h +++ b/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. diff --git a/sync/engine/sync_scheduler_impl.h b/sync/engine/sync_scheduler_impl.h index 0e5a27a..b197e88 100644 --- a/sync/engine/sync_scheduler_impl.h +++ b/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; diff --git a/sync/engine/syncer_proto_util_unittest.cc b/sync/engine/syncer_proto_util_unittest.cc index 93f9088..8e73193 100644 --- a/sync/engine/syncer_proto_util_unittest.cc +++ b/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; } diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc index 9995c1a..9d3334f 100644 --- a/sync/engine/syncer_unittest.cc +++ b/sync/engine/syncer_unittest.cc @@ -110,13 +110,13 @@ class TypeDebugInfoCache : public TypeDebugInfoObserver { // TypeDebugInfoObserver implementation. virtual void OnCommitCountersUpdated( syncer::ModelType type, - const CommitCounters& counters) OVERRIDE; + const CommitCounters& counters) override; virtual void OnUpdateCountersUpdated( syncer::ModelType type, - const UpdateCounters& counters) OVERRIDE; + const UpdateCounters& counters) override; virtual void OnStatusCountersUpdated( syncer::ModelType type, - const StatusCounters& counters) OVERRIDE; + const StatusCounters& counters) override; private: std::map<ModelType, CommitCounters> commit_counters_map_; @@ -193,27 +193,27 @@ class SyncerTest : public testing::Test, } // SyncSession::Delegate implementation. - virtual void OnThrottled(const base::TimeDelta& throttle_duration) OVERRIDE { + virtual void OnThrottled(const base::TimeDelta& throttle_duration) override { FAIL() << "Should not get silenced."; } virtual void OnTypesThrottled( ModelTypeSet types, - const base::TimeDelta& throttle_duration) OVERRIDE { + const base::TimeDelta& throttle_duration) override { FAIL() << "Should not get silenced."; } - virtual bool IsCurrentlyThrottled() OVERRIDE { + virtual bool IsCurrentlyThrottled() override { return false; } virtual void OnReceivedLongPollIntervalUpdate( - const base::TimeDelta& new_interval) OVERRIDE { + const base::TimeDelta& new_interval) override { last_long_poll_interval_received_ = new_interval; } virtual void OnReceivedShortPollIntervalUpdate( - const base::TimeDelta& new_interval) OVERRIDE { + const base::TimeDelta& new_interval) override { last_short_poll_interval_received_ = new_interval; } virtual void OnReceivedCustomNudgeDelays( - const std::map<ModelType, base::TimeDelta>& delay_map) OVERRIDE { + const std::map<ModelType, base::TimeDelta>& delay_map) override { std::map<ModelType, base::TimeDelta>::const_iterator iter = delay_map.find(SESSIONS); if (iter != delay_map.end() && iter->second > base::TimeDelta()) @@ -223,13 +223,13 @@ class SyncerTest : public testing::Test, last_bookmarks_commit_delay_ = iter->second; } virtual void OnReceivedClientInvalidationHintBufferSize( - int size) OVERRIDE { + int size) override { last_client_invalidation_hint_buffer_size_ = size; } - virtual void OnReceivedGuRetryDelay(const base::TimeDelta& delay) OVERRIDE {} - virtual void OnReceivedMigrationRequest(ModelTypeSet types) OVERRIDE {} - virtual void OnProtocolEvent(const ProtocolEvent& event) OVERRIDE {} - virtual void OnSyncProtocolError(const SyncProtocolError& error) OVERRIDE {} + virtual void OnReceivedGuRetryDelay(const base::TimeDelta& delay) override {} + virtual void OnReceivedMigrationRequest(ModelTypeSet types) override {} + virtual void OnProtocolEvent(const ProtocolEvent& event) override {} + virtual void OnSyncProtocolError(const SyncProtocolError& error) override {} void GetModelSafeRoutingInfo(ModelSafeRoutingInfo* out) { // We're just testing the sync engine here, so we shunt everything to @@ -240,7 +240,7 @@ class SyncerTest : public testing::Test, } } - virtual void OnSyncCycleEvent(const SyncCycleEvent& event) OVERRIDE { + virtual void OnSyncCycleEvent(const SyncCycleEvent& event) override { DVLOG(1) << "HandleSyncEngineEvent in unittest " << event.what_happened; // we only test for entry-specific events, not status changed ones. switch (event.what_happened) { @@ -254,10 +254,10 @@ class SyncerTest : public testing::Test, saw_syncer_event_ = true; } - 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 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 {} void ResetSession() { session_.reset(SyncSession::Build(context_.get(), this)); diff --git a/sync/internal_api/attachments/attachment_downloader_impl_unittest.cc b/sync/internal_api/attachments/attachment_downloader_impl_unittest.cc index ee57a5b..551ab9a 100644 --- a/sync/internal_api/attachments/attachment_downloader_impl_unittest.cc +++ b/sync/internal_api/attachments/attachment_downloader_impl_unittest.cc @@ -44,12 +44,12 @@ class MockOAuth2TokenService : public FakeOAuth2TokenService { net::URLRequestContextGetter* getter, const std::string& client_id, const std::string& client_secret, - const ScopeSet& scopes) OVERRIDE; + const ScopeSet& scopes) override; virtual void InvalidateOAuth2Token(const std::string& account_id, const std::string& client_id, const ScopeSet& scopes, - const std::string& access_token) OVERRIDE; + const std::string& access_token) override; private: base::WeakPtr<RequestImpl> last_request_; @@ -102,8 +102,8 @@ class TokenServiceProvider // OAuth2TokenService::TokenServiceProvider implementation. virtual scoped_refptr<base::SingleThreadTaskRunner> - GetTokenServiceTaskRunner() OVERRIDE; - virtual OAuth2TokenService* GetTokenService() OVERRIDE; + GetTokenServiceTaskRunner() override; + virtual OAuth2TokenService* GetTokenService() override; private: virtual ~TokenServiceProvider(); @@ -140,8 +140,8 @@ class AttachmentDownloaderImplTest : public testing::Test { AttachmentDownloaderImplTest() : num_completed_downloads_(0) {} - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; AttachmentDownloader* downloader() { return attachment_downloader_.get(); } diff --git a/sync/internal_api/attachments/attachment_service_impl_unittest.cc b/sync/internal_api/attachments/attachment_service_impl_unittest.cc index e802e2b..1ce5cc3 100644 --- a/sync/internal_api/attachments/attachment_service_impl_unittest.cc +++ b/sync/internal_api/attachments/attachment_service_impl_unittest.cc @@ -24,19 +24,19 @@ class MockAttachmentStore : public AttachmentStore, MockAttachmentStore() {} virtual void Read(const AttachmentIdList& ids, - const ReadCallback& callback) OVERRIDE { + const ReadCallback& callback) override { read_ids.push_back(ids); read_callbacks.push_back(callback); } virtual void Write(const AttachmentList& attachments, - const WriteCallback& callback) OVERRIDE { + const WriteCallback& callback) override { write_attachments.push_back(attachments); write_callbacks.push_back(callback); } virtual void Drop(const AttachmentIdList& ids, - const DropCallback& callback) OVERRIDE { + const DropCallback& callback) override { NOTREACHED(); } @@ -100,7 +100,7 @@ class MockAttachmentDownloader MockAttachmentDownloader() {} virtual void DownloadAttachment(const AttachmentId& id, - const DownloadCallback& callback) OVERRIDE { + const DownloadCallback& callback) override { ASSERT_TRUE(download_requests.find(id) == download_requests.end()); download_requests.insert(std::make_pair(id, callback)); } @@ -134,7 +134,7 @@ class MockAttachmentUploader // AttachmentUploader implementation. virtual void UploadAttachment(const Attachment& attachment, - const UploadCallback& callback) OVERRIDE { + const UploadCallback& callback) override { const AttachmentId id = attachment.GetId(); ASSERT_TRUE(upload_requests.find(id) == upload_requests.end()); upload_requests.insert(std::make_pair(id, callback)); @@ -159,14 +159,14 @@ class AttachmentServiceImplTest : public testing::Test, protected: AttachmentServiceImplTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { network_change_notifier_.reset(net::NetworkChangeNotifier::CreateMock()); InitializeAttachmentService(make_scoped_ptr(new MockAttachmentUploader()), make_scoped_ptr(new MockAttachmentDownloader()), this); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { attachment_service_.reset(); ASSERT_FALSE(attachment_store_); ASSERT_FALSE(attachment_uploader_); @@ -175,7 +175,7 @@ class AttachmentServiceImplTest : public testing::Test, // AttachmentService::Delegate implementation. virtual void OnAttachmentUploaded( - const AttachmentId& attachment_id) OVERRIDE { + const AttachmentId& attachment_id) override { on_attachment_uploaded_list_.push_back(attachment_id); } diff --git a/sync/internal_api/attachments/attachment_service_proxy_unittest.cc b/sync/internal_api/attachments/attachment_service_proxy_unittest.cc index a946382..68bd021 100644 --- a/sync/internal_api/attachments/attachment_service_proxy_unittest.cc +++ b/sync/internal_api/attachments/attachment_service_proxy_unittest.cc @@ -34,11 +34,11 @@ class StubAttachmentService : public AttachmentService, virtual ~StubAttachmentService() {} - virtual AttachmentStore* GetStore() OVERRIDE { return NULL; } + virtual AttachmentStore* GetStore() override { return NULL; } virtual void GetOrDownloadAttachments(const AttachmentIdList& attachment_ids, const GetOrDownloadCallback& callback) - OVERRIDE { + override { CalledOnValidThread(); Increment(); scoped_ptr<AttachmentMap> attachments(new AttachmentMap()); @@ -50,7 +50,7 @@ class StubAttachmentService : public AttachmentService, } virtual void DropAttachments(const AttachmentIdList& attachment_ids, - const DropCallback& callback) OVERRIDE { + const DropCallback& callback) override { CalledOnValidThread(); Increment(); base::MessageLoop::current()->PostTask( @@ -58,7 +58,7 @@ class StubAttachmentService : public AttachmentService, } virtual void UploadAttachments( - const AttachmentIdSet& attachments_ids) OVERRIDE { + const AttachmentIdSet& attachments_ids) override { CalledOnValidThread(); Increment(); } @@ -110,7 +110,7 @@ class AttachmentServiceProxyTest : public testing::Test, } virtual void TearDown() - OVERRIDE { + override { // We must take care to call the stub's destructor on the stub_thread // because that's the thread to which its WeakPtrs are bound. if (stub) { diff --git a/sync/internal_api/attachments/attachment_uploader_impl.cc b/sync/internal_api/attachments/attachment_uploader_impl.cc index 9c7276f..343f468 100644 --- a/sync/internal_api/attachments/attachment_uploader_impl.cc +++ b/sync/internal_api/attachments/attachment_uploader_impl.cc @@ -72,14 +72,14 @@ class AttachmentUploaderImpl::UploadState : public net::URLFetcherDelegate, const Attachment& GetAttachment(); // URLFetcher implementation. - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; // OAuth2TokenService::Consumer. virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request, const std::string& access_token, - const base::Time& expiration_time) OVERRIDE; + const base::Time& expiration_time) override; virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request, - const GoogleServiceAuthError& error) OVERRIDE; + const GoogleServiceAuthError& error) override; private: typedef std::vector<UploadCallback> UploadCallbackList; diff --git a/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc b/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc index 9bfbb4e75..ba80adc 100644 --- a/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc +++ b/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc @@ -76,12 +76,12 @@ class MockOAuth2TokenService : public FakeOAuth2TokenService { net::URLRequestContextGetter* getter, const std::string& client_id, const std::string& client_secret, - const ScopeSet& scopes) OVERRIDE; + const ScopeSet& scopes) override; virtual void InvalidateOAuth2Token(const std::string& account_id, const std::string& client_id, const ScopeSet& scopes, - const std::string& access_token) OVERRIDE; + const std::string& access_token) override; private: GoogleServiceAuthError response_error_; @@ -142,8 +142,8 @@ class TokenServiceProvider // OAuth2TokenService::TokenServiceProvider implementation. virtual scoped_refptr<base::SingleThreadTaskRunner> - GetTokenServiceTaskRunner() OVERRIDE; - virtual OAuth2TokenService* GetTokenService() OVERRIDE; + GetTokenServiceTaskRunner() override; + virtual OAuth2TokenService* GetTokenService() override; private: virtual ~TokenServiceProvider(); diff --git a/sync/internal_api/attachments/fake_attachment_downloader_unittest.cc b/sync/internal_api/attachments/fake_attachment_downloader_unittest.cc index af496f5..7ab6235 100644 --- a/sync/internal_api/attachments/fake_attachment_downloader_unittest.cc +++ b/sync/internal_api/attachments/fake_attachment_downloader_unittest.cc @@ -16,9 +16,9 @@ class FakeAttachmentDownloaderTest : public testing::Test { protected: FakeAttachmentDownloaderTest() {} - virtual void SetUp() OVERRIDE {} + virtual void SetUp() override {} - virtual void TearDown() OVERRIDE {} + virtual void TearDown() override {} AttachmentDownloader* downloader() { return &attachment_downloader_; diff --git a/sync/internal_api/debug_info_event_listener.h b/sync/internal_api/debug_info_event_listener.h index 64fd830..762d570 100644 --- a/sync/internal_api/debug_info_event_listener.h +++ b/sync/internal_api/debug_info_event_listener.h @@ -41,49 +41,49 @@ class SYNC_EXPORT_PRIVATE DebugInfoEventListener // SyncManager::Observer implementation. virtual void OnSyncCycleCompleted( - const sessions::SyncSessionSnapshot& snapshot) OVERRIDE; + const sessions::SyncSessionSnapshot& snapshot) override; virtual void OnInitializationComplete( const WeakHandle<JsBackend>& js_backend, const WeakHandle<DataTypeDebugInfoListener>& debug_listener, - bool success, ModelTypeSet restored_types) OVERRIDE; + bool success, ModelTypeSet restored_types) override; virtual void OnConnectionStatusChange( - ConnectionStatus connection_status) OVERRIDE; + ConnectionStatus connection_status) override; virtual void OnActionableError( - const SyncProtocolError& sync_error) OVERRIDE; - virtual void OnMigrationRequested(ModelTypeSet types) OVERRIDE; - virtual void OnProtocolEvent(const ProtocolEvent& event) OVERRIDE; + const SyncProtocolError& sync_error) override; + virtual void OnMigrationRequested(ModelTypeSet types) override; + virtual void OnProtocolEvent(const ProtocolEvent& event) override; // SyncEncryptionHandler::Observer implementation. virtual void OnPassphraseRequired( PassphraseRequiredReason reason, - const sync_pb::EncryptedData& pending_keys) OVERRIDE; - virtual void OnPassphraseAccepted() OVERRIDE; + const sync_pb::EncryptedData& pending_keys) override; + virtual void OnPassphraseAccepted() override; virtual void OnBootstrapTokenUpdated( const std::string& bootstrap_token, - BootstrapTokenType type) OVERRIDE; + BootstrapTokenType type) override; virtual void OnEncryptedTypesChanged( ModelTypeSet encrypted_types, - bool encrypt_everything) OVERRIDE; - virtual void OnEncryptionComplete() OVERRIDE; + bool encrypt_everything) override; + virtual void OnEncryptionComplete() override; virtual void OnCryptographerStateChanged( - Cryptographer* cryptographer) OVERRIDE; + Cryptographer* cryptographer) override; virtual void OnPassphraseTypeChanged( PassphraseType type, - base::Time explicit_passphrase_time) OVERRIDE; + base::Time explicit_passphrase_time) override; // Sync manager events. void OnNudgeFromDatatype(ModelType datatype); // DebugInfoGetter implementation. - virtual void GetDebugInfo(sync_pb::DebugInfo* debug_info) OVERRIDE; + virtual void GetDebugInfo(sync_pb::DebugInfo* debug_info) override; // DebugInfoGetter implementation. - virtual void ClearDebugInfo() OVERRIDE; + virtual void ClearDebugInfo() override; // DataTypeDebugInfoListener implementation. virtual void OnDataTypeConfigureComplete( const std::vector<DataTypeConfigurationStats>& configuration_stats) - OVERRIDE; + override; // Returns a weak pointer to this object. base::WeakPtr<DataTypeDebugInfoListener> GetWeakPtr(); diff --git a/sync/internal_api/http_bridge_unittest.cc b/sync/internal_api/http_bridge_unittest.cc index 8a2c443..7a2ec92 100644 --- a/sync/internal_api/http_bridge_unittest.cc +++ b/sync/internal_api/http_bridge_unittest.cc @@ -124,7 +124,7 @@ class ShuntedHttpBridge : public HttpBridge { NetworkTimeUpdateCallback()), test_(test), never_finishes_(never_finishes) { } protected: - virtual void MakeAsynchronousPost() OVERRIDE { + virtual void MakeAsynchronousPost() override { ASSERT_TRUE(base::MessageLoop::current() == test_->GetIOThreadLoop()); if (never_finishes_) return; diff --git a/sync/internal_api/js_mutation_event_observer.h b/sync/internal_api/js_mutation_event_observer.h index 6c92646..5a007cb 100644 --- a/sync/internal_api/js_mutation_event_observer.h +++ b/sync/internal_api/js_mutation_event_observer.h @@ -46,13 +46,13 @@ class SYNC_EXPORT_PRIVATE JsMutationEventObserver virtual void OnChangesApplied( ModelType model_type, int64 write_transaction_id, - const ImmutableChangeRecordList& changes) OVERRIDE; - virtual void OnChangesComplete(ModelType model_type) OVERRIDE; + const ImmutableChangeRecordList& changes) override; + virtual void OnChangesComplete(ModelType model_type) override; // syncable::TransactionObserver implementation. virtual void OnTransactionWrite( const syncable::ImmutableWriteTransactionInfo& write_transaction_info, - ModelTypeSet models_with_changes) OVERRIDE; + ModelTypeSet models_with_changes) override; private: WeakHandle<JsEventHandler> event_handler_; diff --git a/sync/internal_api/js_sync_encryption_handler_observer.h b/sync/internal_api/js_sync_encryption_handler_observer.h index 9c74178..94a085e 100644 --- a/sync/internal_api/js_sync_encryption_handler_observer.h +++ b/sync/internal_api/js_sync_encryption_handler_observer.h @@ -35,20 +35,20 @@ class SYNC_EXPORT_PRIVATE JsSyncEncryptionHandlerObserver // SyncEncryptionHandlerObserver::Observer implementation. virtual void OnPassphraseRequired( PassphraseRequiredReason reason, - const sync_pb::EncryptedData& pending_keys) OVERRIDE; - virtual void OnPassphraseAccepted() OVERRIDE; + const sync_pb::EncryptedData& pending_keys) override; + virtual void OnPassphraseAccepted() override; virtual void OnBootstrapTokenUpdated( const std::string& bootstrap_token, - BootstrapTokenType type) OVERRIDE; + BootstrapTokenType type) override; virtual void OnEncryptedTypesChanged( ModelTypeSet encrypted_types, - bool encrypt_everything) OVERRIDE; - virtual void OnEncryptionComplete() OVERRIDE; + bool encrypt_everything) override; + virtual void OnEncryptionComplete() override; virtual void OnCryptographerStateChanged( - Cryptographer* cryptographer) OVERRIDE; + Cryptographer* cryptographer) override; virtual void OnPassphraseTypeChanged( PassphraseType type, - base::Time explicit_passphrase_time) OVERRIDE; + base::Time explicit_passphrase_time) override; private: void HandleJsEvent(const tracked_objects::Location& from_here, diff --git a/sync/internal_api/js_sync_manager_observer.h b/sync/internal_api/js_sync_manager_observer.h index 6f22005..1e694a8 100644 --- a/sync/internal_api/js_sync_manager_observer.h +++ b/sync/internal_api/js_sync_manager_observer.h @@ -33,18 +33,18 @@ class SYNC_EXPORT_PRIVATE JsSyncManagerObserver : public SyncManager::Observer { // SyncManager::Observer implementation. virtual void OnSyncCycleCompleted( - const sessions::SyncSessionSnapshot& snapshot) OVERRIDE; - virtual void OnConnectionStatusChange(ConnectionStatus status) OVERRIDE; + const sessions::SyncSessionSnapshot& snapshot) override; + virtual void OnConnectionStatusChange(ConnectionStatus status) override; virtual void OnInitializationComplete( const WeakHandle<JsBackend>& js_backend, const WeakHandle<DataTypeDebugInfoListener>& debug_info_listener, bool success, - syncer::ModelTypeSet restored_types) OVERRIDE; + syncer::ModelTypeSet restored_types) override; virtual void OnActionableError( - const SyncProtocolError& sync_protocol_error) OVERRIDE; - virtual void OnProtocolEvent(const ProtocolEvent& event) OVERRIDE; + const SyncProtocolError& sync_protocol_error) override; + virtual void OnProtocolEvent(const ProtocolEvent& event) override; virtual void OnMigrationRequested( - syncer::ModelTypeSet types) OVERRIDE; + syncer::ModelTypeSet types) override; private: void HandleJsEvent(const tracked_objects::Location& from_here, diff --git a/sync/internal_api/public/attachments/attachment_downloader_impl.h b/sync/internal_api/public/attachments/attachment_downloader_impl.h index 8b62ec3..c803b48 100644 --- a/sync/internal_api/public/attachments/attachment_downloader_impl.h +++ b/sync/internal_api/public/attachments/attachment_downloader_impl.h @@ -42,17 +42,17 @@ class AttachmentDownloaderImpl : public AttachmentDownloader, // AttachmentDownloader implementation. virtual void DownloadAttachment(const AttachmentId& attachment_id, - const DownloadCallback& callback) OVERRIDE; + const DownloadCallback& callback) override; // OAuth2TokenService::Consumer implementation. virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request, const std::string& access_token, - const base::Time& expiration_time) OVERRIDE; + const base::Time& expiration_time) override; virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request, - const GoogleServiceAuthError& error) OVERRIDE; + const GoogleServiceAuthError& error) override; // net::URLFetcherDelegate implementation. - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; private: struct DownloadState; diff --git a/sync/internal_api/public/attachments/attachment_service_impl.h b/sync/internal_api/public/attachments/attachment_service_impl.h index 2d42b26..89cc333 100644 --- a/sync/internal_api/public/attachments/attachment_service_impl.h +++ b/sync/internal_api/public/attachments/attachment_service_impl.h @@ -59,18 +59,18 @@ class SYNC_EXPORT AttachmentServiceImpl static scoped_ptr<syncer::AttachmentService> CreateForTest(); // AttachmentService implementation. - virtual AttachmentStore* GetStore() OVERRIDE; + virtual AttachmentStore* GetStore() override; virtual void GetOrDownloadAttachments( const AttachmentIdList& attachment_ids, - const GetOrDownloadCallback& callback) OVERRIDE; + const GetOrDownloadCallback& callback) override; virtual void DropAttachments(const AttachmentIdList& attachment_ids, - const DropCallback& callback) OVERRIDE; + const DropCallback& callback) override; virtual void UploadAttachments( - const AttachmentIdSet& attachment_ids) OVERRIDE; + const AttachmentIdSet& attachment_ids) override; // NetworkChangeObserver implementation. virtual void OnNetworkChanged( - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE; + net::NetworkChangeNotifier::ConnectionType type) override; // Use |timer| in the underlying TaskQueue. // diff --git a/sync/internal_api/public/attachments/attachment_service_proxy.h b/sync/internal_api/public/attachments/attachment_service_proxy.h index fa51457..e41459d 100644 --- a/sync/internal_api/public/attachments/attachment_service_proxy.h +++ b/sync/internal_api/public/attachments/attachment_service_proxy.h @@ -53,14 +53,14 @@ class SYNC_EXPORT AttachmentServiceProxy : public AttachmentService { // AttachmentService implementation. // // GetStore always returns NULL. - virtual AttachmentStore* GetStore() OVERRIDE; + virtual AttachmentStore* GetStore() override; virtual void GetOrDownloadAttachments( const AttachmentIdList& attachment_ids, - const GetOrDownloadCallback& callback) OVERRIDE; + const GetOrDownloadCallback& callback) override; virtual void DropAttachments(const AttachmentIdList& attachment_ids, - const DropCallback& callback) OVERRIDE; + const DropCallback& callback) override; virtual void UploadAttachments( - const AttachmentIdSet& attachment_ids) OVERRIDE; + const AttachmentIdSet& attachment_ids) override; protected: // Core does the work of proxying calls to AttachmentService methods from one @@ -83,14 +83,14 @@ class SYNC_EXPORT AttachmentServiceProxy : public AttachmentService { Core(const base::WeakPtr<syncer::AttachmentService>& wrapped); // AttachmentService implementation. - virtual AttachmentStore* GetStore() OVERRIDE; + virtual AttachmentStore* GetStore() override; virtual void GetOrDownloadAttachments( const AttachmentIdList& attachment_ids, - const GetOrDownloadCallback& callback) OVERRIDE; + const GetOrDownloadCallback& callback) override; virtual void DropAttachments(const AttachmentIdList& attachment_ids, - const DropCallback& callback) OVERRIDE; + const DropCallback& callback) override; virtual void UploadAttachments( - const AttachmentIdSet& attachment_ids) OVERRIDE; + const AttachmentIdSet& attachment_ids) override; protected: friend class base::RefCountedThreadSafe<Core>; diff --git a/sync/internal_api/public/attachments/attachment_uploader_impl.h b/sync/internal_api/public/attachments/attachment_uploader_impl.h index 674443f..922d8e6 100644 --- a/sync/internal_api/public/attachments/attachment_uploader_impl.h +++ b/sync/internal_api/public/attachments/attachment_uploader_impl.h @@ -45,7 +45,7 @@ class SYNC_EXPORT AttachmentUploaderImpl : public AttachmentUploader, // AttachmentUploader implementation. virtual void UploadAttachment(const Attachment& attachment, - const UploadCallback& callback) OVERRIDE; + const UploadCallback& callback) override; // Return the URL for the given |sync_service_url| and |attachment_id|. static GURL GetURLForAttachmentId(const GURL& sync_service_url, diff --git a/sync/internal_api/public/attachments/fake_attachment_downloader.h b/sync/internal_api/public/attachments/fake_attachment_downloader.h index 2b3f0a7..0b13a0e 100644 --- a/sync/internal_api/public/attachments/fake_attachment_downloader.h +++ b/sync/internal_api/public/attachments/fake_attachment_downloader.h @@ -20,7 +20,7 @@ class SYNC_EXPORT FakeAttachmentDownloader : public AttachmentDownloader, // AttachmentDownloader implementation. virtual void DownloadAttachment(const AttachmentId& attachment_id, - const DownloadCallback& callback) OVERRIDE; + const DownloadCallback& callback) override; private: DISALLOW_COPY_AND_ASSIGN(FakeAttachmentDownloader); diff --git a/sync/internal_api/public/attachments/fake_attachment_uploader.h b/sync/internal_api/public/attachments/fake_attachment_uploader.h index 4946367..16d3a51c 100644 --- a/sync/internal_api/public/attachments/fake_attachment_uploader.h +++ b/sync/internal_api/public/attachments/fake_attachment_uploader.h @@ -19,7 +19,7 @@ class SYNC_EXPORT FakeAttachmentUploader : public AttachmentUploader, // AttachmentUploader implementation. virtual void UploadAttachment(const Attachment& attachment, - const UploadCallback& callback) OVERRIDE; + const UploadCallback& callback) override; private: DISALLOW_COPY_AND_ASSIGN(FakeAttachmentUploader); diff --git a/sync/internal_api/public/base/cancelation_signal_unittest.cc b/sync/internal_api/public/base/cancelation_signal_unittest.cc index 63e4cb6..e8b375da 100644 --- a/sync/internal_api/public/base/cancelation_signal_unittest.cc +++ b/sync/internal_api/public/base/cancelation_signal_unittest.cc @@ -33,7 +33,7 @@ class BlockingTask : public CancelationObserver { // Implementation of CancelationObserver. // Wakes up the thread blocked in Run(). - virtual void OnSignalReceived() OVERRIDE; + virtual void OnSignalReceived() override; // Checks if we ever did successfully start waiting for |event_|. Be careful // with this. The flag itself is thread-unsafe, and the event that flips it @@ -150,7 +150,7 @@ bool CancelationSignalTest::VerifyTaskNotStarted() { } class FakeCancelationObserver : public CancelationObserver { - virtual void OnSignalReceived() OVERRIDE { } + virtual void OnSignalReceived() override { } }; TEST(CancelationSignalTest_SingleThread, CheckFlags) { diff --git a/sync/internal_api/public/engine/model_safe_worker.h b/sync/internal_api/public/engine/model_safe_worker.h index 9a523e9..02f3ca1 100644 --- a/sync/internal_api/public/engine/model_safe_worker.h +++ b/sync/internal_api/public/engine/model_safe_worker.h @@ -89,7 +89,7 @@ class SYNC_EXPORT ModelSafeWorker virtual ModelSafeGroup GetModelSafeGroup() = 0; // MessageLoop::DestructionObserver implementation. - virtual void WillDestroyCurrentMessageLoop() OVERRIDE; + virtual void WillDestroyCurrentMessageLoop() override; protected: friend class base::RefCountedThreadSafe<ModelSafeWorker>; diff --git a/sync/internal_api/public/engine/passive_model_worker.h b/sync/internal_api/public/engine/passive_model_worker.h index 783731b..bc95461 100644 --- a/sync/internal_api/public/engine/passive_model_worker.h +++ b/sync/internal_api/public/engine/passive_model_worker.h @@ -22,12 +22,12 @@ class SYNC_EXPORT PassiveModelWorker : public ModelSafeWorker { WorkerLoopDestructionObserver* observer); // ModelSafeWorker implementation. Called on the sync thread. - 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 ~PassiveModelWorker(); diff --git a/sync/internal_api/public/events/commit_request_event.h b/sync/internal_api/public/events/commit_request_event.h index d79b69c..e8f7a1c 100644 --- a/sync/internal_api/public/events/commit_request_event.h +++ b/sync/internal_api/public/events/commit_request_event.h @@ -27,11 +27,11 @@ class SYNC_EXPORT_PRIVATE CommitRequestEvent : public ProtocolEvent { const sync_pb::ClientToServerMessage& request); virtual ~CommitRequestEvent(); - virtual base::Time GetTimestamp() const OVERRIDE; - virtual std::string GetType() const OVERRIDE; - virtual std::string GetDetails() const OVERRIDE; - virtual scoped_ptr<base::DictionaryValue> GetProtoMessage() const OVERRIDE; - virtual scoped_ptr<ProtocolEvent> Clone() const OVERRIDE; + virtual base::Time GetTimestamp() const override; + virtual std::string GetType() const override; + virtual std::string GetDetails() const override; + virtual scoped_ptr<base::DictionaryValue> GetProtoMessage() const override; + virtual scoped_ptr<ProtocolEvent> Clone() const override; static scoped_ptr<base::DictionaryValue> ToValue( const ProtocolEvent& event); diff --git a/sync/internal_api/public/events/commit_response_event.h b/sync/internal_api/public/events/commit_response_event.h index b2330fa..0fba203 100644 --- a/sync/internal_api/public/events/commit_response_event.h +++ b/sync/internal_api/public/events/commit_response_event.h @@ -26,11 +26,11 @@ class SYNC_EXPORT_PRIVATE CommitResponseEvent : public ProtocolEvent { const sync_pb::ClientToServerResponse& response); virtual ~CommitResponseEvent(); - virtual base::Time GetTimestamp() const OVERRIDE; - virtual std::string GetType() const OVERRIDE; - virtual std::string GetDetails() const OVERRIDE; - virtual scoped_ptr<base::DictionaryValue> GetProtoMessage() const OVERRIDE; - virtual scoped_ptr<ProtocolEvent> Clone() const OVERRIDE; + virtual base::Time GetTimestamp() const override; + virtual std::string GetType() const override; + virtual std::string GetDetails() const override; + virtual scoped_ptr<base::DictionaryValue> GetProtoMessage() const override; + virtual scoped_ptr<ProtocolEvent> Clone() const override; static scoped_ptr<base::DictionaryValue> ToValue( const ProtocolEvent& event); diff --git a/sync/internal_api/public/events/configure_get_updates_request_event.h b/sync/internal_api/public/events/configure_get_updates_request_event.h index dcec982..fd98074 100644 --- a/sync/internal_api/public/events/configure_get_updates_request_event.h +++ b/sync/internal_api/public/events/configure_get_updates_request_event.h @@ -24,11 +24,11 @@ class SYNC_EXPORT_PRIVATE ConfigureGetUpdatesRequestEvent const sync_pb::ClientToServerMessage& request); virtual ~ConfigureGetUpdatesRequestEvent(); - virtual base::Time GetTimestamp() const OVERRIDE; - virtual std::string GetType() const OVERRIDE; - virtual std::string GetDetails() const OVERRIDE; - virtual scoped_ptr<base::DictionaryValue> GetProtoMessage() const OVERRIDE; - virtual scoped_ptr<ProtocolEvent> Clone() const OVERRIDE; + virtual base::Time GetTimestamp() const override; + virtual std::string GetType() const override; + virtual std::string GetDetails() const override; + virtual scoped_ptr<base::DictionaryValue> GetProtoMessage() const override; + virtual scoped_ptr<ProtocolEvent> Clone() const override; private: const base::Time timestamp_; diff --git a/sync/internal_api/public/events/get_updates_response_event.h b/sync/internal_api/public/events/get_updates_response_event.h index c47fe9b..a9764621 100644 --- a/sync/internal_api/public/events/get_updates_response_event.h +++ b/sync/internal_api/public/events/get_updates_response_event.h @@ -28,11 +28,11 @@ class SYNC_EXPORT_PRIVATE GetUpdatesResponseEvent : public ProtocolEvent { virtual ~GetUpdatesResponseEvent(); - virtual base::Time GetTimestamp() const OVERRIDE; - virtual std::string GetType() const OVERRIDE; - virtual std::string GetDetails() const OVERRIDE; - virtual scoped_ptr<base::DictionaryValue> GetProtoMessage() const OVERRIDE; - virtual scoped_ptr<ProtocolEvent> Clone() const OVERRIDE; + virtual base::Time GetTimestamp() const override; + virtual std::string GetType() const override; + virtual std::string GetDetails() const override; + virtual scoped_ptr<base::DictionaryValue> GetProtoMessage() const override; + virtual scoped_ptr<ProtocolEvent> Clone() const override; private: const base::Time timestamp_; diff --git a/sync/internal_api/public/events/normal_get_updates_request_event.h b/sync/internal_api/public/events/normal_get_updates_request_event.h index ac3877e..466b895 100644 --- a/sync/internal_api/public/events/normal_get_updates_request_event.h +++ b/sync/internal_api/public/events/normal_get_updates_request_event.h @@ -29,11 +29,11 @@ class SYNC_EXPORT_PRIVATE NormalGetUpdatesRequestEvent : public ProtocolEvent { virtual ~NormalGetUpdatesRequestEvent(); - virtual base::Time GetTimestamp() const OVERRIDE; - virtual std::string GetType() const OVERRIDE; - virtual std::string GetDetails() const OVERRIDE; - virtual scoped_ptr<base::DictionaryValue> GetProtoMessage() const OVERRIDE; - virtual scoped_ptr<ProtocolEvent> Clone() const OVERRIDE; + virtual base::Time GetTimestamp() const override; + virtual std::string GetType() const override; + virtual std::string GetDetails() const override; + virtual scoped_ptr<base::DictionaryValue> GetProtoMessage() const override; + virtual scoped_ptr<ProtocolEvent> Clone() const override; private: NormalGetUpdatesRequestEvent( diff --git a/sync/internal_api/public/events/poll_get_updates_request_event.h b/sync/internal_api/public/events/poll_get_updates_request_event.h index f039c1d..9f7f393 100644 --- a/sync/internal_api/public/events/poll_get_updates_request_event.h +++ b/sync/internal_api/public/events/poll_get_updates_request_event.h @@ -27,11 +27,11 @@ class SYNC_EXPORT_PRIVATE PollGetUpdatesRequestEvent : public ProtocolEvent { const sync_pb::ClientToServerMessage& request); virtual ~PollGetUpdatesRequestEvent(); - virtual base::Time GetTimestamp() const OVERRIDE; - virtual std::string GetType() const OVERRIDE; - virtual std::string GetDetails() const OVERRIDE; - virtual scoped_ptr<base::DictionaryValue> GetProtoMessage() const OVERRIDE; - virtual scoped_ptr<ProtocolEvent> Clone() const OVERRIDE; + virtual base::Time GetTimestamp() const override; + virtual std::string GetType() const override; + virtual std::string GetDetails() const override; + virtual scoped_ptr<base::DictionaryValue> GetProtoMessage() const override; + virtual scoped_ptr<ProtocolEvent> Clone() const override; private: const base::Time timestamp_; diff --git a/sync/internal_api/public/http_bridge.h b/sync/internal_api/public/http_bridge.h index 02dc981..801873e 100644 --- a/sync/internal_api/public/http_bridge.h +++ b/sync/internal_api/public/http_bridge.h @@ -87,9 +87,9 @@ class SYNC_EXPORT_PRIVATE HttpBridge const std::string& user_agent); // net::URLRequestContextGetter implementation. - virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE; + virtual net::URLRequestContext* GetURLRequestContext() override; virtual scoped_refptr<base::SingleThreadTaskRunner> - GetNetworkTaskRunner() const OVERRIDE; + GetNetworkTaskRunner() const override; protected: virtual ~RequestContextGetter(); @@ -110,25 +110,25 @@ class SYNC_EXPORT_PRIVATE HttpBridge const NetworkTimeUpdateCallback& network_time_update_callback); // HttpPostProvider 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; + int* response_code) override; + virtual void Abort() override; // WARNING: these response content methods are used to extract plain old data // and not null terminated strings, so you should make sure you have read // GetResponseContentLength() characters when using GetResponseContent. e.g // string r(b->GetResponseContent(), b->GetResponseContentLength()). - virtual int GetResponseContentLength() const OVERRIDE; - virtual const char* GetResponseContent() const 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; // net::URLFetcherDelegate implementation. - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; net::URLRequestContextGetter* GetRequestContextGetterForTest() const; @@ -235,12 +235,12 @@ class SYNC_EXPORT HttpBridgeFactory : public HttpPostProviderFactory, virtual ~HttpBridgeFactory(); // HttpPostProviderFactory: - virtual void Init(const std::string& user_agent) OVERRIDE; - virtual HttpPostProviderInterface* Create() OVERRIDE; - virtual void Destroy(HttpPostProviderInterface* http) OVERRIDE; + virtual void Init(const std::string& user_agent) override; + virtual HttpPostProviderInterface* Create() override; + virtual void Destroy(HttpPostProviderInterface* http) override; // CancelationObserver implementation: - virtual void OnSignalReceived() OVERRIDE; + virtual void OnSignalReceived() override; private: // Protects |request_context_getter_| and |baseline_request_context_getter_|. diff --git a/sync/internal_api/public/http_bridge_network_resources.h b/sync/internal_api/public/http_bridge_network_resources.h index 2b707ba..0ea1ced 100644 --- a/sync/internal_api/public/http_bridge_network_resources.h +++ b/sync/internal_api/public/http_bridge_network_resources.h @@ -28,7 +28,7 @@ class SYNC_EXPORT HttpBridgeNetworkResources : public NetworkResources { const scoped_refptr<net::URLRequestContextGetter>& baseline_context_getter, const NetworkTimeUpdateCallback& network_time_update_callback, - CancelationSignal* cancelation_signal) OVERRIDE; + CancelationSignal* cancelation_signal) override; }; } // namespace syncer diff --git a/sync/internal_api/public/internal_components_factory_impl.h b/sync/internal_api/public/internal_components_factory_impl.h index c727509..3fe5278 100644 --- a/sync/internal_api/public/internal_components_factory_impl.h +++ b/sync/internal_api/public/internal_components_factory_impl.h @@ -22,7 +22,7 @@ class SYNC_EXPORT InternalComponentsFactoryImpl virtual scoped_ptr<SyncScheduler> BuildScheduler( const std::string& name, sessions::SyncSessionContext* context, - syncer::CancelationSignal* cancelation_signal) OVERRIDE; + syncer::CancelationSignal* cancelation_signal) override; virtual scoped_ptr<sessions::SyncSessionContext> BuildContext( ServerConnectionManager* connection_manager, @@ -31,14 +31,14 @@ class SYNC_EXPORT InternalComponentsFactoryImpl const std::vector<SyncEngineEventListener*>& listeners, sessions::DebugInfoGetter* debug_info_getter, ModelTypeRegistry* model_type_registry, - const std::string& invalidator_client_id) OVERRIDE; + const std::string& invalidator_client_id) override; virtual scoped_ptr<syncable::DirectoryBackingStore> BuildDirectoryBackingStore(StorageOption storage, const std::string& dir_name, - const base::FilePath& backing_filepath) OVERRIDE; + const base::FilePath& backing_filepath) override; - virtual Switches GetSwitches() const OVERRIDE; + virtual Switches GetSwitches() const override; private: const Switches switches_; diff --git a/sync/internal_api/public/read_node.h b/sync/internal_api/public/read_node.h index e3d37b5..6d46eea 100644 --- a/sync/internal_api/public/read_node.h +++ b/sync/internal_api/public/read_node.h @@ -28,10 +28,10 @@ class SYNC_EXPORT ReadNode : public BaseNode { // populate the node. // BaseNode implementation. - virtual InitByLookupResult InitByIdLookup(int64 id) OVERRIDE; + virtual InitByLookupResult InitByIdLookup(int64 id) override; virtual InitByLookupResult InitByClientTagLookup( ModelType model_type, - const std::string& tag) OVERRIDE; + const std::string& tag) override; // There is always a root node, so this can't fail. The root node is // never mutable, so root lookup is only possible on a ReadNode. @@ -50,8 +50,8 @@ class SYNC_EXPORT ReadNode : public BaseNode { InitByLookupResult InitByTagLookupForBookmarks(const std::string& tag); // Implementation of BaseNode's abstract virtual accessors. - virtual const syncable::Entry* GetEntry() const OVERRIDE; - virtual const BaseTransaction* GetTransaction() const OVERRIDE; + virtual const syncable::Entry* GetEntry() const override; + virtual const BaseTransaction* GetTransaction() const override; protected: ReadNode(); diff --git a/sync/internal_api/public/read_transaction.h b/sync/internal_api/public/read_transaction.h index fe3d133..364f6be 100644 --- a/sync/internal_api/public/read_transaction.h +++ b/sync/internal_api/public/read_transaction.h @@ -36,7 +36,7 @@ class SYNC_EXPORT ReadTransaction : public BaseTransaction { virtual ~ReadTransaction(); // BaseTransaction override. - virtual syncable::BaseTransaction* GetWrappedTrans() const OVERRIDE; + virtual syncable::BaseTransaction* GetWrappedTrans() const override; // Return |transaction_version| of |type| stored in sync directory's // persisted info. diff --git a/sync/internal_api/public/test/fake_sync_manager.h b/sync/internal_api/public/test/fake_sync_manager.h index c8f9f83..8d38457 100644 --- a/sync/internal_api/public/test/fake_sync_manager.h +++ b/sync/internal_api/public/test/fake_sync_manager.h @@ -66,10 +66,10 @@ class FakeSyncManager : public SyncManager { // Posts a method to invalidate the given IDs on the sync thread. virtual void OnIncomingInvalidation( syncer::ModelType type, - scoped_ptr<InvalidationInterface> interface) OVERRIDE; + scoped_ptr<InvalidationInterface> interface) override; // Posts a method to update the invalidator state on the sync thread. - virtual void SetInvalidatorEnabled(bool invalidator_enabled) OVERRIDE; + virtual void SetInvalidatorEnabled(bool invalidator_enabled) override; // Block until the sync thread has finished processing any pending messages. void WaitForSyncThread(); @@ -77,14 +77,14 @@ class FakeSyncManager : public SyncManager { // SyncManager implementation. // Note: we treat whatever message loop this is called from as the sync // loop for purposes of callbacks. - virtual void Init(InitArgs* args) OVERRIDE; - virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE; + virtual void Init(InitArgs* args) override; + virtual ModelTypeSet InitialSyncEndedTypes() override; virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken( - ModelTypeSet types) OVERRIDE; - virtual bool PurgePartiallySyncedTypes() OVERRIDE; - virtual void UpdateCredentials(const SyncCredentials& credentials) OVERRIDE; + ModelTypeSet types) override; + virtual bool PurgePartiallySyncedTypes() override; + virtual void UpdateCredentials(const SyncCredentials& credentials) override; virtual void StartSyncingNormally( - const ModelSafeRoutingInfo& routing_info) OVERRIDE; + const ModelSafeRoutingInfo& routing_info) override; virtual void ConfigureSyncer( ConfigureReason reason, ModelTypeSet to_download, @@ -93,30 +93,30 @@ class FakeSyncManager : public SyncManager { ModelTypeSet to_unapply, const ModelSafeRoutingInfo& new_routing_info, const base::Closure& ready_task, - const base::Closure& retry_task) OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual SyncStatus GetDetailedStatus() const OVERRIDE; - virtual void SaveChanges() OVERRIDE; - virtual void ShutdownOnSyncThread(ShutdownReason reason) OVERRIDE; - virtual UserShare* GetUserShare() OVERRIDE; - virtual syncer::SyncContextProxy* GetSyncContextProxy() OVERRIDE; - virtual const std::string cache_guid() OVERRIDE; - virtual bool ReceivedExperiment(Experiments* experiments) OVERRIDE; - virtual bool HasUnsyncedItems() OVERRIDE; - virtual SyncEncryptionHandler* GetEncryptionHandler() OVERRIDE; + const base::Closure& retry_task) override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual SyncStatus GetDetailedStatus() const override; + virtual void SaveChanges() override; + virtual void ShutdownOnSyncThread(ShutdownReason reason) override; + virtual UserShare* GetUserShare() override; + virtual syncer::SyncContextProxy* GetSyncContextProxy() override; + virtual const std::string cache_guid() override; + virtual bool ReceivedExperiment(Experiments* experiments) override; + virtual bool HasUnsyncedItems() override; + virtual SyncEncryptionHandler* GetEncryptionHandler() override; virtual ScopedVector<syncer::ProtocolEvent> - GetBufferedProtocolEvents() OVERRIDE; + GetBufferedProtocolEvents() override; virtual scoped_ptr<base::ListValue> GetAllNodesForType( - syncer::ModelType type) OVERRIDE; - virtual void RefreshTypes(ModelTypeSet types) OVERRIDE; + syncer::ModelType type) override; + virtual void RefreshTypes(ModelTypeSet types) override; virtual void RegisterDirectoryTypeDebugInfoObserver( - syncer::TypeDebugInfoObserver* observer) OVERRIDE; + syncer::TypeDebugInfoObserver* observer) override; virtual void UnregisterDirectoryTypeDebugInfoObserver( - syncer::TypeDebugInfoObserver* observer) OVERRIDE; + syncer::TypeDebugInfoObserver* observer) override; virtual bool HasDirectoryTypeDebugInfoObserver( - syncer::TypeDebugInfoObserver* observer) OVERRIDE; - virtual void RequestEmitDebugInfo() OVERRIDE; + syncer::TypeDebugInfoObserver* observer) override; + virtual void RequestEmitDebugInfo() override; private: scoped_refptr<base::SequencedTaskRunner> sync_task_runner_; diff --git a/sync/internal_api/public/test/null_sync_context_proxy.h b/sync/internal_api/public/test/null_sync_context_proxy.h index 0ca080d..2694d8a 100644 --- a/sync/internal_api/public/test/null_sync_context_proxy.h +++ b/sync/internal_api/public/test/null_sync_context_proxy.h @@ -25,9 +25,9 @@ class NullSyncContextProxy : public SyncContextProxy { syncer::ModelType type, const DataTypeState& data_type_state, const UpdateResponseDataList& saved_pending_updates, - const base::WeakPtr<ModelTypeSyncProxyImpl>& type_sync_proxy) OVERRIDE; - virtual void Disconnect(syncer::ModelType type) OVERRIDE; - virtual scoped_ptr<SyncContextProxy> Clone() const OVERRIDE; + const base::WeakPtr<ModelTypeSyncProxyImpl>& type_sync_proxy) override; + virtual void Disconnect(syncer::ModelType type) override; + virtual scoped_ptr<SyncContextProxy> Clone() const override; }; } // namespace syncer diff --git a/sync/internal_api/public/test/sync_manager_factory_for_profile_sync_test.h b/sync/internal_api/public/test/sync_manager_factory_for_profile_sync_test.h index 76d6bef..d0ba111 100644 --- a/sync/internal_api/public/test/sync_manager_factory_for_profile_sync_test.h +++ b/sync/internal_api/public/test/sync_manager_factory_for_profile_sync_test.h @@ -18,7 +18,7 @@ class SyncManagerFactoryForProfileSyncTest : public syncer::SyncManagerFactory { SyncManagerFactoryForProfileSyncTest(base::Closure init_callback); virtual ~SyncManagerFactoryForProfileSyncTest(); virtual scoped_ptr<syncer::SyncManager> CreateSyncManager( - std::string name) OVERRIDE; + std::string name) override; private: base::Closure init_callback_; }; diff --git a/sync/internal_api/public/test/test_internal_components_factory.h b/sync/internal_api/public/test/test_internal_components_factory.h index 0c6b909..9b763eb 100644 --- a/sync/internal_api/public/test/test_internal_components_factory.h +++ b/sync/internal_api/public/test/test_internal_components_factory.h @@ -19,7 +19,7 @@ class TestInternalComponentsFactory : public InternalComponentsFactory { virtual scoped_ptr<SyncScheduler> BuildScheduler( const std::string& name, sessions::SyncSessionContext* context, - syncer::CancelationSignal* cancelation_signal) OVERRIDE; + syncer::CancelationSignal* cancelation_signal) override; virtual scoped_ptr<sessions::SyncSessionContext> BuildContext( ServerConnectionManager* connection_manager, @@ -28,15 +28,15 @@ class TestInternalComponentsFactory : public InternalComponentsFactory { const std::vector<SyncEngineEventListener*>& listeners, sessions::DebugInfoGetter* debug_info_getter, ModelTypeRegistry* model_type_registry, - const std::string& invalidator_client_id) OVERRIDE; + const std::string& invalidator_client_id) override; virtual scoped_ptr<syncable::DirectoryBackingStore> BuildDirectoryBackingStore( StorageOption storage, const std::string& dir_name, - const base::FilePath& backing_filepath) OVERRIDE; + const base::FilePath& backing_filepath) override; - virtual Switches GetSwitches() const OVERRIDE; + virtual Switches GetSwitches() const override; private: const Switches switches_; diff --git a/sync/internal_api/public/write_node.h b/sync/internal_api/public/write_node.h index c46e376..26940c5 100644 --- a/sync/internal_api/public/write_node.h +++ b/sync/internal_api/public/write_node.h @@ -62,10 +62,10 @@ class SYNC_EXPORT WriteNode : public BaseNode { // populate the node. // BaseNode implementation. - virtual InitByLookupResult InitByIdLookup(int64 id) OVERRIDE; + virtual InitByLookupResult InitByIdLookup(int64 id) override; virtual InitByLookupResult InitByClientTagLookup( ModelType model_type, - const std::string& tag) OVERRIDE; + const std::string& tag) override; // Create a new bookmark node with the specified parent and predecessor. Use // a NULL |predecessor| to indicate that this is to be the first child. @@ -178,9 +178,9 @@ class SYNC_EXPORT WriteNode : public BaseNode { const sync_pb::AttachmentMetadata& attachment_metadata); // Implementation of BaseNode's abstract virtual accessors. - virtual const syncable::Entry* GetEntry() const OVERRIDE; + virtual const syncable::Entry* GetEntry() const override; - virtual const BaseTransaction* GetTransaction() const OVERRIDE; + virtual const BaseTransaction* GetTransaction() const override; syncable::MutableEntry* GetMutableEntryForTest(); diff --git a/sync/internal_api/public/write_transaction.h b/sync/internal_api/public/write_transaction.h index 2dbcdaa..e100041 100644 --- a/sync/internal_api/public/write_transaction.h +++ b/sync/internal_api/public/write_transaction.h @@ -41,7 +41,7 @@ class SYNC_EXPORT WriteTransaction : public BaseTransaction { virtual ~WriteTransaction(); // Provide access to the syncable transaction from the API WriteNode. - virtual syncable::BaseTransaction* GetWrappedTrans() const OVERRIDE; + virtual syncable::BaseTransaction* GetWrappedTrans() const override; syncable::WriteTransaction* GetWrappedWriteTrans() { return transaction_; } // Set's a |type|'s local context. |refresh_status| controls whether diff --git a/sync/internal_api/sync_backup_manager.h b/sync/internal_api/sync_backup_manager.h index 9a9fdbc..2cfef48 100644 --- a/sync/internal_api/sync_backup_manager.h +++ b/sync/internal_api/sync_backup_manager.h @@ -21,23 +21,23 @@ class SYNC_EXPORT_PRIVATE SyncBackupManager : public SyncRollbackManagerBase { virtual ~SyncBackupManager(); // SyncManager implementation. - virtual void Init(InitArgs* args) OVERRIDE; - virtual void SaveChanges() OVERRIDE; - virtual SyncStatus GetDetailedStatus() const OVERRIDE; - virtual void ShutdownOnSyncThread(ShutdownReason reason) OVERRIDE; + virtual void Init(InitArgs* args) override; + virtual void SaveChanges() override; + virtual SyncStatus GetDetailedStatus() const override; + virtual void ShutdownOnSyncThread(ShutdownReason reason) override; // DirectoryChangeDelegate implementation. virtual ModelTypeSet HandleTransactionEndingChangeEvent( const syncable::ImmutableWriteTransactionInfo& write_transaction_info, - syncable::BaseTransaction* trans) OVERRIDE; + syncable::BaseTransaction* trans) override; virtual void RegisterDirectoryTypeDebugInfoObserver( - syncer::TypeDebugInfoObserver* observer) OVERRIDE; + syncer::TypeDebugInfoObserver* observer) override; virtual void UnregisterDirectoryTypeDebugInfoObserver( - syncer::TypeDebugInfoObserver* observer) OVERRIDE; + syncer::TypeDebugInfoObserver* observer) override; virtual bool HasDirectoryTypeDebugInfoObserver( - syncer::TypeDebugInfoObserver* observer) OVERRIDE; - virtual void RequestEmitDebugInfo() OVERRIDE; + syncer::TypeDebugInfoObserver* observer) override; + virtual void RequestEmitDebugInfo() override; private: // Replaces local IDs with server IDs and clear unsynced bit of modified diff --git a/sync/internal_api/sync_backup_manager_unittest.cc b/sync/internal_api/sync_backup_manager_unittest.cc index 7c6c568..fe638e3 100644 --- a/sync/internal_api/sync_backup_manager_unittest.cc +++ b/sync/internal_api/sync_backup_manager_unittest.cc @@ -45,7 +45,7 @@ class SyncBackupManagerTest : public syncer::SyncManager::Observer, bool, ModelTypeSet)); protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CHECK(temp_dir_.CreateUniqueTempDir()); } diff --git a/sync/internal_api/sync_context_proxy_impl.h b/sync/internal_api/sync_context_proxy_impl.h index 7f121a3..09ec8b3 100644 --- a/sync/internal_api/sync_context_proxy_impl.h +++ b/sync/internal_api/sync_context_proxy_impl.h @@ -41,12 +41,12 @@ class SYNC_EXPORT_PRIVATE SyncContextProxyImpl : public SyncContextProxy { syncer::ModelType type, const DataTypeState& data_type_state, const UpdateResponseDataList& pending_updates, - const base::WeakPtr<ModelTypeSyncProxyImpl>& sync_proxy_impl) OVERRIDE; + const base::WeakPtr<ModelTypeSyncProxyImpl>& sync_proxy_impl) override; // Disables syncing for the given type on the sync thread. - virtual void Disconnect(syncer::ModelType type) OVERRIDE; + virtual void Disconnect(syncer::ModelType type) override; - virtual scoped_ptr<SyncContextProxy> Clone() const OVERRIDE; + virtual scoped_ptr<SyncContextProxy> Clone() const override; private: // A SequencedTaskRunner representing the thread where the SyncContext lives. diff --git a/sync/internal_api/sync_encryption_handler_impl.h b/sync/internal_api/sync_encryption_handler_impl.h index 89621c7..6cbf74ed 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. diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h index b2c7a45..bed2d76 100644 --- a/sync/internal_api/sync_manager_impl.h +++ b/sync/internal_api/sync_manager_impl.h @@ -68,14 +68,14 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl virtual ~SyncManagerImpl(); // SyncManager implementation. - virtual void Init(InitArgs* args) OVERRIDE; - virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE; + virtual void Init(InitArgs* args) override; + virtual ModelTypeSet InitialSyncEndedTypes() override; virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken( - ModelTypeSet types) OVERRIDE; - virtual bool PurgePartiallySyncedTypes() OVERRIDE; - virtual void UpdateCredentials(const SyncCredentials& credentials) OVERRIDE; + ModelTypeSet types) override; + virtual bool PurgePartiallySyncedTypes() override; + virtual void UpdateCredentials(const SyncCredentials& credentials) override; virtual void StartSyncingNormally( - const ModelSafeRoutingInfo& routing_info) OVERRIDE; + const ModelSafeRoutingInfo& routing_info) override; virtual void ConfigureSyncer( ConfigureReason reason, ModelTypeSet to_download, @@ -84,100 +84,100 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl ModelTypeSet to_unapply, const ModelSafeRoutingInfo& new_routing_info, const base::Closure& ready_task, - const base::Closure& retry_task) OVERRIDE; - virtual void SetInvalidatorEnabled(bool invalidator_enabled) OVERRIDE; + const base::Closure& retry_task) override; + virtual void SetInvalidatorEnabled(bool invalidator_enabled) override; virtual void OnIncomingInvalidation( syncer::ModelType type, - scoped_ptr<InvalidationInterface> invalidation) OVERRIDE; - virtual void AddObserver(SyncManager::Observer* observer) OVERRIDE; - virtual void RemoveObserver(SyncManager::Observer* observer) OVERRIDE; - virtual SyncStatus GetDetailedStatus() const OVERRIDE; - virtual void SaveChanges() OVERRIDE; - virtual void ShutdownOnSyncThread(ShutdownReason reason) OVERRIDE; - virtual UserShare* GetUserShare() OVERRIDE; - virtual syncer::SyncContextProxy* GetSyncContextProxy() OVERRIDE; - virtual const std::string cache_guid() OVERRIDE; - virtual bool ReceivedExperiment(Experiments* experiments) OVERRIDE; - virtual bool HasUnsyncedItems() OVERRIDE; - virtual SyncEncryptionHandler* GetEncryptionHandler() OVERRIDE; + scoped_ptr<InvalidationInterface> invalidation) override; + virtual void AddObserver(SyncManager::Observer* observer) override; + virtual void RemoveObserver(SyncManager::Observer* observer) override; + virtual SyncStatus GetDetailedStatus() const override; + virtual void SaveChanges() override; + virtual void ShutdownOnSyncThread(ShutdownReason reason) override; + virtual UserShare* GetUserShare() override; + virtual syncer::SyncContextProxy* GetSyncContextProxy() override; + virtual const std::string cache_guid() override; + virtual bool ReceivedExperiment(Experiments* experiments) override; + virtual bool HasUnsyncedItems() override; + virtual SyncEncryptionHandler* GetEncryptionHandler() override; virtual ScopedVector<syncer::ProtocolEvent> - GetBufferedProtocolEvents() OVERRIDE; + GetBufferedProtocolEvents() override; virtual scoped_ptr<base::ListValue> GetAllNodesForType( - syncer::ModelType type) OVERRIDE; + syncer::ModelType type) override; virtual void RegisterDirectoryTypeDebugInfoObserver( - syncer::TypeDebugInfoObserver* observer) OVERRIDE; + syncer::TypeDebugInfoObserver* observer) override; virtual void UnregisterDirectoryTypeDebugInfoObserver( - syncer::TypeDebugInfoObserver* observer) OVERRIDE; + syncer::TypeDebugInfoObserver* observer) override; virtual bool HasDirectoryTypeDebugInfoObserver( - syncer::TypeDebugInfoObserver* observer) OVERRIDE; - virtual void RequestEmitDebugInfo() OVERRIDE; + syncer::TypeDebugInfoObserver* observer) override; + virtual void RequestEmitDebugInfo() override; // SyncEncryptionHandler::Observer implementation. virtual void OnPassphraseRequired( PassphraseRequiredReason reason, - const sync_pb::EncryptedData& pending_keys) OVERRIDE; - virtual void OnPassphraseAccepted() OVERRIDE; + const sync_pb::EncryptedData& pending_keys) override; + virtual void OnPassphraseAccepted() override; virtual void OnBootstrapTokenUpdated( const std::string& bootstrap_token, - BootstrapTokenType type) OVERRIDE; + BootstrapTokenType type) override; virtual void OnEncryptedTypesChanged( ModelTypeSet encrypted_types, - bool encrypt_everything) OVERRIDE; - virtual void OnEncryptionComplete() OVERRIDE; + bool encrypt_everything) override; + virtual void OnEncryptionComplete() override; virtual void OnCryptographerStateChanged( - Cryptographer* cryptographer) OVERRIDE; + Cryptographer* cryptographer) override; virtual void OnPassphraseTypeChanged( PassphraseType type, - base::Time explicit_passphrase_time) OVERRIDE; + base::Time explicit_passphrase_time) override; // 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; // ServerConnectionEventListener implementation. virtual void OnServerConnectionEvent( - const ServerConnectionEvent& event) OVERRIDE; + const ServerConnectionEvent& event) override; // JsBackend implementation. virtual void SetJsEventHandler( - const WeakHandle<JsEventHandler>& event_handler) OVERRIDE; + const WeakHandle<JsEventHandler>& event_handler) override; // DirectoryChangeDelegate implementation. // This listener is called upon completion of a syncable transaction, and // builds the list of sync-engine initiated changes that will be forwarded to // the SyncManager's Observers. virtual void HandleTransactionCompleteChangeEvent( - ModelTypeSet models_with_changes) OVERRIDE; + ModelTypeSet models_with_changes) override; virtual ModelTypeSet HandleTransactionEndingChangeEvent( const syncable::ImmutableWriteTransactionInfo& write_transaction_info, - syncable::BaseTransaction* trans) OVERRIDE; + syncable::BaseTransaction* trans) override; virtual void HandleCalculateChangesChangeEventFromSyncApi( const syncable::ImmutableWriteTransactionInfo& write_transaction_info, syncable::BaseTransaction* trans, - std::vector<int64>* entries_changed) OVERRIDE; + std::vector<int64>* entries_changed) override; virtual void HandleCalculateChangesChangeEventFromSyncer( const syncable::ImmutableWriteTransactionInfo& write_transaction_info, syncable::BaseTransaction* trans, - std::vector<int64>* entries_changed) OVERRIDE; + std::vector<int64>* entries_changed) override; // Handle explicit requests to fetch updates for the given types. - virtual void RefreshTypes(ModelTypeSet types) OVERRIDE; + virtual void RefreshTypes(ModelTypeSet types) override; // These OnYYYChanged() methods are only called by our NetworkChangeNotifier. // Called when IP address of primary interface changes. - virtual void OnIPAddressChanged() OVERRIDE; + virtual void OnIPAddressChanged() override; // Called when the connection type of the system has changed. virtual void OnConnectionTypeChanged( - net::NetworkChangeNotifier::ConnectionType) OVERRIDE; + net::NetworkChangeNotifier::ConnectionType) override; // NudgeHandler implementation. - 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; const SyncScheduler* scheduler() const; diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc index 408d739..a2829a4 100644 --- a/sync/internal_api/sync_manager_impl_unittest.cc +++ b/sync/internal_api/sync_manager_impl_unittest.cc @@ -693,36 +693,36 @@ class TestHttpPostProviderInterface : public HttpPostProviderInterface { public: virtual ~TestHttpPostProviderInterface() {} - 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 { + override { return false; } - virtual int GetResponseContentLength() const OVERRIDE { + virtual int GetResponseContentLength() const override { return 0; } - virtual const char* GetResponseContent() const OVERRIDE { + virtual const char* GetResponseContent() const override { return ""; } virtual const std::string GetResponseHeaderValue( - const std::string& name) const OVERRIDE { + const std::string& name) const override { return std::string(); } - virtual void Abort() OVERRIDE {} + virtual void Abort() override {} }; class TestHttpPostProviderFactory : public HttpPostProviderFactory { public: virtual ~TestHttpPostProviderFactory() {} - virtual void Init(const std::string& user_agent) OVERRIDE { } - virtual HttpPostProviderInterface* Create() OVERRIDE { + virtual void Init(const std::string& user_agent) override { } + virtual HttpPostProviderInterface* Create() override { return new TestHttpPostProviderInterface(); } - virtual void Destroy(HttpPostProviderInterface* http) OVERRIDE { + virtual void Destroy(HttpPostProviderInterface* http) override { delete static_cast<TestHttpPostProviderInterface*>(http); } }; @@ -877,9 +877,9 @@ class SyncManagerTest : public testing::Test, ModelType model_type, int64 model_version, const BaseTransaction* trans, - const ImmutableChangeRecordList& changes) OVERRIDE {} + const ImmutableChangeRecordList& changes) override {} - virtual void OnChangesComplete(ModelType model_type) OVERRIDE {} + virtual void OnChangesComplete(ModelType model_type) override {} // Helper methods. bool SetUpEncryption(NigoriStatus nigori_status, @@ -2411,7 +2411,7 @@ class ComponentsFactory : public TestInternalComponentsFactory { virtual scoped_ptr<SyncScheduler> BuildScheduler( const std::string& name, sessions::SyncSessionContext* context, - CancelationSignal* stop_handle) OVERRIDE { + CancelationSignal* stop_handle) override { *session_context_ = context; return scheduler_to_use_.Pass(); } @@ -2424,7 +2424,7 @@ class ComponentsFactory : public TestInternalComponentsFactory { class SyncManagerTestWithMockScheduler : public SyncManagerTest { public: SyncManagerTestWithMockScheduler() : scheduler_(NULL) {} - virtual InternalComponentsFactory* GetFactory() OVERRIDE { + virtual InternalComponentsFactory* GetFactory() override { scheduler_ = new MockSyncScheduler(); return new ComponentsFactory(GetSwitches(), scheduler_, &session_context_, &storage_used_); @@ -2815,11 +2815,11 @@ class SyncManagerChangeProcessingTest : public SyncManagerTest { ModelType model_type, int64 model_version, const BaseTransaction* trans, - const ImmutableChangeRecordList& changes) OVERRIDE { + const ImmutableChangeRecordList& changes) override { last_changes_ = changes; } - virtual void OnChangesComplete(ModelType model_type) OVERRIDE {} + virtual void OnChangesComplete(ModelType model_type) override {} const ImmutableChangeRecordList& GetRecentChangeList() { return last_changes_; @@ -3170,7 +3170,7 @@ class SyncManagerInitInvalidStorageTest : public SyncManagerTest { SyncManagerInitInvalidStorageTest() { } - virtual InternalComponentsFactory* GetFactory() OVERRIDE { + virtual InternalComponentsFactory* GetFactory() override { return new TestInternalComponentsFactory( GetSwitches(), InternalComponentsFactory::STORAGE_INVALID, &storage_used_); diff --git a/sync/internal_api/sync_rollback_manager.h b/sync/internal_api/sync_rollback_manager.h index ce40b72..4022474 100644 --- a/sync/internal_api/sync_rollback_manager.h +++ b/sync/internal_api/sync_rollback_manager.h @@ -22,9 +22,9 @@ class SYNC_EXPORT_PRIVATE SyncRollbackManager : public SyncRollbackManagerBase { virtual ~SyncRollbackManager(); // SyncManager implementation. - virtual void Init(InitArgs* args) OVERRIDE; + virtual void Init(InitArgs* args) override; virtual void StartSyncingNormally( - const ModelSafeRoutingInfo& routing_info) OVERRIDE; + const ModelSafeRoutingInfo& routing_info) override; private: // Deletes specified entries in local model. diff --git a/sync/internal_api/sync_rollback_manager_base.cc b/sync/internal_api/sync_rollback_manager_base.cc index dc314b0..2cc6d69 100644 --- a/sync/internal_api/sync_rollback_manager_base.cc +++ b/sync/internal_api/sync_rollback_manager_base.cc @@ -19,18 +19,18 @@ const char kBookmarkBarTag[] = "bookmark_bar"; const char kOtherBookmarksTag[] = "other_bookmarks"; class DummyEntryptionHandler : public syncer::SyncEncryptionHandler { - 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 {} + bool is_explicit) override {} virtual void SetDecryptionPassphrase(const std::string& passphrase) - OVERRIDE {} - virtual void EnableEncryptEverything() OVERRIDE {} - virtual bool EncryptEverythingEnabled() const OVERRIDE { + override {} + virtual void EnableEncryptEverything() override {} + virtual bool EncryptEverythingEnabled() const override { return false; } - virtual syncer::PassphraseType GetPassphraseType() const OVERRIDE { + virtual syncer::PassphraseType GetPassphraseType() const override { return syncer::KEYSTORE_PASSPHRASE; } }; diff --git a/sync/internal_api/sync_rollback_manager_base.h b/sync/internal_api/sync_rollback_manager_base.h index 63aafc4..edae0e3 100644 --- a/sync/internal_api/sync_rollback_manager_base.h +++ b/sync/internal_api/sync_rollback_manager_base.h @@ -36,13 +36,13 @@ class SYNC_EXPORT_PRIVATE SyncRollbackManagerBase : virtual ~SyncRollbackManagerBase(); // SyncManager implementation. - virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE; + virtual ModelTypeSet InitialSyncEndedTypes() override; virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken( - ModelTypeSet types) OVERRIDE; - virtual bool PurgePartiallySyncedTypes() OVERRIDE; - virtual void UpdateCredentials(const SyncCredentials& credentials) OVERRIDE; + ModelTypeSet types) override; + virtual bool PurgePartiallySyncedTypes() override; + virtual void UpdateCredentials(const SyncCredentials& credentials) override; virtual void StartSyncingNormally(const ModelSafeRoutingInfo& routing_info) - OVERRIDE; + override; virtual void ConfigureSyncer( ConfigureReason reason, ModelTypeSet to_download, @@ -51,47 +51,47 @@ class SYNC_EXPORT_PRIVATE SyncRollbackManagerBase : ModelTypeSet to_unapply, const ModelSafeRoutingInfo& new_routing_info, const base::Closure& ready_task, - const base::Closure& retry_task) OVERRIDE; - virtual void SetInvalidatorEnabled(bool invalidator_enabled) OVERRIDE; + const base::Closure& retry_task) override; + virtual void SetInvalidatorEnabled(bool invalidator_enabled) override; virtual void OnIncomingInvalidation( syncer::ModelType type, - scoped_ptr<InvalidationInterface> invalidation) OVERRIDE; - virtual void AddObserver(SyncManager::Observer* observer) OVERRIDE; - virtual void RemoveObserver(SyncManager::Observer* observer) OVERRIDE; - virtual SyncStatus GetDetailedStatus() const OVERRIDE; - virtual void SaveChanges() OVERRIDE; - virtual void ShutdownOnSyncThread(ShutdownReason reason) OVERRIDE; - virtual UserShare* GetUserShare() OVERRIDE; - virtual const std::string cache_guid() OVERRIDE; - virtual bool ReceivedExperiment(Experiments* experiments) OVERRIDE; - virtual bool HasUnsyncedItems() OVERRIDE; - virtual SyncEncryptionHandler* GetEncryptionHandler() OVERRIDE; - virtual void RefreshTypes(ModelTypeSet types) OVERRIDE; - virtual SyncContextProxy* GetSyncContextProxy() OVERRIDE; + scoped_ptr<InvalidationInterface> invalidation) override; + virtual void AddObserver(SyncManager::Observer* observer) override; + virtual void RemoveObserver(SyncManager::Observer* observer) override; + virtual SyncStatus GetDetailedStatus() const override; + virtual void SaveChanges() override; + virtual void ShutdownOnSyncThread(ShutdownReason reason) override; + virtual UserShare* GetUserShare() override; + virtual const std::string cache_guid() override; + virtual bool ReceivedExperiment(Experiments* experiments) override; + virtual bool HasUnsyncedItems() override; + virtual SyncEncryptionHandler* GetEncryptionHandler() override; + virtual void RefreshTypes(ModelTypeSet types) override; + virtual SyncContextProxy* GetSyncContextProxy() override; virtual ScopedVector<ProtocolEvent> GetBufferedProtocolEvents() - OVERRIDE; + override; virtual scoped_ptr<base::ListValue> GetAllNodesForType( - syncer::ModelType type) OVERRIDE; + syncer::ModelType type) override; // DirectoryChangeDelegate implementation. virtual void HandleTransactionCompleteChangeEvent( - ModelTypeSet models_with_changes) OVERRIDE; + ModelTypeSet models_with_changes) override; virtual ModelTypeSet HandleTransactionEndingChangeEvent( const syncable::ImmutableWriteTransactionInfo& write_transaction_info, - syncable::BaseTransaction* trans) OVERRIDE; + syncable::BaseTransaction* trans) override; virtual void HandleCalculateChangesChangeEventFromSyncApi( const syncable::ImmutableWriteTransactionInfo& write_transaction_info, syncable::BaseTransaction* trans, - std::vector<int64>* entries_changed) OVERRIDE; + std::vector<int64>* entries_changed) override; virtual void HandleCalculateChangesChangeEventFromSyncer( const syncable::ImmutableWriteTransactionInfo& write_transaction_info, syncable::BaseTransaction* trans, - std::vector<int64>* entries_changed) OVERRIDE; + std::vector<int64>* entries_changed) override; // syncable::TransactionObserver implementation. virtual void OnTransactionWrite( const syncable::ImmutableWriteTransactionInfo& write_transaction_info, - ModelTypeSet models_with_changes) OVERRIDE; + ModelTypeSet models_with_changes) override; protected: ObserverList<SyncManager::Observer>* GetObservers(); @@ -105,12 +105,12 @@ class SYNC_EXPORT_PRIVATE SyncRollbackManagerBase : ReportUnrecoverableErrorFunction report_unrecoverable_error_function); virtual void RegisterDirectoryTypeDebugInfoObserver( - syncer::TypeDebugInfoObserver* observer) OVERRIDE; + syncer::TypeDebugInfoObserver* observer) override; virtual void UnregisterDirectoryTypeDebugInfoObserver( - syncer::TypeDebugInfoObserver* observer) OVERRIDE; + syncer::TypeDebugInfoObserver* observer) override; virtual bool HasDirectoryTypeDebugInfoObserver( - syncer::TypeDebugInfoObserver* observer) OVERRIDE; - virtual void RequestEmitDebugInfo() OVERRIDE; + syncer::TypeDebugInfoObserver* observer) override; + virtual void RequestEmitDebugInfo() override; bool initialized() const { return initialized_; diff --git a/sync/internal_api/sync_rollback_manager_base_unittest.cc b/sync/internal_api/sync_rollback_manager_base_unittest.cc index 95662f6..8d9def8 100644 --- a/sync/internal_api/sync_rollback_manager_base_unittest.cc +++ b/sync/internal_api/sync_rollback_manager_base_unittest.cc @@ -21,7 +21,7 @@ void OnConfigDone(bool success) { class SyncTestRollbackManager : public SyncRollbackManagerBase { public: - virtual void Init(InitArgs* args) OVERRIDE { + virtual void Init(InitArgs* args) override { SyncRollbackManagerBase::InitInternal( args->database_location, args->internal_components_factory.get(), @@ -33,7 +33,7 @@ class SyncTestRollbackManager : public SyncRollbackManagerBase { class SyncRollbackManagerBaseTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { SyncManager::InitArgs args; args.database_location = base::FilePath(base::FilePath::kCurrentDirectory); args.service_url = GURL("https://example.com/"); diff --git a/sync/internal_api/sync_rollback_manager_unittest.cc b/sync/internal_api/sync_rollback_manager_unittest.cc index ebf9fed..c03343d 100644 --- a/sync/internal_api/sync_rollback_manager_unittest.cc +++ b/sync/internal_api/sync_rollback_manager_unittest.cc @@ -68,7 +68,7 @@ class TestChangeDelegate : public SyncManager::ChangeDelegate { class SyncRollbackManagerTest : public testing::Test, public SyncManager::Observer { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CHECK(temp_dir_.CreateUniqueTempDir()); worker_ = new FakeModelWorker(GROUP_UI); diff --git a/sync/internal_api/syncapi_server_connection_manager.h b/sync/internal_api/syncapi_server_connection_manager.h index 118d314..53481cc 100644 --- a/sync/internal_api/syncapi_server_connection_manager.h +++ b/sync/internal_api/syncapi_server_connection_manager.h @@ -30,9 +30,9 @@ class SyncAPIBridgedConnection : public ServerConnectionManager::Connection { virtual bool Init(const char* path, const std::string& auth_token, const std::string& payload, - HttpResponse* response) OVERRIDE; + HttpResponse* response) override; - virtual void Abort() OVERRIDE; + virtual void Abort() override; private: // Pointer to the factory we use for creating HttpPostProviders. We do not @@ -59,7 +59,7 @@ class SYNC_EXPORT_PRIVATE SyncAPIServerConnectionManager virtual ~SyncAPIServerConnectionManager(); // ServerConnectionManager overrides. - virtual Connection* MakeConnection() OVERRIDE; + virtual Connection* MakeConnection() override; private: FRIEND_TEST_ALL_PREFIXES(SyncAPIServerConnectionManagerTest, diff --git a/sync/internal_api/syncapi_server_connection_manager_unittest.cc b/sync/internal_api/syncapi_server_connection_manager_unittest.cc index 2cb3dff..5acc6b3 100644 --- a/sync/internal_api/syncapi_server_connection_manager_unittest.cc +++ b/sync/internal_api/syncapi_server_connection_manager_unittest.cc @@ -27,28 +27,28 @@ class BlockingHttpPost : public HttpPostProviderInterface { BlockingHttpPost() : wait_for_abort_(false, false) {} virtual ~BlockingHttpPost() {} - 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 { + override { wait_for_abort_.TimedWait(TestTimeouts::action_max_timeout()); *error_code = net::ERR_ABORTED; return false; } - virtual int GetResponseContentLength() const OVERRIDE { + virtual int GetResponseContentLength() const override { return 0; } - virtual const char* GetResponseContent() const OVERRIDE { + virtual const char* GetResponseContent() const override { return ""; } virtual const std::string GetResponseHeaderValue( - const std::string& name) const OVERRIDE { + const std::string& name) const override { return std::string(); } - virtual void Abort() OVERRIDE { + virtual void Abort() override { wait_for_abort_.Signal(); } private: @@ -58,11 +58,11 @@ class BlockingHttpPost : public HttpPostProviderInterface { class BlockingHttpPostFactory : public HttpPostProviderFactory { public: virtual ~BlockingHttpPostFactory() {} - virtual void Init(const std::string& user_agent) OVERRIDE {} - virtual HttpPostProviderInterface* Create() OVERRIDE { + virtual void Init(const std::string& user_agent) override {} + virtual HttpPostProviderInterface* Create() override { return new BlockingHttpPost(); } - virtual void Destroy(HttpPostProviderInterface* http) OVERRIDE { + virtual void Destroy(HttpPostProviderInterface* http) override { delete static_cast<BlockingHttpPost*>(http); } }; diff --git a/sync/internal_api/test/sync_manager_for_profile_sync_test.h b/sync/internal_api/test/sync_manager_for_profile_sync_test.h index 8493386..14ab883 100644 --- a/sync/internal_api/test/sync_manager_for_profile_sync_test.h +++ b/sync/internal_api/test/sync_manager_for_profile_sync_test.h @@ -21,7 +21,7 @@ class SyncManagerForProfileSyncTest SyncManagerForProfileSyncTest(std::string name, base::Closure init_callback); virtual ~SyncManagerForProfileSyncTest(); - virtual void NotifyInitializationSuccess() OVERRIDE; + virtual void NotifyInitializationSuccess() override; private: base::Closure init_callback_; diff --git a/sync/js/sync_js_controller.h b/sync/js/sync_js_controller.h index f0bb423..85c4236 100644 --- a/sync/js/sync_js_controller.h +++ b/sync/js/sync_js_controller.h @@ -36,12 +36,12 @@ class SYNC_EXPORT SyncJsController void AttachJsBackend(const WeakHandle<JsBackend>& js_backend); // JsController implementation. - virtual void AddJsEventHandler(JsEventHandler* event_handler) OVERRIDE; - virtual void RemoveJsEventHandler(JsEventHandler* event_handler) OVERRIDE; + virtual void AddJsEventHandler(JsEventHandler* event_handler) override; + virtual void RemoveJsEventHandler(JsEventHandler* event_handler) override; // JsEventHandler implementation. virtual void HandleJsEvent(const std::string& name, - const JsEventDetails& details) OVERRIDE; + const JsEventDetails& details) override; private: // Sets |js_backend_|'s event handler depending on how many diff --git a/sync/sessions/model_type_registry.cc b/sync/sessions/model_type_registry.cc index a3448464f..6c5d875 100644 --- a/sync/sessions/model_type_registry.cc +++ b/sync/sessions/model_type_registry.cc @@ -30,11 +30,11 @@ class ModelTypeSyncProxyWrapper : public 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; private: base::WeakPtr<ModelTypeSyncProxyImpl> processor_; @@ -81,7 +81,7 @@ class ModelTypeSyncWorkerWrapper : public ModelTypeSyncWorker { const scoped_refptr<base::SequencedTaskRunner>& sync_thread); virtual ~ModelTypeSyncWorkerWrapper(); - virtual void EnqueueForCommit(const CommitRequestDataList& list) OVERRIDE; + virtual void EnqueueForCommit(const CommitRequestDataList& list) override; private: base::WeakPtr<ModelTypeSyncWorkerImpl> worker_; diff --git a/sync/sessions/model_type_registry.h b/sync/sessions/model_type_registry.h index 0b4a5b4..c44a3b7 100644 --- a/sync/sessions/model_type_registry.h +++ b/sync/sessions/model_type_registry.h @@ -62,28 +62,28 @@ class SYNC_EXPORT_PRIVATE ModelTypeRegistry const DataTypeState& data_type_state, const syncer::UpdateResponseDataList& saved_pending_updates, const scoped_refptr<base::SequencedTaskRunner>& type_task_runner, - const base::WeakPtr<ModelTypeSyncProxyImpl>& proxy) OVERRIDE; + const base::WeakPtr<ModelTypeSyncProxyImpl>& proxy) override; // Disables the syncing of an off-thread type. // // Expects that the type is currently enabled. // Deletes the worker associated with the type. - virtual void DisconnectSyncWorker(syncer::ModelType type) OVERRIDE; + virtual void DisconnectSyncWorker(syncer::ModelType type) override; // Implementation of SyncEncryptionHandler::Observer. virtual void OnPassphraseRequired( PassphraseRequiredReason reason, - const sync_pb::EncryptedData& pending_keys) OVERRIDE; - virtual void OnPassphraseAccepted() OVERRIDE; + const sync_pb::EncryptedData& pending_keys) override; + virtual void OnPassphraseAccepted() override; virtual void OnBootstrapTokenUpdated(const std::string& bootstrap_token, - BootstrapTokenType type) OVERRIDE; + BootstrapTokenType type) override; virtual void OnEncryptedTypesChanged(ModelTypeSet encrypted_types, - bool encrypt_everything) OVERRIDE; - virtual void OnEncryptionComplete() OVERRIDE; + bool encrypt_everything) override; + virtual void OnEncryptionComplete() override; virtual void OnCryptographerStateChanged( - Cryptographer* cryptographer) OVERRIDE; + Cryptographer* cryptographer) override; virtual void OnPassphraseTypeChanged(PassphraseType type, - base::Time passphrase_time) OVERRIDE; + base::Time passphrase_time) override; // Gets the set of enabled types. ModelTypeSet GetEnabledTypes() const; diff --git a/sync/sessions/model_type_registry_unittest.cc b/sync/sessions/model_type_registry_unittest.cc index 96d6294..f9a041f 100644 --- a/sync/sessions/model_type_registry_unittest.cc +++ b/sync/sessions/model_type_registry_unittest.cc @@ -20,8 +20,8 @@ namespace syncer { class ModelTypeRegistryTest : public ::testing::Test { public: ModelTypeRegistryTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; ModelTypeRegistry* registry(); diff --git a/sync/syncable/deferred_on_disk_directory_backing_store.h b/sync/syncable/deferred_on_disk_directory_backing_store.h index 9e6429a..77a72ff 100644 --- a/sync/syncable/deferred_on_disk_directory_backing_store.h +++ b/sync/syncable/deferred_on_disk_directory_backing_store.h @@ -26,9 +26,9 @@ class SYNC_EXPORT_PRIVATE DeferredOnDiskDirectoryBackingStore virtual DirOpenResult Load( Directory::MetahandlesMap* handles_map, JournalIndex* delete_journals, - Directory::KernelLoadInfo* kernel_load_info) OVERRIDE; + Directory::KernelLoadInfo* kernel_load_info) override; virtual bool SaveChanges(const Directory::SaveChangesSnapshot& snapshot) - OVERRIDE; + override; private: base::FilePath backing_filepath_; diff --git a/sync/syncable/deferred_on_disk_directory_backing_store_unittest.cc b/sync/syncable/deferred_on_disk_directory_backing_store_unittest.cc index b1053b8..b58ccb7 100644 --- a/sync/syncable/deferred_on_disk_directory_backing_store_unittest.cc +++ b/sync/syncable/deferred_on_disk_directory_backing_store_unittest.cc @@ -20,12 +20,12 @@ static const base::FilePath::CharType kSyncDataFolderName[] = class DeferredOnDiskDirectoryBackingStoreTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CHECK(temp_dir_.CreateUniqueTempDir()); db_path_ = temp_dir_.path().Append(kSyncDataFolderName); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { STLDeleteValues(&handles_map_); } diff --git a/sync/syncable/directory_backing_store_unittest.cc b/sync/syncable/directory_backing_store_unittest.cc index 03f2e95..804fa98 100644 --- a/sync/syncable/directory_backing_store_unittest.cc +++ b/sync/syncable/directory_backing_store_unittest.cc @@ -3840,7 +3840,7 @@ class OnDiskDirectoryBackingStoreForTest : public OnDiskDirectoryBackingStore { bool DidFailFirstOpenAttempt(); protected: - virtual void ReportFirstTryOpenFailure() OVERRIDE; + virtual void ReportFirstTryOpenFailure() override; private: bool first_open_failed_; diff --git a/sync/syncable/directory_unittest.cc b/sync/syncable/directory_unittest.cc index 32fed39..66284cf 100644 --- a/sync/syncable/directory_unittest.cc +++ b/sync/syncable/directory_unittest.cc @@ -1534,7 +1534,7 @@ class StressTransactionsDelegate : public base::PlatformThread::Delegate { const int thread_number_; // PlatformThread::Delegate methods: - virtual void ThreadMain() OVERRIDE { + virtual void ThreadMain() override { int entry_count = 0; std::string path_name; diff --git a/sync/syncable/in_memory_directory_backing_store.h b/sync/syncable/in_memory_directory_backing_store.h index ff12996..e029c74 100644 --- a/sync/syncable/in_memory_directory_backing_store.h +++ b/sync/syncable/in_memory_directory_backing_store.h @@ -27,7 +27,7 @@ class SYNC_EXPORT_PRIVATE InMemoryDirectoryBackingStore virtual DirOpenResult Load( Directory::MetahandlesMap* handles_map, JournalIndex* delete_journals, - Directory::KernelLoadInfo* kernel_load_info) OVERRIDE; + Directory::KernelLoadInfo* kernel_load_info) override; void request_consistent_cache_guid() { consistent_cache_guid_requested_ = true; diff --git a/sync/syncable/invalid_directory_backing_store.h b/sync/syncable/invalid_directory_backing_store.h index 4834448..dbd6500 100644 --- a/sync/syncable/invalid_directory_backing_store.h +++ b/sync/syncable/invalid_directory_backing_store.h @@ -20,7 +20,7 @@ class SYNC_EXPORT_PRIVATE InvalidDirectoryBackingStore virtual DirOpenResult Load( Directory::MetahandlesMap* handles_map, JournalIndex* delete_journals, - Directory::KernelLoadInfo* kernel_load_info) OVERRIDE; + Directory::KernelLoadInfo* kernel_load_info) override; private: DISALLOW_COPY_AND_ASSIGN(InvalidDirectoryBackingStore); }; diff --git a/sync/syncable/on_disk_directory_backing_store.h b/sync/syncable/on_disk_directory_backing_store.h index 5930bd2..3a0649d 100644 --- a/sync/syncable/on_disk_directory_backing_store.h +++ b/sync/syncable/on_disk_directory_backing_store.h @@ -23,7 +23,7 @@ class SYNC_EXPORT_PRIVATE OnDiskDirectoryBackingStore virtual DirOpenResult Load( Directory::MetahandlesMap* handles_map, JournalIndex* delete_journals, - Directory::KernelLoadInfo* kernel_load_info) OVERRIDE; + Directory::KernelLoadInfo* kernel_load_info) override; // A helper function that will make one attempt to load the directory. // Unlike Load(), it does not attempt to recover from failure. diff --git a/sync/syncable/syncable_model_neutral_write_transaction.h b/sync/syncable/syncable_model_neutral_write_transaction.h index f96725e..1ec3e93 100644 --- a/sync/syncable/syncable_model_neutral_write_transaction.h +++ b/sync/syncable/syncable_model_neutral_write_transaction.h @@ -30,7 +30,7 @@ class SYNC_EXPORT_PRIVATE ModelNeutralWriteTransaction Directory* directory); virtual ~ModelNeutralWriteTransaction(); - virtual void TrackChangesTo(const EntryKernel* entry) OVERRIDE; + virtual void TrackChangesTo(const EntryKernel* entry) override; private: MetahandleSet modified_handles_; diff --git a/sync/syncable/syncable_unittest.cc b/sync/syncable/syncable_unittest.cc index 24d134d..7115aa4 100644 --- a/sync/syncable/syncable_unittest.cc +++ b/sync/syncable/syncable_unittest.cc @@ -53,7 +53,7 @@ class TestBackingStore : public OnDiskDirectoryBackingStore { virtual ~TestBackingStore(); virtual bool SaveChanges(const Directory::SaveChangesSnapshot& snapshot) - OVERRIDE; + override; void StartFailingSaveChanges() { fail_save_changes_ = true; diff --git a/sync/syncable/syncable_write_transaction.h b/sync/syncable/syncable_write_transaction.h index 4d16aca..f3b7e49 100644 --- a/sync/syncable/syncable_write_transaction.h +++ b/sync/syncable/syncable_write_transaction.h @@ -30,7 +30,7 @@ class SYNC_EXPORT WriteTransaction : public BaseWriteTransaction { virtual ~WriteTransaction(); - virtual void TrackChangesTo(const EntryKernel* entry) OVERRIDE; + virtual void TrackChangesTo(const EntryKernel* entry) override; protected: // Overridden by tests. 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(); diff --git a/sync/tools/null_invalidation_state_tracker.h b/sync/tools/null_invalidation_state_tracker.h index 140ee3f..5f61426 100644 --- a/sync/tools/null_invalidation_state_tracker.h +++ b/sync/tools/null_invalidation_state_tracker.h @@ -18,17 +18,17 @@ class NullInvalidationStateTracker NullInvalidationStateTracker(); virtual ~NullInvalidationStateTracker(); - virtual void ClearAndSetNewClientId(const std::string& data) OVERRIDE; - virtual std::string GetInvalidatorClientId() const OVERRIDE; + virtual void ClearAndSetNewClientId(const std::string& data) override; + virtual std::string GetInvalidatorClientId() const override; - virtual std::string GetBootstrapData() const OVERRIDE; - virtual void SetBootstrapData(const std::string& data) OVERRIDE; + virtual std::string GetBootstrapData() const override; + virtual void SetBootstrapData(const std::string& data) override; virtual void SetSavedInvalidations( - const UnackedInvalidationsMap& states) OVERRIDE; - virtual UnackedInvalidationsMap GetSavedInvalidations() const OVERRIDE; + const UnackedInvalidationsMap& states) override; + virtual UnackedInvalidationsMap GetSavedInvalidations() const override; - virtual void Clear() OVERRIDE; + virtual void Clear() override; }; } // namespace syncer diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index e936f71..26a6c71 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -88,7 +88,7 @@ class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter { const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) : TestURLRequestContextGetter(io_task_runner) {} - virtual net::TestURLRequestContext* GetURLRequestContext() OVERRIDE { + virtual net::TestURLRequestContext* GetURLRequestContext() override { // Construct |context_| lazily so it gets constructed on the right // thread (the IO thread). if (!context_) @@ -108,13 +108,13 @@ class NullEncryptor : public Encryptor { virtual ~NullEncryptor() {} virtual bool EncryptString(const std::string& plaintext, - std::string* ciphertext) OVERRIDE { + std::string* ciphertext) override { *ciphertext = plaintext; return true; } virtual bool DecryptString(const std::string& ciphertext, - std::string* plaintext) OVERRIDE { + std::string* plaintext) override { *plaintext = ciphertext; return true; } @@ -134,7 +134,7 @@ class LoggingChangeDelegate : public SyncManager::ChangeDelegate { ModelType model_type, int64 model_version, const BaseTransaction* trans, - const ImmutableChangeRecordList& changes) OVERRIDE { + const ImmutableChangeRecordList& changes) override { LOG(INFO) << "Changes applied for " << ModelTypeToString(model_type); size_t i = 1; @@ -154,7 +154,7 @@ class LoggingChangeDelegate : public SyncManager::ChangeDelegate { } } - virtual void OnChangesComplete(ModelType model_type) OVERRIDE { + virtual void OnChangesComplete(ModelType model_type) override { LOG(INFO) << "Changes complete for " << ModelTypeToString(model_type); } @@ -166,7 +166,7 @@ class LoggingUnrecoverableErrorHandler virtual ~LoggingUnrecoverableErrorHandler() {} virtual void OnUnrecoverableError(const tracked_objects::Location& from_here, - const std::string& message) OVERRIDE { + const std::string& message) override { if (LOG_IS_ON(ERROR)) { logging::LogMessage(from_here.file_name(), from_here.line_number(), logging::LOG_ERROR).stream() @@ -183,7 +183,7 @@ class LoggingJsEventHandler virtual void HandleJsEvent( const std::string& name, - const JsEventDetails& details) OVERRIDE { + const JsEventDetails& details) override { VLOG(1) << name << ": " << details.ToString(); } }; @@ -194,23 +194,23 @@ class InvalidationAdapter : public syncer::InvalidationInterface { : invalidation_(invalidation) {} virtual ~InvalidationAdapter() {} - virtual bool IsUnknownVersion() const OVERRIDE { + virtual bool IsUnknownVersion() const override { return invalidation_.is_unknown_version(); } - virtual const std::string& GetPayload() const OVERRIDE { + virtual const std::string& GetPayload() const override { return invalidation_.payload(); } - virtual int64 GetVersion() const OVERRIDE { + virtual int64 GetVersion() const override { return invalidation_.version(); } - virtual void Acknowledge() OVERRIDE { + virtual void Acknowledge() override { invalidation_.Acknowledge(); } - virtual void Drop() OVERRIDE { + virtual void Drop() override { invalidation_.Drop(); } @@ -223,12 +223,12 @@ class InvalidatorShim : public InvalidationHandler { explicit InvalidatorShim(SyncManager* sync_manager) : sync_manager_(sync_manager) {} - virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE { + virtual void OnInvalidatorStateChange(InvalidatorState state) override { sync_manager_->SetInvalidatorEnabled(state == INVALIDATIONS_ENABLED); } virtual void OnIncomingInvalidation( - const ObjectIdInvalidationMap& invalidation_map) OVERRIDE { + const ObjectIdInvalidationMap& invalidation_map) override { syncer::ObjectIdSet ids = invalidation_map.GetObjectIds(); for (syncer::ObjectIdSet::const_iterator ids_it = ids.begin(); ids_it != ids.end(); @@ -252,7 +252,7 @@ class InvalidatorShim : public InvalidationHandler { } } - virtual std::string GetOwnerName() const OVERRIDE { + virtual std::string GetOwnerName() const override { return "InvalidatorShim"; } diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc index adbf4af..50040c0 100644 --- a/sync/tools/sync_listen_notifications.cc +++ b/sync/tools/sync_listen_notifications.cc @@ -54,13 +54,13 @@ class NotificationPrinter : public InvalidationHandler { NotificationPrinter() {} virtual ~NotificationPrinter() {} - virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE { + virtual void OnInvalidatorStateChange(InvalidatorState state) override { LOG(INFO) << "Invalidator state changed to " << InvalidatorStateToString(state); } virtual void OnIncomingInvalidation( - const ObjectIdInvalidationMap& invalidation_map) OVERRIDE { + const ObjectIdInvalidationMap& invalidation_map) override { ObjectIdSet ids = invalidation_map.GetObjectIds(); for (ObjectIdSet::const_iterator it = ids.begin(); it != ids.end(); ++it) { LOG(INFO) << "Remote invalidation: " @@ -68,7 +68,7 @@ class NotificationPrinter : public InvalidationHandler { } } - virtual std::string GetOwnerName() const OVERRIDE { + virtual std::string GetOwnerName() const override { return "NotificationPrinter"; } @@ -96,7 +96,7 @@ class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter { const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) : TestURLRequestContextGetter(io_task_runner) {} - virtual net::TestURLRequestContext* GetURLRequestContext() OVERRIDE { + virtual net::TestURLRequestContext* GetURLRequestContext() override { // Construct |context_| lazily so it gets constructed on the right // thread (the IO thread). if (!context_) diff --git a/sync/util/test_unrecoverable_error_handler.h b/sync/util/test_unrecoverable_error_handler.h index d36724e..c880ffd 100644 --- a/sync/util/test_unrecoverable_error_handler.h +++ b/sync/util/test_unrecoverable_error_handler.h @@ -18,7 +18,7 @@ class TestUnrecoverableErrorHandler : public UnrecoverableErrorHandler { virtual ~TestUnrecoverableErrorHandler(); virtual void OnUnrecoverableError(const tracked_objects::Location& from_here, - const std::string& message) OVERRIDE; + const std::string& message) override; }; } // namespace syncer |