diff options
70 files changed, 130 insertions, 145 deletions
diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.h b/chrome/browser/sync/abstract_profile_sync_service_test.h index 11e31d6..78c63f8 100644 --- a/chrome/browser/sync/abstract_profile_sync_service_test.h +++ b/chrome/browser/sync/abstract_profile_sync_service_test.h @@ -39,11 +39,11 @@ class ProfileSyncServiceTestHelper { class AbstractProfileSyncServiceTest : public testing::Test { public: AbstractProfileSyncServiceTest(); - virtual ~AbstractProfileSyncServiceTest(); + ~AbstractProfileSyncServiceTest() override; - virtual void SetUp() override; + void SetUp() override; - virtual void TearDown() override; + void TearDown() override; bool CreateRoot(syncer::ModelType model_type); diff --git a/chrome/browser/sync/backup_rollback_controller_unittest.cc b/chrome/browser/sync/backup_rollback_controller_unittest.cc index 0e1ecc8..483221c 100644 --- a/chrome/browser/sync/backup_rollback_controller_unittest.cc +++ b/chrome/browser/sync/backup_rollback_controller_unittest.cc @@ -51,7 +51,7 @@ class BackupRollbackControllerTest : public testing::Test { } protected: - virtual void SetUp() override { + void SetUp() override { backup_started_ = false; rollback_started_ = false; diff --git a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc index ffa7545..ada1476 100644 --- a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc @@ -138,9 +138,9 @@ class SyncAutofillDataTypeControllerTest : public testing::Test { last_start_result_(sync_driver::DataTypeController::OK), weak_ptr_factory_(this) {} - virtual ~SyncAutofillDataTypeControllerTest() {} + ~SyncAutofillDataTypeControllerTest() override {} - virtual void SetUp() { + void SetUp() override { EXPECT_CALL(profile_sync_factory_, GetSyncableServiceForType(_)). WillRepeatedly(Return(base::WeakPtr<syncer::SyncableService>())); @@ -166,9 +166,7 @@ class SyncAutofillDataTypeControllerTest : public testing::Test { EXPECT_EQ(type, syncer::AUTOFILL); } - virtual void TearDown() { - autofill_dtc_ = NULL; - } + void TearDown() override { autofill_dtc_ = NULL; } void BlockForDBThread() { base::RunLoop run_loop; diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc index 7f01963..7abd90b 100644 --- a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc @@ -97,7 +97,7 @@ class SyncBookmarkDataTypeControllerTest : public testing::Test { : thread_bundle_(content::TestBrowserThreadBundle::DEFAULT), service_(&profile_) {} - virtual void SetUp() { + void SetUp() override { model_associator_ = new ModelAssociatorMock(); change_processor_ = new ChangeProcessorMock(); history_service_ = static_cast<HistoryMock*>( diff --git a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc index a95a7ec..1d63e55 100644 --- a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc +++ b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc @@ -72,9 +72,7 @@ class SyncBrowserThreadModelWorkerTest : public testing::Test { } protected: - virtual void SetUp() { - worker_ = new DatabaseModelWorker(NULL); - } + void SetUp() override { worker_ = new DatabaseModelWorker(NULL); } virtual void Teardown() { worker_ = NULL; diff --git a/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc b/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc index 80d5e9c..decf4bb 100644 --- a/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc +++ b/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc @@ -67,7 +67,7 @@ class SyncChromeExtensionsActivityMonitorTest : public testing::Test { extension2_(MakeExtension("extension2")), id1_(extension1_->id()), id2_(extension2_->id()) {} - virtual ~SyncChromeExtensionsActivityMonitorTest() {} + ~SyncChromeExtensionsActivityMonitorTest() override {} private: content::TestBrowserThreadBundle thread_bundle_; diff --git a/chrome/browser/sync/glue/favicon_cache_unittest.cc b/chrome/browser/sync/glue/favicon_cache_unittest.cc index ba57e23..9ba4091 100644 --- a/chrome/browser/sync/glue/favicon_cache_unittest.cc +++ b/chrome/browser/sync/glue/favicon_cache_unittest.cc @@ -259,7 +259,7 @@ int GetFaviconId(const syncer::SyncChange change) { class SyncFaviconCacheTest : public testing::Test { public: SyncFaviconCacheTest(); - virtual ~SyncFaviconCacheTest() {} + ~SyncFaviconCacheTest() override {} void SetUpInitialSync(const syncer::SyncDataList& initial_image_data, const syncer::SyncDataList& initial_tracking_data); diff --git a/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc index a59ba4d..7ab103d 100644 --- a/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc @@ -83,7 +83,7 @@ class SyncFrontendDataTypeControllerTest : public testing::Test { : thread_bundle_(content::TestBrowserThreadBundle::DEFAULT), service_(&profile_) {} - virtual void SetUp() { + void SetUp() override { profile_sync_factory_.reset(new ProfileSyncComponentsFactoryMock()); dtc_mock_ = new StrictMock<FrontendDataTypeControllerMock>(); frontend_dtc_ = diff --git a/chrome/browser/sync/glue/local_device_info_provider_unittest.cc b/chrome/browser/sync/glue/local_device_info_provider_unittest.cc index a006df9..48f154c 100644 --- a/chrome/browser/sync/glue/local_device_info_provider_unittest.cc +++ b/chrome/browser/sync/glue/local_device_info_provider_unittest.cc @@ -22,13 +22,11 @@ class LocalDeviceInfoProviderTest : public testing::Test { public: LocalDeviceInfoProviderTest() : called_back_(false) {} - virtual ~LocalDeviceInfoProviderTest() {} + ~LocalDeviceInfoProviderTest() override {} - virtual void SetUp() override { - provider_.reset(new LocalDeviceInfoProviderImpl()); - } + void SetUp() override { provider_.reset(new LocalDeviceInfoProviderImpl()); } - virtual void TearDown() override { + void TearDown() override { provider_.reset(); called_back_ = false; } diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc index e183230..617f831 100644 --- a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc @@ -111,7 +111,7 @@ class SyncNonFrontendDataTypeControllerTest : public testing::Test { model_associator_(NULL), change_processor_(NULL) {} - virtual void SetUp() { + void SetUp() override { db_thread_.Start(); profile_sync_factory_.reset(new ProfileSyncComponentsFactoryMock()); @@ -124,7 +124,7 @@ class SyncNonFrontendDataTypeControllerTest : public testing::Test { dtc_mock_.get()); } - virtual void TearDown() { + void TearDown() override { if (non_frontend_dtc_->state() != NonFrontendDataTypeController::NOT_RUNNING) { non_frontend_dtc_->Stop(); diff --git a/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc b/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc index fdb5bd2..6b6fddc 100644 --- a/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc @@ -33,7 +33,7 @@ class SyncSearchEngineDataTypeControllerTest : public testing::Test { public: SyncSearchEngineDataTypeControllerTest() : test_util_(&profile_) { } - virtual void SetUp() { + void SetUp() override { service_.reset(new ProfileSyncServiceMock(&profile_)); profile_sync_factory_.reset(new ProfileSyncComponentsFactoryMock()); // Feed the DTC the profile so it is reused later. @@ -42,7 +42,7 @@ class SyncSearchEngineDataTypeControllerTest : public testing::Test { profile_sync_factory_.get(), &profile_); } - virtual void TearDown() { + void TearDown() override { // Must be done before we pump the loop. syncable_service_.StopSyncing(syncer::SEARCH_ENGINES); search_engine_dtc_ = NULL; diff --git a/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc b/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc index 7067d99..1129bbf 100644 --- a/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc +++ b/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc @@ -65,16 +65,16 @@ class SyncBackendRegistrarTest : public testing::Test { content::TestBrowserThreadBundle::REAL_FILE_THREAD | content::TestBrowserThreadBundle::REAL_IO_THREAD) {} - virtual ~SyncBackendRegistrarTest() {} + ~SyncBackendRegistrarTest() override {} - virtual void SetUp() { + void SetUp() override { test_user_share_.SetUp(); registrar_.reset(new SyncBackendRegistrar("test", &profile_, scoped_ptr<base::Thread>())); sync_thread_ = registrar_->sync_thread(); } - virtual void TearDown() { + void TearDown() override { registrar_->RequestWorkerStopOnUIThread(); test_user_share_.TearDown(); sync_thread_->message_loop()->PostTask( @@ -277,7 +277,7 @@ class SyncBackendRegistrarShutdownTest : public testing::Test { quit_closure_ = run_loop_.QuitClosure(); } - virtual ~SyncBackendRegistrarShutdownTest() {} + ~SyncBackendRegistrarShutdownTest() override {} void PostQuitOnUIMessageLoop() { BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, quit_closure_); diff --git a/chrome/browser/sync/glue/ui_model_worker_unittest.cc b/chrome/browser/sync/glue/ui_model_worker_unittest.cc index 4d4ce74..6c20e82 100644 --- a/chrome/browser/sync/glue/ui_model_worker_unittest.cc +++ b/chrome/browser/sync/glue/ui_model_worker_unittest.cc @@ -62,7 +62,7 @@ class SyncUIModelWorkerTest : public testing::Test { SyncUIModelWorkerTest() : faux_syncer_thread_("FauxSyncerThread"), faux_core_thread_("FauxCoreThread") { } - virtual void SetUp() { + void SetUp() override { faux_syncer_thread_.Start(); ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI, &faux_ui_loop_)); diff --git a/chrome/browser/sync/profile_sync_auth_provider_unittest.cc b/chrome/browser/sync/profile_sync_auth_provider_unittest.cc index 561a4e9..c216090e 100644 --- a/chrome/browser/sync/profile_sync_auth_provider_unittest.cc +++ b/chrome/browser/sync/profile_sync_auth_provider_unittest.cc @@ -20,9 +20,9 @@ class ProfileSyncAuthProviderTest : public ::testing::Test { public: ProfileSyncAuthProviderTest() {} - virtual ~ProfileSyncAuthProviderTest() {} + ~ProfileSyncAuthProviderTest() override {} - virtual void SetUp() override { + void SetUp() override { TestingProfile::Builder builder; builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(), &BuildAutoIssuingFakeProfileOAuth2TokenService); diff --git a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc index 04dc8d4..a0337f2 100644 --- a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc +++ b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc @@ -31,7 +31,7 @@ class ProfileSyncComponentsFactoryImplTest : public testing::Test { ProfileSyncComponentsFactoryImplTest() : thread_bundle_(content::TestBrowserThreadBundle::DEFAULT) {} - virtual void SetUp() { + void SetUp() override { profile_.reset(new TestingProfile()); base::FilePath program_path(FILE_PATH_LITERAL("chrome.exe")); command_line_.reset(new CommandLine(program_path)); diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc index b02a7f3..4f4e9ba 100644 --- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc @@ -447,8 +447,7 @@ class ProfileSyncServiceAutofillTest : profile_manager_(TestingBrowserProcess::GetGlobal()), debug_ptr_factory_(this) { } - virtual ~ProfileSyncServiceAutofillTest() { - } + ~ProfileSyncServiceAutofillTest() override {} AutofillProfileFactory profile_factory_; AutofillEntryFactory entry_factory_; @@ -464,7 +463,7 @@ class ProfileSyncServiceAutofillTest } } - virtual void SetUp() override { + void SetUp() override { AbstractProfileSyncServiceTest::SetUp(); ASSERT_TRUE(profile_manager_.SetUp()); TestingProfile::TestingFactories testing_factories; @@ -510,7 +509,7 @@ class ProfileSyncServiceAutofillTest .WillRepeatedly(Return(true)); } - virtual void TearDown() override { + void TearDown() override { // Note: The tear down order is important. ProfileSyncServiceFactory::GetInstance()->SetTestingFactory(profile_, NULL); web_data_service_->ShutdownOnUIThread(); diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc index ad44101..0319e48 100644 --- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc @@ -87,10 +87,9 @@ class ProfileSyncServiceStartupTest : public testing::Test { profile_manager_(TestingBrowserProcess::GetGlobal()), sync_(NULL) {} - virtual ~ProfileSyncServiceStartupTest() { - } + ~ProfileSyncServiceStartupTest() override {} - virtual void SetUp() { + void SetUp() override { CHECK(profile_manager_.SetUp()); TestingProfile::TestingFactories testing_facotries; @@ -110,9 +109,7 @@ class ProfileSyncServiceStartupTest : public testing::Test { testing_facotries); } - virtual void TearDown() { - sync_->RemoveObserver(&observer_); - } + void TearDown() override { sync_->RemoveObserver(&observer_); } static KeyedService* BuildService(content::BrowserContext* browser_context) { Profile* profile = static_cast<Profile*>(browser_context); @@ -196,7 +193,7 @@ class ProfileSyncServiceStartupTest : public testing::Test { class ProfileSyncServiceStartupCrosTest : public ProfileSyncServiceStartupTest { public: - virtual void SetUp() { + void SetUp() override { ProfileSyncServiceStartupTest::SetUp(); sync_ = static_cast<ProfileSyncService*>( ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse( diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc index 481f3b3..679f6b4 100644 --- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc @@ -222,7 +222,7 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest { history_thread_.reset(new Thread("history")); } - virtual void SetUp() { + void SetUp() override { AbstractProfileSyncServiceTest::SetUp(); ASSERT_TRUE(profile_manager_.SetUp()); TestingProfile::TestingFactories testing_factories; @@ -247,7 +247,7 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest { history_service_->set_backend(history_backend_); } - virtual void TearDown() { + void TearDown() override { EXPECT_CALL((*history_service_), Shutdown()) .WillOnce(ShutdownHistoryService(history_thread_.release(), history_service_)); diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc index 1189cc5..368dfcd 100644 --- a/chrome/browser/sync/profile_sync_service_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_unittest.cc @@ -173,9 +173,9 @@ class ProfileSyncServiceTest : public ::testing::Test { ProfileSyncServiceTest() : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP), profile_manager_(TestingBrowserProcess::GetGlobal()) {} - virtual ~ProfileSyncServiceTest() {} + ~ProfileSyncServiceTest() override {} - virtual void SetUp() override { + void SetUp() override { CommandLine::ForCurrentProcess()->AppendSwitchASCII( switches::kSyncDeferredStartupTimeoutSeconds, "0"); @@ -196,7 +196,7 @@ class ProfileSyncServiceTest : public ::testing::Test { testing_facotries); } - virtual void TearDown() override { + void TearDown() override { // Kill the service before the profile. if (service_) service_->Shutdown(); diff --git a/chrome/browser/sync/sessions/session_data_type_controller_unittest.cc b/chrome/browser/sync/sessions/session_data_type_controller_unittest.cc index 3671a7c..f894d39 100644 --- a/chrome/browser/sync/sessions/session_data_type_controller_unittest.cc +++ b/chrome/browser/sync/sessions/session_data_type_controller_unittest.cc @@ -85,9 +85,9 @@ class SessionDataTypeControllerTest thread_bundle_(content::TestBrowserThreadBundle::DEFAULT), weak_ptr_factory_(this), last_type_(syncer::UNSPECIFIED) {} - virtual ~SessionDataTypeControllerTest() {} + ~SessionDataTypeControllerTest() override {} - virtual void SetUp() override { + void SetUp() override { synced_window_delegate_.reset(new MockSyncedWindowDelegate(&profile_)); synced_window_getter_.reset(new MockSyncedWindowDelegatesGetter()); synced_window_getter_->Add(synced_window_delegate_.get()); @@ -111,7 +111,7 @@ class SessionDataTypeControllerTest last_error_ = syncer::SyncError(); } - virtual void TearDown() override { + void TearDown() override { controller_ = NULL; local_device_.reset(); synced_window_getter_.reset(); diff --git a/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc b/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc index 37fd2e8..08d1526 100644 --- a/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc +++ b/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc @@ -231,7 +231,7 @@ class SessionsSyncManagerTest "device_id")); } - virtual void SetUp() override { + void SetUp() override { BrowserWithTestWindowTest::SetUp(); browser_sync::NotificationServiceSessionsRouter* router( new browser_sync::NotificationServiceSessionsRouter( @@ -240,7 +240,7 @@ class SessionsSyncManagerTest scoped_ptr<LocalSessionEventRouter>(router))); } - virtual void TearDown() override { + void TearDown() override { test_processor_ = NULL; helper()->Reset(); manager_.reset(); diff --git a/chrome/browser/sync/startup_controller_unittest.cc b/chrome/browser/sync/startup_controller_unittest.cc index 0305592..e8c6e1d 100644 --- a/chrome/browser/sync/startup_controller_unittest.cc +++ b/chrome/browser/sync/startup_controller_unittest.cc @@ -50,7 +50,7 @@ class StartupControllerTest : public testing::Test { public: StartupControllerTest() : started_(false) {} - virtual void SetUp() override { + void SetUp() override { profile_.reset(new TestingProfile()); sync_prefs_.reset(new sync_driver::SyncPrefs(profile_->GetPrefs())); token_service_.reset(static_cast<FakeProfileOAuth2TokenService*>( @@ -69,7 +69,7 @@ class StartupControllerTest : public testing::Test { base::TimeDelta::FromSeconds(0)); } - virtual void TearDown() override { + void TearDown() override { controller_.reset(); signin_.reset(); token_service_->Shutdown(); diff --git a/chrome/browser/sync/sync_error_notifier_ash.cc b/chrome/browser/sync/sync_error_notifier_ash.cc index 2c01485..01e5dd2 100644 --- a/chrome/browser/sync/sync_error_notifier_ash.cc +++ b/chrome/browser/sync/sync_error_notifier_ash.cc @@ -45,16 +45,16 @@ class SyncNotificationDelegate : public NotificationDelegate { Profile* profile); // NotificationDelegate: - virtual void Display() override; - virtual void Error() override; - virtual void Close(bool by_user) override; - virtual bool HasClickedListener() override; - virtual void Click() override; - virtual void ButtonClick(int button_index) override; - virtual std::string id() const override; + void Display() override; + void Error() override; + void Close(bool by_user) override; + bool HasClickedListener() override; + void Click() override; + void ButtonClick(int button_index) override; + std::string id() const override; protected: - virtual ~SyncNotificationDelegate(); + ~SyncNotificationDelegate() override; private: void ShowSyncSetup(); diff --git a/chrome/browser/sync/sync_error_notifier_ash.h b/chrome/browser/sync/sync_error_notifier_ash.h index 32f4d7e..892f4c5 100644 --- a/chrome/browser/sync/sync_error_notifier_ash.h +++ b/chrome/browser/sync/sync_error_notifier_ash.h @@ -20,13 +20,13 @@ class SyncErrorNotifier : public SyncErrorController::Observer, public KeyedService { public: SyncErrorNotifier(SyncErrorController* controller, Profile* profile); - virtual ~SyncErrorNotifier(); + ~SyncErrorNotifier() override; // KeyedService: - virtual void Shutdown() override; + void Shutdown() override; // SyncErrorController::Observer: - virtual void OnErrorChanged() override; + void OnErrorChanged() override; private: // The error controller to query for error details. diff --git a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc index b1970d1..8215226 100644 --- a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc +++ b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc @@ -64,23 +64,21 @@ class ScreenTypeDelegateDesktop : public gfx::ScreenTypeDelegate { class FakeLoginUIService: public LoginUIService { public: FakeLoginUIService() : LoginUIService(NULL) {} - virtual ~FakeLoginUIService() {} + ~FakeLoginUIService() override {} }; class FakeLoginUI : public LoginUIService::LoginUI { public: FakeLoginUI() : focus_ui_call_count_(0) {} - virtual ~FakeLoginUI() {} + ~FakeLoginUI() override {} int focus_ui_call_count() const { return focus_ui_call_count_; } private: // LoginUIService::LoginUI: - virtual void FocusUI() override { - ++focus_ui_call_count_; - } - virtual void CloseUI() override {} + void FocusUI() override { ++focus_ui_call_count_; } + void CloseUI() override {} int focus_ui_call_count_; }; @@ -93,9 +91,9 @@ KeyedService* BuildMockLoginUIService( class SyncErrorNotifierTest : public AshTestBase { public: SyncErrorNotifierTest() {} - virtual ~SyncErrorNotifierTest() {} + ~SyncErrorNotifierTest() override {} - virtual void SetUp() override { + void SetUp() override { profile_manager_.reset( new TestingProfileManager(TestingBrowserProcess::GetGlobal())); ASSERT_TRUE(profile_manager_->SetUp()); @@ -127,7 +125,7 @@ class SyncErrorNotifierTest : public AshTestBase { notification_ui_manager_ = g_browser_process->notification_ui_manager(); } - virtual void TearDown() override { + void TearDown() override { error_notifier_->Shutdown(); service_.reset(); #if defined(OS_WIN) diff --git a/chrome/browser/sync/sync_error_notifier_factory_ash.h b/chrome/browser/sync/sync_error_notifier_factory_ash.h index d859a88..16bd2a9 100644 --- a/chrome/browser/sync/sync_error_notifier_factory_ash.h +++ b/chrome/browser/sync/sync_error_notifier_factory_ash.h @@ -27,10 +27,10 @@ class SyncErrorNotifierFactory : public BrowserContextKeyedServiceFactory { friend struct DefaultSingletonTraits<SyncErrorNotifierFactory>; SyncErrorNotifierFactory(); - virtual ~SyncErrorNotifierFactory(); + ~SyncErrorNotifierFactory() override; // BrowserContextKeyedServiceFactory: - virtual KeyedService* BuildServiceInstanceFor( + KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const override; DISALLOW_COPY_AND_ASSIGN(SyncErrorNotifierFactory); diff --git a/chrome/browser/sync/sync_global_error_unittest.cc b/chrome/browser/sync/sync_global_error_unittest.cc index 7896c57..a7193b3 100644 --- a/chrome/browser/sync/sync_global_error_unittest.cc +++ b/chrome/browser/sync/sync_global_error_unittest.cc @@ -56,9 +56,9 @@ KeyedService* BuildMockLoginUIService(content::BrowserContext* profile) { class SyncGlobalErrorTest : public BrowserWithTestWindowTest { public: SyncGlobalErrorTest() {} - virtual ~SyncGlobalErrorTest() {} + ~SyncGlobalErrorTest() override {} - virtual void SetUp() override { + void SetUp() override { profile_.reset(ProfileSyncServiceMock::MakeSignedInTestingProfile()); BrowserWithTestWindowTest::SetUp(); diff --git a/chrome/browser/sync/sync_startup_tracker_unittest.cc b/chrome/browser/sync/sync_startup_tracker_unittest.cc index 8b1d907..77bf8e8 100644 --- a/chrome/browser/sync/sync_startup_tracker_unittest.cc +++ b/chrome/browser/sync/sync_startup_tracker_unittest.cc @@ -29,7 +29,7 @@ class SyncStartupTrackerTest : public testing::Test { SyncStartupTrackerTest() : no_error_(GoogleServiceAuthError::NONE) { } - virtual void SetUp() override { + void SetUp() override { profile_.reset(new TestingProfile()); mock_pss_ = static_cast<ProfileSyncServiceMock*>( ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse( @@ -47,9 +47,7 @@ class SyncStartupTrackerTest : public testing::Test { mock_pss_->Initialize(); } - virtual void TearDown() override { - profile_.reset(); - } + void TearDown() override { profile_.reset(); } void SetupNonInitializedPSS() { EXPECT_CALL(*mock_pss_, GetAuthError()) diff --git a/chrome/browser/sync/test/integration/cross_platform_sync_test.cc b/chrome/browser/sync/test/integration/cross_platform_sync_test.cc index 1bc2b27..cfd873d 100644 --- a/chrome/browser/sync/test/integration/cross_platform_sync_test.cc +++ b/chrome/browser/sync/test/integration/cross_platform_sync_test.cc @@ -19,7 +19,7 @@ using sync_integration_test_util::AwaitCommitActivityCompletion; class CrossPlatformSyncTest : public SyncTest { public: CrossPlatformSyncTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~CrossPlatformSyncTest() {} + ~CrossPlatformSyncTest() override {} private: DISALLOW_COPY_AND_ASSIGN(CrossPlatformSyncTest); diff --git a/chrome/browser/sync/test/integration/dictionary_helper.cc b/chrome/browser/sync/test/integration/dictionary_helper.cc index 070b2d8..038ae36 100644 --- a/chrome/browser/sync/test/integration/dictionary_helper.cc +++ b/chrome/browser/sync/test/integration/dictionary_helper.cc @@ -104,10 +104,10 @@ namespace { class DictionaryMatchStatusChecker : public MultiClientStatusChangeChecker { public: DictionaryMatchStatusChecker(); - virtual ~DictionaryMatchStatusChecker(); + ~DictionaryMatchStatusChecker() override; - virtual bool IsExitConditionSatisfied() override; - virtual std::string GetDebugMessage() const override; + bool IsExitConditionSatisfied() override; + std::string GetDebugMessage() const override; }; DictionaryMatchStatusChecker::DictionaryMatchStatusChecker() @@ -129,10 +129,11 @@ class NumDictionaryEntriesStatusChecker : public SingleClientStatusChangeChecker { public: NumDictionaryEntriesStatusChecker(int index, size_t num_words); - virtual ~NumDictionaryEntriesStatusChecker(); + ~NumDictionaryEntriesStatusChecker() override; + + bool IsExitConditionSatisfied() override; + std::string GetDebugMessage() const override; - virtual bool IsExitConditionSatisfied() override; - virtual std::string GetDebugMessage() const override; private: int index_; size_t num_words_; diff --git a/chrome/browser/sync/test/integration/dictionary_load_observer.h b/chrome/browser/sync/test/integration/dictionary_load_observer.h index 5798c08..9110c7e 100644 --- a/chrome/browser/sync/test/integration/dictionary_load_observer.h +++ b/chrome/browser/sync/test/integration/dictionary_load_observer.h @@ -17,8 +17,8 @@ class DictionaryLoadObserver : public SpellcheckCustomDictionary::Observer { virtual ~DictionaryLoadObserver(); // SpellcheckCustomDictionary::Observer implementation. - virtual void OnCustomDictionaryLoaded() override; - virtual void OnCustomDictionaryChanged( + void OnCustomDictionaryLoaded() override; + void OnCustomDictionaryChanged( const SpellcheckCustomDictionary::Change& dictionary_change) override; private: diff --git a/chrome/browser/sync/test/integration/enable_disable_test.cc b/chrome/browser/sync/test/integration/enable_disable_test.cc index ed9a364..23b5bc8 100644 --- a/chrome/browser/sync/test/integration/enable_disable_test.cc +++ b/chrome/browser/sync/test/integration/enable_disable_test.cc @@ -17,7 +17,7 @@ namespace { class EnableDisableSingleClientTest : public SyncTest { public: EnableDisableSingleClientTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~EnableDisableSingleClientTest() {} + ~EnableDisableSingleClientTest() override {} // Don't use self-notifications as they can trigger additional sync cycles. bool TestUsesSelfNotifications() override { return false; } diff --git a/chrome/browser/sync/test/integration/migration_test.cc b/chrome/browser/sync/test/integration/migration_test.cc index ef2ac1e..753865e 100644 --- a/chrome/browser/sync/test/integration/migration_test.cc +++ b/chrome/browser/sync/test/integration/migration_test.cc @@ -70,7 +70,7 @@ MigrationList MakeList(syncer::ModelType type1, class MigrationTest : public SyncTest { public: explicit MigrationTest(TestType test_type) : SyncTest(test_type) {} - virtual ~MigrationTest() {} + ~MigrationTest() override {} enum TriggerMethod { MODIFY_PREF, MODIFY_BOOKMARK, TRIGGER_NOTIFICATION }; @@ -216,7 +216,7 @@ class MigrationTest : public SyncTest { class MigrationSingleClientTest : public MigrationTest { public: MigrationSingleClientTest() : MigrationTest(SINGLE_CLIENT_LEGACY) {} - virtual ~MigrationSingleClientTest() {} + ~MigrationSingleClientTest() override {} void RunSingleClientMigrationTest(const MigrationList& migration_list, TriggerMethod trigger_method) { @@ -341,7 +341,7 @@ IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, AllTypesWithNigoriAtOnce) { class MigrationTwoClientTest : public MigrationTest { public: MigrationTwoClientTest() : MigrationTest(TWO_CLIENT_LEGACY) {} - virtual ~MigrationTwoClientTest() {} + ~MigrationTwoClientTest() override {} // Helper function that verifies that preferences sync still works. void VerifyPrefSync() { @@ -426,7 +426,7 @@ class MigrationReconfigureTest : public MigrationTwoClientTest { // Do not add optional datatypes. } - virtual ~MigrationReconfigureTest() {} + ~MigrationReconfigureTest() override {} private: DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest); diff --git a/chrome/browser/sync/test/integration/multiple_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_bookmarks_sync_test.cc index 34f77672..95c5ae1 100644 --- a/chrome/browser/sync/test/integration/multiple_client_bookmarks_sync_test.cc +++ b/chrome/browser/sync/test/integration/multiple_client_bookmarks_sync_test.cc @@ -13,7 +13,7 @@ using bookmarks_helper::AwaitAllModelsMatch; class MultipleClientBookmarksSyncTest : public SyncTest { public: MultipleClientBookmarksSyncTest() : SyncTest(MULTIPLE_CLIENT) {} - virtual ~MultipleClientBookmarksSyncTest() {} + ~MultipleClientBookmarksSyncTest() override {} bool TestUsesSelfNotifications() override { return false; } diff --git a/chrome/browser/sync/test/integration/multiple_client_dictionary_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_dictionary_sync_test.cc index 07c3dc9..17b3761 100644 --- a/chrome/browser/sync/test/integration/multiple_client_dictionary_sync_test.cc +++ b/chrome/browser/sync/test/integration/multiple_client_dictionary_sync_test.cc @@ -14,9 +14,9 @@ using chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS; class MultipleClientDictionarySyncTest : public SyncTest { public: MultipleClientDictionarySyncTest() : SyncTest(MULTIPLE_CLIENT) {} - virtual ~MultipleClientDictionarySyncTest() {} + ~MultipleClientDictionarySyncTest() override {} - virtual bool TestUsesSelfNotifications() override { return false; } + bool TestUsesSelfNotifications() override { return false; } private: DISALLOW_COPY_AND_ASSIGN(MultipleClientDictionarySyncTest); diff --git a/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc index fe12e9b..f90abd9 100644 --- a/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc +++ b/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc @@ -33,7 +33,7 @@ static const char* kAnotherValidPassphrase = "Mot de passe!"; class MultipleClientPasswordsSyncTest : public SyncTest { public: MultipleClientPasswordsSyncTest() : SyncTest(MULTIPLE_CLIENT) {} - virtual ~MultipleClientPasswordsSyncTest() {} + ~MultipleClientPasswordsSyncTest() override {} bool TestUsesSelfNotifications() override { return false; } diff --git a/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc index 74ebe3a..653a991 100644 --- a/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc +++ b/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc @@ -14,7 +14,7 @@ using preferences_helper::AwaitListPrefMatches; class MultipleClientPreferencesSyncTest : public SyncTest { public: MultipleClientPreferencesSyncTest() : SyncTest(MULTIPLE_CLIENT) {} - virtual ~MultipleClientPreferencesSyncTest() {} + ~MultipleClientPreferencesSyncTest() override {} bool TestUsesSelfNotifications() override { return false; } diff --git a/chrome/browser/sync/test/integration/multiple_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_sessions_sync_test.cc index 0e3af16..fde348a 100644 --- a/chrome/browser/sync/test/integration/multiple_client_sessions_sync_test.cc +++ b/chrome/browser/sync/test/integration/multiple_client_sessions_sync_test.cc @@ -19,7 +19,7 @@ using sessions_helper::SyncedSessionVector; class MultipleClientSessionsSyncTest : public SyncTest { public: MultipleClientSessionsSyncTest() : SyncTest(MULTIPLE_CLIENT) {} - virtual ~MultipleClientSessionsSyncTest() {} + ~MultipleClientSessionsSyncTest() override {} private: DISALLOW_COPY_AND_ASSIGN(MultipleClientSessionsSyncTest); diff --git a/chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc index fff823a..e7522d6 100644 --- a/chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc +++ b/chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc @@ -18,7 +18,7 @@ using typed_urls_helper::GetTypedUrlsFromClient; class MultipleClientTypedUrlsSyncTest : public SyncTest { public: MultipleClientTypedUrlsSyncTest() : SyncTest(MULTIPLE_CLIENT) {} - virtual ~MultipleClientTypedUrlsSyncTest() {} + ~MultipleClientTypedUrlsSyncTest() override {} bool TestUsesSelfNotifications() override { return false; } diff --git a/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc index 11f2bfe..ac2a1b5 100644 --- a/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc +++ b/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc @@ -12,7 +12,7 @@ class DictionarySyncPerfTest : public SyncTest { public: DictionarySyncPerfTest() : SyncTest(TWO_CLIENT) {} - virtual ~DictionarySyncPerfTest() {} + ~DictionarySyncPerfTest() override {} private: DISALLOW_COPY_AND_ASSIGN(DictionarySyncPerfTest); diff --git a/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc index 7fe2b96..4c9ed52 100644 --- a/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc @@ -30,7 +30,7 @@ class SingleClientAppListSyncTest : public SyncTest { public: SingleClientAppListSyncTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~SingleClientAppListSyncTest() {} + ~SingleClientAppListSyncTest() override {} // SyncTest void SetUpCommandLine(CommandLine* command_line) override { diff --git a/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc b/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc index 96d80a2..1f1404e 100644 --- a/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc @@ -17,7 +17,7 @@ class SingleClientAppsSyncTest : public SyncTest { public: SingleClientAppsSyncTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~SingleClientAppsSyncTest() {} + ~SingleClientAppsSyncTest() override {} private: DISALLOW_COPY_AND_ASSIGN(SingleClientAppsSyncTest); diff --git a/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc b/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc index 5bcd725..aa35013 100644 --- a/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc +++ b/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc @@ -38,7 +38,7 @@ const char kUrl3[] = "http://plus.google.com"; class SingleClientBackupRollbackTest : public SyncTest { public: SingleClientBackupRollbackTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~SingleClientBackupRollbackTest() {} + ~SingleClientBackupRollbackTest() override {} void DisableBackup() { CommandLine::ForCurrentProcess()->AppendSwitch( diff --git a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc index 15d661c..d587930 100644 --- a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc @@ -32,7 +32,7 @@ using sync_integration_test_util::AwaitCommitActivityCompletion; class SingleClientBookmarksSyncTest : public SyncTest { public: SingleClientBookmarksSyncTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~SingleClientBookmarksSyncTest() {} + ~SingleClientBookmarksSyncTest() override {} // Verify that the local bookmark model (for the Profile corresponding to // |index|) matches the data on the FakeServer. It is assumed that FakeServer diff --git a/chrome/browser/sync/test/integration/single_client_dictionary_sync_test.cc b/chrome/browser/sync/test/integration/single_client_dictionary_sync_test.cc index 5131612..1a918b4 100644 --- a/chrome/browser/sync/test/integration/single_client_dictionary_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_dictionary_sync_test.cc @@ -12,7 +12,7 @@ using sync_integration_test_util::AwaitCommitActivityCompletion; class SingleClientDictionarySyncTest : public SyncTest { public: SingleClientDictionarySyncTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~SingleClientDictionarySyncTest() {} + ~SingleClientDictionarySyncTest() override {} private: DISALLOW_COPY_AND_ASSIGN(SingleClientDictionarySyncTest); diff --git a/chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc b/chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc index 5358d14..29f5735 100644 --- a/chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc @@ -16,7 +16,7 @@ class SingleClientExtensionsSyncTest : public SyncTest { public: SingleClientExtensionsSyncTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~SingleClientExtensionsSyncTest() {} + ~SingleClientExtensionsSyncTest() override {} private: DISALLOW_COPY_AND_ASSIGN(SingleClientExtensionsSyncTest); diff --git a/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc index 9ca7eab..972810b 100644 --- a/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc @@ -22,7 +22,7 @@ using autofill::PasswordForm; class SingleClientPasswordsSyncTest : public SyncTest { public: SingleClientPasswordsSyncTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~SingleClientPasswordsSyncTest() {} + ~SingleClientPasswordsSyncTest() override {} private: DISALLOW_COPY_AND_ASSIGN(SingleClientPasswordsSyncTest); diff --git a/chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc index 5cd7c35..bff12d2 100644 --- a/chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc @@ -15,7 +15,7 @@ using sync_integration_test_util::AwaitCommitActivityCompletion; class SingleClientPreferencesSyncTest : public SyncTest { public: SingleClientPreferencesSyncTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~SingleClientPreferencesSyncTest() {} + ~SingleClientPreferencesSyncTest() override {} private: DISALLOW_COPY_AND_ASSIGN(SingleClientPreferencesSyncTest); diff --git a/chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc b/chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc index e7be9b6..e05bc69 100644 --- a/chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc @@ -13,7 +13,7 @@ using sync_integration_test_util::AwaitCommitActivityCompletion; class SingleClientSearchEnginesSyncTest : public SyncTest { public: SingleClientSearchEnginesSyncTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~SingleClientSearchEnginesSyncTest() {} + ~SingleClientSearchEnginesSyncTest() override {} private: DISALLOW_COPY_AND_ASSIGN(SingleClientSearchEnginesSyncTest); diff --git a/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc index 1349fd4..777ff07 100644 --- a/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc @@ -27,7 +27,7 @@ using typed_urls_helper::GetUrlFromClient; class SingleClientSessionsSyncTest : public SyncTest { public: SingleClientSessionsSyncTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~SingleClientSessionsSyncTest() {} + ~SingleClientSessionsSyncTest() override {} private: DISALLOW_COPY_AND_ASSIGN(SingleClientSessionsSyncTest); diff --git a/chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc b/chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc index 200c399..681239c 100644 --- a/chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc @@ -22,7 +22,7 @@ class SingleClientSupervisedUserSettingsSyncTest : public SyncTest { public: SingleClientSupervisedUserSettingsSyncTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~SingleClientSupervisedUserSettingsSyncTest() {} + ~SingleClientSupervisedUserSettingsSyncTest() override {} // SyncTest overrides: void SetUpCommandLine(CommandLine* command_line) override { diff --git a/chrome/browser/sync/test/integration/single_client_themes_sync_test.cc b/chrome/browser/sync/test/integration/single_client_themes_sync_test.cc index 5a08094..d770259 100644 --- a/chrome/browser/sync/test/integration/single_client_themes_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_themes_sync_test.cc @@ -21,7 +21,7 @@ using themes_helper::UsingSystemTheme; class SingleClientThemesSyncTest : public SyncTest { public: SingleClientThemesSyncTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~SingleClientThemesSyncTest() {} + ~SingleClientThemesSyncTest() override {} private: DISALLOW_COPY_AND_ASSIGN(SingleClientThemesSyncTest); diff --git a/chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc index 9d922a2..20a5379 100644 --- a/chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc @@ -22,7 +22,7 @@ const std::string kSanityHistoryUrl = "http://www.sanity-history.google.com"; class SingleClientTypedUrlsSyncTest : public SyncTest { public: SingleClientTypedUrlsSyncTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~SingleClientTypedUrlsSyncTest() {} + ~SingleClientTypedUrlsSyncTest() override {} private: DISALLOW_COPY_AND_ASSIGN(SingleClientTypedUrlsSyncTest); diff --git a/chrome/browser/sync/test/integration/sync_auth_test.cc b/chrome/browser/sync/test/integration/sync_auth_test.cc index 0f958c2..0c625e9 100644 --- a/chrome/browser/sync/test/integration/sync_auth_test.cc +++ b/chrome/browser/sync/test/integration/sync_auth_test.cc @@ -73,7 +73,7 @@ std::string TestForAuthError::GetDebugMessage() const { class SyncAuthTest : public SyncTest { public: SyncAuthTest() : SyncTest(SINGLE_CLIENT), bookmark_index_(0) {} - virtual ~SyncAuthTest() {} + ~SyncAuthTest() override {} // Helper function that adds a bookmark and waits for either an auth error, or // for the bookmark to be committed. Returns true if it detects an auth diff --git a/chrome/browser/sync/test/integration/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc index 2493260..b763f75 100644 --- a/chrome/browser/sync/test/integration/sync_errors_test.cc +++ b/chrome/browser/sync/test/integration/sync_errors_test.cc @@ -66,7 +66,7 @@ bool AwaitTypeDisabled(ProfileSyncService* service, class SyncErrorTest : public SyncTest { public: SyncErrorTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~SyncErrorTest() {} + ~SyncErrorTest() override {} private: DISALLOW_COPY_AND_ASSIGN(SyncErrorTest); diff --git a/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc b/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc index 58ee9c3..5245ffb 100644 --- a/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc +++ b/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc @@ -21,7 +21,7 @@ using sync_integration_test_util::AwaitCommitActivityCompletion; class SyncExponentialBackoffTest : public SyncTest { public: SyncExponentialBackoffTest() : SyncTest(SINGLE_CLIENT) {} - virtual ~SyncExponentialBackoffTest() {} + ~SyncExponentialBackoffTest() override {} private: DISALLOW_COPY_AND_ASSIGN(SyncExponentialBackoffTest); diff --git a/chrome/browser/sync/test/integration/sync_test.h b/chrome/browser/sync/test/integration/sync_test.h index e67ea2e..970c1d6 100644 --- a/chrome/browser/sync/test/integration/sync_test.h +++ b/chrome/browser/sync/test/integration/sync_test.h @@ -97,14 +97,14 @@ class SyncTest : public InProcessBrowserTest { // A SyncTest must be associated with a particular test type. explicit SyncTest(TestType test_type); - virtual ~SyncTest(); + ~SyncTest() override; // Validates command line parameters and creates a local python test server if // specified. - virtual void SetUp() override; + void SetUp() override; // Brings down local python test server if one was created. - virtual void TearDown() override; + void TearDown() override; // Sets up command line flags required for sync tests. void SetUpCommandLine(base::CommandLine* cl) override; diff --git a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc index 8612fea..b8e86ad 100644 --- a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc @@ -81,7 +81,7 @@ class TwoClientAppListSyncTest : public SyncTest { public: TwoClientAppListSyncTest() : SyncTest(TWO_CLIENT_LEGACY) {} - virtual ~TwoClientAppListSyncTest() {} + ~TwoClientAppListSyncTest() override {} // SyncTest void SetUpCommandLine(CommandLine* command_line) override { @@ -518,13 +518,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppListSyncTest, RemoveDefault) { class TwoClientAppListSyncFolderTest : public TwoClientAppListSyncTest { public: TwoClientAppListSyncFolderTest() {} - virtual ~TwoClientAppListSyncFolderTest() {} + ~TwoClientAppListSyncFolderTest() override {} - virtual void SetUpCommandLine(CommandLine* command_line) override { + void SetUpCommandLine(CommandLine* command_line) override { TwoClientAppListSyncTest::SetUpCommandLine(command_line); } - virtual bool SetupClients() override { + bool SetupClients() override { bool res = TwoClientAppListSyncTest::SetupClients(); app_list::AppListSyncableService* verifier_service = app_list::AppListSyncableServiceFactory::GetForProfile(verifier()); diff --git a/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc index dcd2d80..4d11bbe 100644 --- a/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc @@ -57,7 +57,7 @@ class TwoClientAppsSyncTest : public SyncTest { public: TwoClientAppsSyncTest() : SyncTest(TWO_CLIENT) {} - virtual ~TwoClientAppsSyncTest() {} + ~TwoClientAppsSyncTest() override {} bool TestUsesSelfNotifications() override { return false; } diff --git a/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc index a5689e6..98ece66 100644 --- a/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc @@ -47,7 +47,7 @@ using sync_integration_test_util::AwaitCommitActivityCompletion; class TwoClientAutofillSyncTest : public SyncTest { public: TwoClientAutofillSyncTest() : SyncTest(TWO_CLIENT) { count = 0; } - virtual ~TwoClientAutofillSyncTest() {} + ~TwoClientAutofillSyncTest() override {} bool TestUsesSelfNotifications() override { return false; } diff --git a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc index e549054..f6027a2 100644 --- a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc @@ -64,7 +64,7 @@ const char kValidPassphrase[] = "passphrase!"; class TwoClientBookmarksSyncTest : public SyncTest { public: TwoClientBookmarksSyncTest() : SyncTest(TWO_CLIENT) {} - virtual ~TwoClientBookmarksSyncTest() {} + ~TwoClientBookmarksSyncTest() override {} void TearDownInProcessBrowserTestFixture() override { SyncTest::TearDownInProcessBrowserTestFixture(); @@ -82,7 +82,7 @@ class TwoClientBookmarksSyncTest : public SyncTest { class LegacyTwoClientBookmarksSyncTest : public SyncTest { public: LegacyTwoClientBookmarksSyncTest() : SyncTest(TWO_CLIENT_LEGACY) {} - virtual ~LegacyTwoClientBookmarksSyncTest() {} + ~LegacyTwoClientBookmarksSyncTest() override {} private: DISALLOW_COPY_AND_ASSIGN(LegacyTwoClientBookmarksSyncTest); diff --git a/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc b/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc index cfe3cc7..5f9c336 100644 --- a/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc @@ -14,11 +14,9 @@ using sync_integration_test_util::AwaitCommitActivityCompletion; class TwoClientDictionarySyncTest : public SyncTest { public: TwoClientDictionarySyncTest() : SyncTest(TWO_CLIENT) {} - virtual ~TwoClientDictionarySyncTest() {} + ~TwoClientDictionarySyncTest() override {} - virtual bool TestUsesSelfNotifications() override { - return false; - } + bool TestUsesSelfNotifications() override { return false; } private: DISALLOW_COPY_AND_ASSIGN(TwoClientDictionarySyncTest); diff --git a/chrome/browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc b/chrome/browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc index 8de4565..2b2767e 100644 --- a/chrome/browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc @@ -60,7 +60,7 @@ void MutateSomeSettings( class TwoClientExtensionSettingsAndAppSettingsSyncTest : public SyncTest { public: TwoClientExtensionSettingsAndAppSettingsSyncTest() : SyncTest(TWO_CLIENT) {} - virtual ~TwoClientExtensionSettingsAndAppSettingsSyncTest() {} + ~TwoClientExtensionSettingsAndAppSettingsSyncTest() override {} private: DISALLOW_COPY_AND_ASSIGN(TwoClientExtensionSettingsAndAppSettingsSyncTest); diff --git a/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc b/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc index 43cdb13..6f6a68f 100644 --- a/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc @@ -22,7 +22,7 @@ class TwoClientExtensionsSyncTest : public SyncTest { public: TwoClientExtensionsSyncTest() : SyncTest(TWO_CLIENT) {} - virtual ~TwoClientExtensionsSyncTest() {} + ~TwoClientExtensionsSyncTest() override {} bool TestUsesSelfNotifications() override { return false; } private: diff --git a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc index 0385f79..0cb80a6 100644 --- a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc @@ -35,7 +35,7 @@ static const char* kValidPassphrase = "passphrase!"; class TwoClientPasswordsSyncTest : public SyncTest { public: TwoClientPasswordsSyncTest() : SyncTest(TWO_CLIENT) {} - virtual ~TwoClientPasswordsSyncTest() {} + ~TwoClientPasswordsSyncTest() override {} bool TestUsesSelfNotifications() override { return false; } diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc index c19dfcb..1dcca7e 100644 --- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc @@ -23,7 +23,7 @@ using preferences_helper::GetPrefs; class TwoClientPreferencesSyncTest : public SyncTest { public: TwoClientPreferencesSyncTest() : SyncTest(TWO_CLIENT) {} - virtual ~TwoClientPreferencesSyncTest() {} + ~TwoClientPreferencesSyncTest() override {} bool TestUsesSelfNotifications() override { return false; } diff --git a/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc b/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc index 124f182..9030f55 100644 --- a/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc @@ -18,7 +18,7 @@ using sync_integration_test_util::AwaitCommitActivityCompletion; class TwoClientSearchEnginesSyncTest : public SyncTest { public: TwoClientSearchEnginesSyncTest() : SyncTest(TWO_CLIENT) {} - virtual ~TwoClientSearchEnginesSyncTest() {} + ~TwoClientSearchEnginesSyncTest() override {} private: DISALLOW_COPY_AND_ASSIGN(TwoClientSearchEnginesSyncTest); diff --git a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc index 7ee7f90..72db7fe 100644 --- a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc @@ -24,7 +24,7 @@ using sessions_helper::WindowsMatch; class TwoClientSessionsSyncTest : public SyncTest { public: TwoClientSessionsSyncTest() : SyncTest(TWO_CLIENT) {} - virtual ~TwoClientSessionsSyncTest() {} + ~TwoClientSessionsSyncTest() override {} private: DISALLOW_COPY_AND_ASSIGN(TwoClientSessionsSyncTest); diff --git a/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc index a41f447..26e64a7 100644 --- a/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc @@ -23,7 +23,7 @@ using themes_helper::UsingSystemTheme; class TwoClientThemesSyncTest : public SyncTest { public: TwoClientThemesSyncTest() : SyncTest(TWO_CLIENT) {} - virtual ~TwoClientThemesSyncTest() {} + ~TwoClientThemesSyncTest() override {} bool TestUsesSelfNotifications() override { return false; } diff --git a/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc index e45c0bc..8dea54c 100644 --- a/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc @@ -31,7 +31,7 @@ using typed_urls_helper::RemoveVisitsFromClient; class TwoClientTypedUrlsSyncTest : public SyncTest { public: TwoClientTypedUrlsSyncTest() : SyncTest(TWO_CLIENT) {} - virtual ~TwoClientTypedUrlsSyncTest() {} + ~TwoClientTypedUrlsSyncTest() override {} ::testing::AssertionResult CheckClientsEqual() { history::URLRows urls = GetTypedUrlsFromClient(0); |