diff options
Diffstat (limited to 'chrome/browser/sync/test/integration')
42 files changed, 60 insertions, 61 deletions
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); |