diff options
228 files changed, 450 insertions, 514 deletions
diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc index 600e389..32fb1de 100644 --- a/chrome/browser/about_flags_unittest.cc +++ b/chrome/browser/about_flags_unittest.cc @@ -292,7 +292,7 @@ class AboutFlagsTest : public ::testing::Test { testing::ClearState(); } - virtual void SetUp() override { + void SetUp() override { for (size_t i = 0; i < arraysize(kExperiments); ++i) kExperiments[i].supported_platforms = GetCurrentPlatform(); @@ -304,9 +304,7 @@ class AboutFlagsTest : public ::testing::Test { testing::SetExperiments(kExperiments, arraysize(kExperiments)); } - virtual void TearDown() override { - testing::SetExperiments(NULL, 0); - } + void TearDown() override { testing::SetExperiments(NULL, 0); } TestingPrefServiceSimple prefs_; PrefServiceFlagsStorage flags_storage_; diff --git a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc index 534351c..68d8c19 100644 --- a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc +++ b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc @@ -30,7 +30,7 @@ class CustomLauncherPageBrowserTest public: CustomLauncherPageBrowserTest() {} - virtual void SetUpCommandLine(base::CommandLine* command_line) override { + void SetUpCommandLine(base::CommandLine* command_line) override { PlatformAppBrowserTest::SetUpCommandLine(command_line); // Custom launcher pages only work in the experimental app list. @@ -43,8 +43,7 @@ class CustomLauncherPageBrowserTest // Open the launcher. Ignores the Extension argument (this will simply // activate any loaded launcher pages). - virtual void LaunchPlatformApp( - const extensions::Extension* /*unused*/) override { + void LaunchPlatformApp(const extensions::Extension* /*unused*/) override { AppListService* service = AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE); DCHECK(service); diff --git a/chrome/browser/apps/drive/drive_app_converter_browsertest.cc b/chrome/browser/apps/drive/drive_app_converter_browsertest.cc index 9bc54a2..b1175b3 100644 --- a/chrome/browser/apps/drive/drive_app_converter_browsertest.cc +++ b/chrome/browser/apps/drive/drive_app_converter_browsertest.cc @@ -39,7 +39,7 @@ const char kAppUrl[] = "http://foobar.com/drive_app"; class DriveAppConverterTest : public ExtensionBrowserTest { public: DriveAppConverterTest() {} - virtual ~DriveAppConverterTest() {} + ~DriveAppConverterTest() override {} // ExtensionBrowserTest: void SetUpOnMainThread() override { diff --git a/chrome/browser/apps/drive/drive_app_mapping_unittest.cc b/chrome/browser/apps/drive/drive_app_mapping_unittest.cc index 0698d14..ea24a60 100644 --- a/chrome/browser/apps/drive/drive_app_mapping_unittest.cc +++ b/chrome/browser/apps/drive/drive_app_mapping_unittest.cc @@ -12,10 +12,10 @@ class DriveAppMappingTest : public testing::Test { public: DriveAppMappingTest() {} - virtual ~DriveAppMappingTest() {} + ~DriveAppMappingTest() override {} // testing::Test: - virtual void SetUp() override { + void SetUp() override { pref_service_.reset(new TestingPrefServiceSyncable); DriveAppMapping::RegisterProfilePrefs(pref_service_->registry()); diff --git a/chrome/browser/apps/drive/drive_app_provider_browsertest.cc b/chrome/browser/apps/drive/drive_app_provider_browsertest.cc index 4adac22..b38283e 100644 --- a/chrome/browser/apps/drive/drive_app_provider_browsertest.cc +++ b/chrome/browser/apps/drive/drive_app_provider_browsertest.cc @@ -91,7 +91,7 @@ class DriveAppProviderTest : public ExtensionBrowserTest, public extensions::InstallObserver { public: DriveAppProviderTest() {} - virtual ~DriveAppProviderTest() {} + ~DriveAppProviderTest() override {} // ExtensionBrowserTest: void SetUpOnMainThread() override { diff --git a/chrome/browser/apps/ephemeral_app_browsertest.h b/chrome/browser/apps/ephemeral_app_browsertest.h index 912af8e..1e47b9d 100644 --- a/chrome/browser/apps/ephemeral_app_browsertest.h +++ b/chrome/browser/apps/ephemeral_app_browsertest.h @@ -25,7 +25,7 @@ class EphemeralAppTestBase : public extensions::PlatformAppBrowserTest { static const char kFileSystemTestApp[]; EphemeralAppTestBase(); - virtual ~EphemeralAppTestBase(); + ~EphemeralAppTestBase() override; void SetUpCommandLine(base::CommandLine* command_line) override; void SetUpOnMainThread() override; diff --git a/chrome/browser/apps/ephemeral_app_service_unittest.cc b/chrome/browser/apps/ephemeral_app_service_unittest.cc index 6b40cfe..aad6627 100644 --- a/chrome/browser/apps/ephemeral_app_service_unittest.cc +++ b/chrome/browser/apps/ephemeral_app_service_unittest.cc @@ -37,7 +37,7 @@ class EphemeralAppServiceTest : public testing::Test { typedef EphemeralAppService::LaunchTimeAppMap LaunchTimeAppMap; EphemeralAppServiceTest() {} - virtual ~EphemeralAppServiceTest() {} + ~EphemeralAppServiceTest() override {} void RunTest(int ephemeral_app_count, const LaunchTimeAppMap& launch_times, diff --git a/chrome/browser/apps/speech_recognition_browsertest.cc b/chrome/browser/apps/speech_recognition_browsertest.cc index 19e6dcb..7a4fbc1 100644 --- a/chrome/browser/apps/speech_recognition_browsertest.cc +++ b/chrome/browser/apps/speech_recognition_browsertest.cc @@ -9,11 +9,11 @@ class SpeechRecognitionTest : public extensions::PlatformAppBrowserTest { public: - SpeechRecognitionTest() {} - virtual ~SpeechRecognitionTest() {} + SpeechRecognitionTest() {} + ~SpeechRecognitionTest() override {} protected: - virtual void SetUp() override { + void SetUp() override { const testing::TestInfo* const test_info = testing::UnitTest::GetInstance()->current_test_info(); // For SpeechRecognitionTest.SpeechFromBackgroundPage test, we need to diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc index f0becdc..0c7ff82 100644 --- a/chrome/browser/apps/web_view_browsertest.cc +++ b/chrome/browser/apps/web_view_browsertest.cc @@ -254,7 +254,7 @@ class MockDownloadWebContentsDelegate : public content::WebContentsDelegate { class WebViewTest : public extensions::PlatformAppBrowserTest { protected: - virtual void SetUp() override { + void SetUp() override { if (UsesFakeSpeech()) { // SpeechRecognition test specific SetUp. fake_speech_recognition_manager_.reset( @@ -268,7 +268,7 @@ class WebViewTest : public extensions::PlatformAppBrowserTest { extensions::PlatformAppBrowserTest::SetUp(); } - virtual void TearDown() override { + void TearDown() override { if (UsesFakeSpeech()) { // SpeechRecognition test specific TearDown. content::SpeechRecognitionManager::SetManagerForTesting(NULL); @@ -2264,8 +2264,8 @@ IN_PROC_BROWSER_TEST_F(WebViewPluginTest, TestLoadPluginEvent) { class WebViewCaptureTest : public WebViewTest { public: WebViewCaptureTest() {} - virtual ~WebViewCaptureTest() {} - virtual void SetUp() override { + ~WebViewCaptureTest() override {} + void SetUp() override { EnablePixelOutput(); WebViewTest::SetUp(); } diff --git a/chrome/browser/autocomplete/bookmark_provider_unittest.cc b/chrome/browser/autocomplete/bookmark_provider_unittest.cc index 6b04b14..78b8a68 100644 --- a/chrome/browser/autocomplete/bookmark_provider_unittest.cc +++ b/chrome/browser/autocomplete/bookmark_provider_unittest.cc @@ -70,7 +70,7 @@ class BookmarkProviderTest : public testing::Test { BookmarkProviderTest(); protected: - virtual void SetUp() override; + void SetUp() override; bookmarks::TestBookmarkClient client_; scoped_ptr<TestingProfile> profile_; diff --git a/chrome/browser/autocomplete/builtin_provider_unittest.cc b/chrome/browser/autocomplete/builtin_provider_unittest.cc index f4d9adb..916c314 100644 --- a/chrome/browser/autocomplete/builtin_provider_unittest.cc +++ b/chrome/browser/autocomplete/builtin_provider_unittest.cc @@ -27,10 +27,10 @@ class BuiltinProviderTest : public testing::Test { }; BuiltinProviderTest() : provider_(NULL) {} - virtual ~BuiltinProviderTest() {} + ~BuiltinProviderTest() override {} - virtual void SetUp() override { provider_ = new BuiltinProvider(); } - virtual void TearDown() override { provider_ = NULL; } + void SetUp() override { provider_ = new BuiltinProvider(); } + void TearDown() override { provider_ = NULL; } void RunTest(const TestData cases[], size_t num_cases) { ACMatches matches; diff --git a/chrome/browser/autocomplete/history_quick_provider_unittest.cc b/chrome/browser/autocomplete/history_quick_provider_unittest.cc index 9f16ddda..a79c1f3 100644 --- a/chrome/browser/autocomplete/history_quick_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_quick_provider_unittest.cc @@ -136,8 +136,8 @@ class HistoryQuickProviderTest : public testing::Test { NULL, NULL, base::Closure()); } - virtual void SetUp(); - virtual void TearDown(); + void SetUp() override; + void TearDown() override; virtual void GetTestData(size_t* data_count, TestURLInfo** test_data); diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc index e0b4f26..ef7a5ec 100644 --- a/chrome/browser/autocomplete/history_url_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc @@ -163,7 +163,7 @@ class HistoryURLProviderTest : public testing::Test, HistoryQuickProvider::set_disabled(true); } - virtual ~HistoryURLProviderTest() { + ~HistoryURLProviderTest() override { HistoryQuickProvider::set_disabled(false); } diff --git a/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc b/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc index 1e4695f..af0000a 100644 --- a/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc +++ b/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc @@ -62,10 +62,10 @@ void ScopedExtensionLoadObserver::OnExtensionInstalled( class KeywordExtensionsDelegateImplTest : public ExtensionServiceTestBase { public: KeywordExtensionsDelegateImplTest() {} - virtual ~KeywordExtensionsDelegateImplTest() {} + ~KeywordExtensionsDelegateImplTest() override {} protected: - virtual void SetUp() override; + void SetUp() override; void RunTest(bool incognito); diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index b77a6de..c4182e8 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_unittest.cc @@ -157,8 +157,8 @@ class SearchProviderTest : public testing::Test, } // See description above class for what this registers. - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; void RunTest(TestData* cases, int num_cases, bool prefer_keyword); diff --git a/chrome/browser/autocomplete/shortcuts_backend_unittest.cc b/chrome/browser/autocomplete/shortcuts_backend_unittest.cc index 2ad0d96..c00916b 100644 --- a/chrome/browser/autocomplete/shortcuts_backend_unittest.cc +++ b/chrome/browser/autocomplete/shortcuts_backend_unittest.cc @@ -35,8 +35,8 @@ class ShortcutsBackendTest : public testing::Test, AutocompleteMatch::Type type = AutocompleteMatchType::URL_WHAT_YOU_TYPED); void SetSearchProvider(); - virtual void SetUp(); - virtual void TearDown(); + void SetUp() override; + void TearDown() override; void OnShortcutsLoaded() override; void OnShortcutsChanged() override; diff --git a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc index c1ee974..ddd543e 100644 --- a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc +++ b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc @@ -260,8 +260,8 @@ class ShortcutsProviderTest : public testing::Test { std::set<ExpectedURLAndAllowedToBeDefault> matches_; }; - virtual void SetUp(); - virtual void TearDown(); + void SetUp() override; + void TearDown() override; // Fills test data into the provider. void FillData(TestShortcutInfo* db, size_t db_size); diff --git a/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc b/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc index 92981cf..63eba96 100644 --- a/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc +++ b/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc @@ -99,8 +99,7 @@ class FakeEmptyTopSites : public history::TopSites { // after top sites have been requested. GetMostVisitedURLsCallback mv_callback; protected: - virtual ~FakeEmptyTopSites() { - } + ~FakeEmptyTopSites() override {} }; void FakeEmptyTopSites::GetMostVisitedURLs( @@ -117,8 +116,8 @@ class ZeroSuggestProviderTest : public testing::Test, public: ZeroSuggestProviderTest(); - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; protected: // AutocompleteProviderListener: diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate_unittest.cc b/chrome/browser/autofill/autofill_cc_infobar_delegate_unittest.cc index 9ecd1d3..2b5e9a4 100644 --- a/chrome/browser/autofill/autofill_cc_infobar_delegate_unittest.cc +++ b/chrome/browser/autofill/autofill_cc_infobar_delegate_unittest.cc @@ -52,10 +52,10 @@ class TestPersonalDataManager : public PersonalDataManager { class AutofillCCInfobarDelegateTest : public ChromeRenderViewHostTestHarness { public: - virtual ~AutofillCCInfobarDelegateTest(); + ~AutofillCCInfobarDelegateTest() override; - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; protected: scoped_ptr<ConfirmInfoBarDelegate> CreateDelegate( diff --git a/chrome/browser/autofill/autofill_interactive_uitest.cc b/chrome/browser/autofill/autofill_interactive_uitest.cc index eabd7dc..c871a26 100644 --- a/chrome/browser/autofill/autofill_interactive_uitest.cc +++ b/chrome/browser/autofill/autofill_interactive_uitest.cc @@ -200,7 +200,7 @@ class AutofillInteractiveTest : public InProcessBrowserTest { key_press_event_sink_( base::Bind(&AutofillInteractiveTest::HandleKeyPressEvent, base::Unretained(this))) {} - virtual ~AutofillInteractiveTest() {} + ~AutofillInteractiveTest() override {} // InProcessBrowserTest: void SetUpOnMainThread() override { diff --git a/chrome/browser/autofill/form_structure_browsertest.cc b/chrome/browser/autofill/form_structure_browsertest.cc index 6cfe560..755d751 100644 --- a/chrome/browser/autofill/form_structure_browsertest.cc +++ b/chrome/browser/autofill/form_structure_browsertest.cc @@ -45,7 +45,7 @@ class FormStructureBrowserTest : public InProcessBrowserTest, public DataDrivenTest { protected: FormStructureBrowserTest(); - virtual ~FormStructureBrowserTest(); + ~FormStructureBrowserTest() override; // DataDrivenTest: void GenerateResults(const std::string& input, std::string* output) override; diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc index 7da2625..ffd65d0 100644 --- a/chrome/browser/background/background_application_list_model_unittest.cc +++ b/chrome/browser/background/background_application_list_model_unittest.cc @@ -47,7 +47,7 @@ class BackgroundApplicationListModelTest : public extensions::ExtensionServiceTestBase { public: BackgroundApplicationListModelTest() {} - virtual ~BackgroundApplicationListModelTest() {} + ~BackgroundApplicationListModelTest() override {} protected: void InitializeAndLoadEmptyExtensionService() { diff --git a/chrome/browser/background/background_contents_service_unittest.cc b/chrome/browser/background/background_contents_service_unittest.cc index a42901c..b76e2e5 100644 --- a/chrome/browser/background/background_contents_service_unittest.cc +++ b/chrome/browser/background/background_contents_service_unittest.cc @@ -41,8 +41,8 @@ class BackgroundContentsServiceTest : public testing::Test { public: BackgroundContentsServiceTest() {} - virtual ~BackgroundContentsServiceTest() {} - virtual void SetUp() { + ~BackgroundContentsServiceTest() override {} + void SetUp() override { command_line_.reset(new CommandLine(CommandLine::NO_PROGRAM)); } @@ -168,10 +168,10 @@ class BackgroundContentsServiceNotificationTest : public BrowserWithTestWindowTest { public: BackgroundContentsServiceNotificationTest() {} - virtual ~BackgroundContentsServiceNotificationTest() {} + ~BackgroundContentsServiceNotificationTest() override {} // Overridden from testing::Test - virtual void SetUp() { + void SetUp() override { BrowserWithTestWindowTest::SetUp(); // In ChromeOS environment, BrowserWithTestWindowTest initializes // MessageCenter. @@ -189,7 +189,7 @@ class BackgroundContentsServiceNotificationTest message_center::MessageCenter::Get(), base::Closure())); } - virtual void TearDown() { + void TearDown() override { g_browser_process->notification_ui_manager()->CancelAll(); profile_manager_.reset(); #if !defined(OS_CHROMEOS) diff --git a/chrome/browser/background/background_mode_manager_unittest.cc b/chrome/browser/background/background_mode_manager_unittest.cc index d8e9930..402917b 100644 --- a/chrome/browser/background/background_mode_manager_unittest.cc +++ b/chrome/browser/background/background_mode_manager_unittest.cc @@ -152,8 +152,8 @@ void AssertBackgroundModeSuspended( class BackgroundModeManagerTest : public testing::Test { public: BackgroundModeManagerTest() {} - virtual ~BackgroundModeManagerTest() {} - virtual void SetUp() override { + ~BackgroundModeManagerTest() override {} + void SetUp() override { command_line_.reset(new CommandLine(CommandLine::NO_PROGRAM)); profile_manager_ = CreateTestingProfileManager(); profile_ = profile_manager_->CreateTestingProfile("p1"); @@ -201,8 +201,8 @@ class BackgroundModeManagerWithExtensionsTest : public BackgroundModeManagerTest { public: BackgroundModeManagerWithExtensionsTest() {} - virtual ~BackgroundModeManagerWithExtensionsTest() {} - virtual void SetUp() override { + ~BackgroundModeManagerWithExtensionsTest() override {} + void SetUp() override { BackgroundModeManagerTest::SetUp(); // Aura clears notifications from the message center at shutdown. message_center::MessageCenter::Initialize(); @@ -226,7 +226,7 @@ class BackgroundModeManagerWithExtensionsTest manager_->RegisterProfile(profile_); } - virtual void TearDown() { + void TearDown() override { // Clean up the status icon. If this is not done before profile deletes, // the context menu updates will DCHECK with the now deleted profiles. StatusIcon* status_icon = manager_->status_icon_; diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc b/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc index 26aaa48..f77797d 100644 --- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc +++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc @@ -71,7 +71,7 @@ class BitmapFetcherTestDelegate : public BitmapFetcherDelegate { class BitmapFetcherBrowserTest : public InProcessBrowserTest { public: - virtual void SetUp() override { + void SetUp() override { url_fetcher_factory_.reset( new net::FakeURLFetcherFactory(&url_fetcher_impl_factory_)); InProcessBrowserTest::SetUp(); diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_unittest.cc b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_unittest.cc index 7d395aa..6468b8a 100644 --- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_unittest.cc +++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_unittest.cc @@ -48,7 +48,7 @@ class TestService : public BitmapFetcherService { class BitmapFetcherServiceTest : public testing::Test, public TestNotificationInterface { public: - virtual void SetUp() override { + void SetUp() override { service_.reset(new TestService(&profile_)); requestsFinished_ = 0; imagesChanged_ = 0; diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc index ec3eb52..9ad9c49 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc @@ -48,7 +48,7 @@ void MakeTestSkBitmap(int w, int h, SkBitmap* bmp) { class BookmarkHTMLWriterTest : public testing::Test { protected: - virtual void SetUp() { + void SetUp() override { testing::Test::SetUp(); ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); path_ = temp_dir_.path().AppendASCII("bookmarks.html"); diff --git a/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc b/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc index de4b23e..93d1ffb 100644 --- a/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc +++ b/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc @@ -30,9 +30,9 @@ using testing::_; class ChromeBookmarkClientTest : public testing::Test { public: ChromeBookmarkClientTest() : client_(NULL), model_(NULL) {} - virtual ~ChromeBookmarkClientTest() {} + ~ChromeBookmarkClientTest() override {} - virtual void SetUp() override { + void SetUp() override { prefs_ = profile_.GetTestingPrefService(); ASSERT_FALSE(prefs_->HasPrefPath(bookmarks::prefs::kManagedBookmarks)); @@ -46,9 +46,7 @@ class ChromeBookmarkClientTest : public testing::Test { EXPECT_NE(-1, model_->root_node()->GetIndexOf(client_->managed_node())); } - virtual void TearDown() override { - model_->RemoveObserver(&observer_); - } + void TearDown() override { model_->RemoveObserver(&observer_); } void ResetModel() { profile_.CreateBookmarkModel(false); diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h index d66c403..92e8fae3 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -120,7 +120,7 @@ class BrowserProcessImpl : public BrowserProcess, override; #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - virtual void StartAutoupdateTimer() override; + void StartAutoupdateTimer() override; #endif ChromeNetLog* net_log() override; diff --git a/chrome/browser/browsing_data/browsing_data_channel_id_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_channel_id_helper_unittest.cc index 4ca5b99..13c1a78 100644 --- a/chrome/browser/browsing_data/browsing_data_channel_id_helper_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_channel_id_helper_unittest.cc @@ -23,13 +23,13 @@ class BrowsingDataChannelIDHelperTest BrowsingDataChannelIDHelperTest() : ssl_config_changed_count_(0) { } - virtual void SetUp() override { + void SetUp() override { testing_profile_.reset(new TestingProfile()); testing_profile_->GetSSLConfigService()->AddObserver(this); } - virtual void TearDown() override { + void TearDown() override { testing_profile_->GetSSLConfigService()->RemoveObserver(this); } diff --git a/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc index 68d1125..2e1298b 100644 --- a/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc @@ -64,7 +64,7 @@ class BrowsingDataCookieHelperTest : public testing::Test { : testing_profile_(new TestingProfile()) { } - virtual void SetUp() override { cookie_expectations_.clear(); } + void SetUp() override { cookie_expectations_.clear(); } // Adds an expectation for a cookie that satisfies the given parameters. void AddCookieExpectation(const char* source, diff --git a/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc index 4708f46..f672d90 100644 --- a/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc @@ -70,7 +70,7 @@ class BrowsingDataFileSystemHelperTest : public testing::Test { base::MessageLoop::current()->RunUntilIdle(); canned_helper_ = new CannedBrowsingDataFileSystemHelper(profile_.get()); } - virtual ~BrowsingDataFileSystemHelperTest() { + ~BrowsingDataFileSystemHelperTest() override { // Avoid memory leaks. profile_.reset(); base::MessageLoop::current()->RunUntilIdle(); diff --git a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc index d5cecde..55e5e35 100644 --- a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc @@ -36,7 +36,7 @@ const int kUnprotected = BrowsingDataHelper::UNPROTECTED_WEB; class BrowsingDataHelperTest : public testing::Test { public: BrowsingDataHelperTest() {} - virtual ~BrowsingDataHelperTest() {} + ~BrowsingDataHelperTest() override {} bool IsWebScheme(const std::string& scheme) { GURL test(scheme + "://example.com"); diff --git a/chrome/browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc index b6d5f13..fe5a4d6 100644 --- a/chrome/browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc @@ -16,7 +16,7 @@ namespace { class CannedBrowsingDataIndexedDBHelperTest : public testing::Test { public: - virtual void SetUp() override { + void SetUp() override { IndexedDBContext()->SetTaskRunnerForTesting( base::MessageLoopProxy::current().get()); } diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc index 0c4bd48..5f9d17d 100644 --- a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc @@ -30,9 +30,9 @@ class BrowsingDataQuotaHelperTest : public testing::Test { quota_(-1), weak_factory_(this) {} - virtual ~BrowsingDataQuotaHelperTest() {} + ~BrowsingDataQuotaHelperTest() override {} - virtual void SetUp() override { + void SetUp() override { EXPECT_TRUE(dir_.CreateUniqueTempDir()); quota_manager_ = new storage::QuotaManager( false, @@ -46,7 +46,7 @@ class BrowsingDataQuotaHelperTest : public testing::Test { quota_manager_.get()); } - virtual void TearDown() override { + void TearDown() override { helper_ = NULL; quota_manager_ = NULL; quota_info_.clear(); diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc index 42fd466..e8b895d 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc @@ -703,10 +703,9 @@ class BrowsingDataRemoverTest : public testing::Test, content::Source<Profile>(profile_.get())); } - virtual ~BrowsingDataRemoverTest() { - } + ~BrowsingDataRemoverTest() override {} - virtual void TearDown() { + void TearDown() override { #if defined(ENABLE_EXTENSIONS) mock_policy_ = NULL; #endif diff --git a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc index 2e9c1bd..4f096de 100644 --- a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc +++ b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc @@ -42,7 +42,7 @@ namespace { class CookiesTreeModelTest : public testing::Test { public: - virtual ~CookiesTreeModelTest() { + ~CookiesTreeModelTest() override { // Avoid memory leaks. #if defined(ENABLE_EXTENSIONS) special_storage_policy_ = NULL; @@ -51,7 +51,7 @@ class CookiesTreeModelTest : public testing::Test { base::MessageLoop::current()->RunUntilIdle(); } - virtual void SetUp() override { + void SetUp() override { profile_.reset(new TestingProfile()); mock_browsing_data_cookie_helper_ = new MockBrowsingDataCookieHelper(profile_->GetRequestContext()); @@ -85,7 +85,7 @@ class CookiesTreeModelTest : public testing::Test { #endif } - virtual void TearDown() override { + void TearDown() override { mock_browsing_data_service_worker_helper_ = NULL; mock_browsing_data_channel_id_helper_ = NULL; mock_browsing_data_quota_helper_ = NULL; diff --git a/chrome/browser/captive_portal/captive_portal_service_unittest.cc b/chrome/browser/captive_portal/captive_portal_service_unittest.cc index af6a487..0215ae0 100644 --- a/chrome/browser/captive_portal/captive_portal_service_unittest.cc +++ b/chrome/browser/captive_portal/captive_portal_service_unittest.cc @@ -90,7 +90,7 @@ class CaptivePortalServiceTest : public testing::Test, CaptivePortalService::get_state_for_testing()) { } - virtual ~CaptivePortalServiceTest() { + ~CaptivePortalServiceTest() override { CaptivePortalService::set_state_for_testing( old_captive_portal_testing_state_); } diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc index 5a44cbf..962ba28 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc +++ b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc @@ -70,15 +70,15 @@ class CaptivePortalTabHelperTest : public ChromeRenderViewHostTestHarness { mock_reloader_(new testing::StrictMock<MockCaptivePortalTabReloader>) { tab_helper_.SetTabReloaderForTest(mock_reloader_); } - virtual ~CaptivePortalTabHelperTest() {} + ~CaptivePortalTabHelperTest() override {} - virtual void SetUp() override { + void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); web_contents1_.reset(CreateTestWebContents()); web_contents2_.reset(CreateTestWebContents()); } - virtual void TearDown() override { + void TearDown() override { web_contents2_.reset(NULL); web_contents1_.reset(NULL); ChromeRenderViewHostTestHarness::TearDown(); diff --git a/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc b/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc index ccbcd03..cf86439 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc +++ b/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc @@ -85,7 +85,7 @@ class MockInterstitialPageDelegate : public content::InterstitialPageDelegate { class CaptivePortalTabReloaderTest : public ChromeRenderViewHostTestHarness { public: // testing::Test: - virtual void SetUp() override { + void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); tab_reloader_.reset(new testing::StrictMock<TestCaptivePortalTabReloader>( web_contents())); @@ -94,7 +94,7 @@ class CaptivePortalTabReloaderTest : public ChromeRenderViewHostTestHarness { tab_reloader_->set_slow_ssl_load_time(base::TimeDelta()); } - virtual void TearDown() override { + void TearDown() override { EXPECT_FALSE(tab_reloader().TimerRunning()); tab_reloader_.reset(NULL); ChromeRenderViewHostTestHarness::TearDown(); diff --git a/chrome/browser/chrome_browser_main_extra_parts_x11.h b/chrome/browser/chrome_browser_main_extra_parts_x11.h index 9c183c3..80c6a80 100644 --- a/chrome/browser/chrome_browser_main_extra_parts_x11.h +++ b/chrome/browser/chrome_browser_main_extra_parts_x11.h @@ -14,13 +14,13 @@ class ChromeBrowserMainExtraPartsX11 : public ChromeBrowserMainExtraParts { public: ChromeBrowserMainExtraPartsX11(); - virtual ~ChromeBrowserMainExtraPartsX11(); + ~ChromeBrowserMainExtraPartsX11() override; private: // ChromeBrowserMainExtraParts overrides. - virtual void PreEarlyInitialization() override; - virtual void PostMainMessageLoopStart() override; - virtual void PostMainMessageLoopRun() override; + void PreEarlyInitialization() override; + void PostMainMessageLoopStart() override; + void PostMainMessageLoopRun() override; DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsX11); }; diff --git a/chrome/browser/chrome_browser_main_linux.h b/chrome/browser/chrome_browser_main_linux.h index e70f2fc..aa9ff2f 100644 --- a/chrome/browser/chrome_browser_main_linux.h +++ b/chrome/browser/chrome_browser_main_linux.h @@ -14,12 +14,12 @@ class ChromeBrowserMainPartsLinux : public ChromeBrowserMainPartsPosix { public: explicit ChromeBrowserMainPartsLinux( const content::MainFunctionParams& parameters); - virtual ~ChromeBrowserMainPartsLinux(); + ~ChromeBrowserMainPartsLinux() override; // ChromeBrowserMainParts overrides. - virtual void ToolkitInitialized() override; - virtual void PreProfileInit() override; - virtual void PostProfileInit() override; + void ToolkitInitialized() override; + void PreProfileInit() override; + void PostProfileInit() override; private: DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsLinux); diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h index 161a2a1..93a22cc 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h @@ -262,7 +262,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { int render_process_id) override; #if defined(OS_POSIX) && !defined(OS_MACOSX) - virtual void GetAdditionalMappedFilesForChildProcess( + void GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, content::FileDescriptorInfo* mappings) override; diff --git a/chrome/browser/chrome_content_browser_client_unittest.cc b/chrome/browser/chrome_content_browser_client_unittest.cc index 3ff767c..9d9dbeb 100644 --- a/chrome/browser/chrome_content_browser_client_unittest.cc +++ b/chrome/browser/chrome_content_browser_client_unittest.cc @@ -40,7 +40,7 @@ class DisableWebRtcEncryptionFlagTest : public testing::Test { to_command_line_(CommandLine::NO_PROGRAM) {} protected: - virtual void SetUp() { + void SetUp() override { from_command_line_.AppendSwitch(switches::kDisableWebRtcEncryption); } @@ -93,7 +93,7 @@ namespace content { class InstantNTPURLRewriteTest : public BrowserWithTestWindowTest { protected: - virtual void SetUp() override { + void SetUp() override { BrowserWithTestWindowTest::SetUp(); field_trial_list_.reset(new base::FieldTrialList( new metrics::SHA1EntropyProvider("42"))); diff --git a/chrome/browser/chrome_security_exploit_browsertest.cc b/chrome/browser/chrome_security_exploit_browsertest.cc index 46ece3a..c294775 100644 --- a/chrome/browser/chrome_security_exploit_browsertest.cc +++ b/chrome/browser/chrome_security_exploit_browsertest.cc @@ -28,7 +28,7 @@ class ChromeSecurityExploitBrowserTest : public InProcessBrowserTest { public: ChromeSecurityExploitBrowserTest() {} - virtual ~ChromeSecurityExploitBrowserTest() {} + ~ChromeSecurityExploitBrowserTest() override {} void SetUpCommandLine(CommandLine* command_line) override { ASSERT_TRUE(test_server()->Start()); diff --git a/chrome/browser/component_updater/test/cld_component_installer_unittest.cc b/chrome/browser/component_updater/test/cld_component_installer_unittest.cc index 359ff7d..0f10ac8 100644 --- a/chrome/browser/component_updater/test/cld_component_installer_unittest.cc +++ b/chrome/browser/component_updater/test/cld_component_installer_unittest.cc @@ -33,7 +33,7 @@ namespace component_updater { class CldComponentInstallerTest : public PlatformTest { public: CldComponentInstallerTest() {} - virtual void SetUp() override { + void SetUp() override { PlatformTest::SetUp(); // ScopedTempDir automatically does a recursive delete on the entire diff --git a/chrome/browser/component_updater/test/component_updater_service_unittest.h b/chrome/browser/component_updater/test/component_updater_service_unittest.h index fec1d10..23b571a 100644 --- a/chrome/browser/component_updater/test/component_updater_service_unittest.h +++ b/chrome/browser/component_updater/test/component_updater_service_unittest.h @@ -40,11 +40,11 @@ class ComponentUpdaterTest : public testing::Test { ComponentUpdaterTest(); - virtual ~ComponentUpdaterTest(); + ~ComponentUpdaterTest() override; - virtual void SetUp(); + void SetUp() override; - virtual void TearDown(); + void TearDown() override; ComponentUpdateService* component_updater(); diff --git a/chrome/browser/content_settings/content_settings_default_provider_unittest.cc b/chrome/browser/content_settings/content_settings_default_provider_unittest.cc index c28b6d6..3b97b93 100644 --- a/chrome/browser/content_settings/content_settings_default_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_default_provider_unittest.cc @@ -21,9 +21,7 @@ class DefaultProviderTest : public testing::Test { DefaultProviderTest() : provider_(profile_.GetPrefs(), false) { } - virtual ~DefaultProviderTest() { - provider_.ShutdownOnUIThread(); - } + ~DefaultProviderTest() override { provider_.ShutdownOnUIThread(); } protected: TestingProfile profile_; diff --git a/chrome/browser/content_settings/permission_context_base_unittest.cc b/chrome/browser/content_settings/permission_context_base_unittest.cc index 70a794e..51983af 100644 --- a/chrome/browser/content_settings/permission_context_base_unittest.cc +++ b/chrome/browser/content_settings/permission_context_base_unittest.cc @@ -21,11 +21,11 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness { protected: PermissionContextBaseTests() {} - virtual ~PermissionContextBaseTests() {} + ~PermissionContextBaseTests() override {} private: // ChromeRenderViewHostTestHarness: - virtual void SetUp() override { + void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); InfoBarService::CreateForWebContents(web_contents()); } diff --git a/chrome/browser/content_settings/permission_queue_controller_unittest.cc b/chrome/browser/content_settings/permission_queue_controller_unittest.cc index 83ef33e..d21cd9b 100644 --- a/chrome/browser/content_settings/permission_queue_controller_unittest.cc +++ b/chrome/browser/content_settings/permission_queue_controller_unittest.cc @@ -21,7 +21,7 @@ class PermissionQueueControllerTests : public ChromeRenderViewHostTestHarness { protected: PermissionQueueControllerTests() {} - virtual ~PermissionQueueControllerTests() {} + ~PermissionQueueControllerTests() override {} PermissionRequestID RequestID(int bridge_id) { return PermissionRequestID( @@ -33,7 +33,7 @@ class PermissionQueueControllerTests : public ChromeRenderViewHostTestHarness { private: // ChromeRenderViewHostTestHarness: - virtual void SetUp() override { + void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); InfoBarService::CreateForWebContents(web_contents()); } diff --git a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc index d3a18b6..53175eb 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc @@ -38,7 +38,7 @@ class MockSiteDataObserver class TabSpecificContentSettingsTest : public ChromeRenderViewHostTestHarness { public: - virtual void SetUp() override { + void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); TabSpecificContentSettings::CreateForWebContents(web_contents()); } diff --git a/chrome/browser/copresence/chrome_whispernet_client_browsertest.cc b/chrome/browser/copresence/chrome_whispernet_client_browsertest.cc index 0384bb5..c981a5b 100644 --- a/chrome/browser/copresence/chrome_whispernet_client_browsertest.cc +++ b/chrome/browser/copresence/chrome_whispernet_client_browsertest.cc @@ -52,7 +52,7 @@ class ChromeWhispernetClientTest : public ExtensionBrowserTest { public: ChromeWhispernetClientTest() : context_(NULL), initialized_(false) {} - virtual ~ChromeWhispernetClientTest() {} + ~ChromeWhispernetClientTest() override {} void InitializeWhispernet() { context_ = browser()->profile(); diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc index e28c034..ab54350 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc @@ -390,7 +390,7 @@ class ProtocolHandlerRegistryTest : public testing::Test { // Registry owns the delegate_ it handles deletion of that object. } - virtual void SetUp() { + void SetUp() override { profile_.reset(new TestingProfile()); CHECK(profile_->GetPrefs()); SetUpRegistry(true); @@ -398,9 +398,7 @@ class ProtocolHandlerRegistryTest : public testing::Test { CreateProtocolHandler("test", GURL("http://test.com/%s")); } - virtual void TearDown() { - TeadDownRegistry(); - } + void TearDown() override { TeadDownRegistry(); } TestMessageLoop loop_; diff --git a/chrome/browser/diagnostics/diagnostics_controller_unittest.cc b/chrome/browser/diagnostics/diagnostics_controller_unittest.cc index 3377c9b..617cc4e 100644 --- a/chrome/browser/diagnostics/diagnostics_controller_unittest.cc +++ b/chrome/browser/diagnostics/diagnostics_controller_unittest.cc @@ -26,9 +26,9 @@ class DiagnosticsControllerTest : public testing::Test { protected: DiagnosticsControllerTest() : cmdline_(CommandLine::NO_PROGRAM) {} - virtual ~DiagnosticsControllerTest() {} + ~DiagnosticsControllerTest() override {} - virtual void SetUp() { + void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); base::FilePath test_data; PathService::Get(chrome::DIR_TEST_DATA, &test_data); @@ -54,7 +54,7 @@ class DiagnosticsControllerTest : public testing::Test { // writer_.reset(new DiagnosticsWriter(DiagnosticsWriter::MACHINE)); } - virtual void TearDown() { + void TearDown() override { DiagnosticsController::GetInstance()->ClearResults(); #if defined(OS_CHROMEOS) PathService::Override(base::DIR_HOME, old_home_dir_); diff --git a/chrome/browser/diagnostics/diagnostics_model_unittest.cc b/chrome/browser/diagnostics/diagnostics_model_unittest.cc index af40f35..dd1ce5a 100644 --- a/chrome/browser/diagnostics/diagnostics_model_unittest.cc +++ b/chrome/browser/diagnostics/diagnostics_model_unittest.cc @@ -18,16 +18,14 @@ class DiagnosticsModelTest : public testing::Test { : cmdline_(CommandLine::NO_PROGRAM) { } - virtual ~DiagnosticsModelTest() { } + ~DiagnosticsModelTest() override {} - virtual void SetUp() { + void SetUp() override { model_.reset(MakeDiagnosticsModel(cmdline_)); ASSERT_TRUE(model_.get() != NULL); } - virtual void TearDown() { - model_.reset(); - } + void TearDown() override { model_.reset(); } scoped_ptr<DiagnosticsModel> model_; CommandLine cmdline_; diff --git a/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc b/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc index c3f2261..bc85063 100644 --- a/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc +++ b/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc @@ -80,7 +80,7 @@ ArticleEntry CreateEntry(std::string entry_id, std::string page_url) { class DomDistillerViewerSourceBrowserTest : public InProcessBrowserTest { public: DomDistillerViewerSourceBrowserTest() {} - virtual ~DomDistillerViewerSourceBrowserTest() {} + ~DomDistillerViewerSourceBrowserTest() override {} void SetUpOnMainThread() override { database_model_ = new FakeDB<ArticleEntry>::EntryMap; diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc index 7333ecd..fdda636 100644 --- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc +++ b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc @@ -127,8 +127,8 @@ class ChromeDownloadManagerDelegateTest ChromeDownloadManagerDelegateTest(); // ::testing::Test - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; // Verifies and clears test expectations for |delegate_| and // |download_manager_|. diff --git a/chrome/browser/download/download_danger_prompt_browsertest.cc b/chrome/browser/download/download_danger_prompt_browsertest.cc index 2b2b57c..d0ba0fa 100644 --- a/chrome/browser/download/download_danger_prompt_browsertest.cc +++ b/chrome/browser/download/download_danger_prompt_browsertest.cc @@ -32,8 +32,7 @@ class DownloadDangerPromptTest : public InProcessBrowserTest { did_receive_callback_(false) { } - virtual ~DownloadDangerPromptTest() { - } + ~DownloadDangerPromptTest() override {} // Opens a new tab and waits for navigations to finish. If there are pending // navigations, the constrained prompt might be dismissed when the navigation diff --git a/chrome/browser/download/download_dir_policy_handler_unittest.cc b/chrome/browser/download/download_dir_policy_handler_unittest.cc index 593cda4..2718f13 100644 --- a/chrome/browser/download/download_dir_policy_handler_unittest.cc +++ b/chrome/browser/download/download_dir_policy_handler_unittest.cc @@ -45,7 +45,7 @@ std::string GetExpectedDownloadDirectory() { class DownloadDirPolicyHandlerTest : public policy::ConfigurationPolicyPrefStoreTest { public: - virtual void SetUp() override { + void SetUp() override { recommended_store_ = new policy::ConfigurationPolicyPrefStore( policy_service_.get(), &handler_list_, diff --git a/chrome/browser/download/download_history_unittest.cc b/chrome/browser/download/download_history_unittest.cc index 608029a1..e11d0a8 100644 --- a/chrome/browser/download/download_history_unittest.cc +++ b/chrome/browser/download/download_history_unittest.cc @@ -203,14 +203,10 @@ class DownloadHistoryTest : public testing::Test { history_(NULL), manager_observer_(NULL), download_created_index_(0) {} - virtual ~DownloadHistoryTest() { - STLDeleteElements(&items_); - } + ~DownloadHistoryTest() override { STLDeleteElements(&items_); } protected: - virtual void TearDown() override { - download_history_.reset(); - } + void TearDown() override { download_history_.reset(); } content::MockDownloadManager& manager() { return *manager_.get(); } content::MockDownloadItem& item(size_t index) { return *items_[index]; } diff --git a/chrome/browser/download/download_path_reservation_tracker_unittest.cc b/chrome/browser/download/download_path_reservation_tracker_unittest.cc index 49e7e12..902efcb 100644 --- a/chrome/browser/download/download_path_reservation_tracker_unittest.cc +++ b/chrome/browser/download/download_path_reservation_tracker_unittest.cc @@ -32,8 +32,8 @@ class DownloadPathReservationTrackerTest : public testing::Test { DownloadPathReservationTrackerTest(); // testing::Test - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; MockDownloadItem* CreateDownloadItem(int32 id); base::FilePath GetPathInDownloadsDirectory( diff --git a/chrome/browser/download/download_query_unittest.cc b/chrome/browser/download/download_query_unittest.cc index 232e416..61e68c9 100644 --- a/chrome/browser/download/download_query_unittest.cc +++ b/chrome/browser/download/download_query_unittest.cc @@ -45,11 +45,9 @@ class DownloadQueryTest : public testing::Test { public: DownloadQueryTest() {} - virtual ~DownloadQueryTest() {} + ~DownloadQueryTest() override {} - virtual void TearDown() { - STLDeleteElements(&mocks_); - } + void TearDown() override { STLDeleteElements(&mocks_); } void CreateMocks(int count) { for (int i = 0; i < count; ++i) { diff --git a/chrome/browser/download/download_request_limiter_unittest.cc b/chrome/browser/download/download_request_limiter_unittest.cc index 19931c0..efad225 100644 --- a/chrome/browser/download/download_request_limiter_unittest.cc +++ b/chrome/browser/download/download_request_limiter_unittest.cc @@ -60,7 +60,7 @@ class DownloadRequestLimiterTest : public ChromeRenderViewHostTestHarness { WAIT }; - virtual void SetUp() { + void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); InfoBarService::CreateForWebContents(web_contents()); @@ -106,7 +106,7 @@ class DownloadRequestLimiterTest : public ChromeRenderViewHostTestHarness { } } - virtual void TearDown() { + void TearDown() override { content_settings_->ShutdownOnUIThread(); content_settings_ = NULL; UnsetDelegate(); diff --git a/chrome/browser/download/download_shelf_unittest.cc b/chrome/browser/download/download_shelf_unittest.cc index a1b86fc..6311536 100644 --- a/chrome/browser/download/download_shelf_unittest.cc +++ b/chrome/browser/download/download_shelf_unittest.cc @@ -48,12 +48,12 @@ class DownloadShelfTest : public testing::Test { } Profile* profile() { return profile_.get(); } - virtual void SetUp() override { + void SetUp() override { DownloadServiceFactory::GetInstance()->SetTestingFactory( profile(), &CreateDownloadService); } - virtual void TearDown() override { + void TearDown() override { DownloadServiceFactory::GetInstance()->SetTestingFactory( profile(), NULL); } diff --git a/chrome/browser/download/download_status_updater_unittest.cc b/chrome/browser/download/download_status_updater_unittest.cc index 0e22ea9..0a83cb8 100644 --- a/chrome/browser/download/download_status_updater_unittest.cc +++ b/chrome/browser/download/download_status_updater_unittest.cc @@ -50,7 +50,7 @@ class DownloadStatusUpdaterTest : public testing::Test { : updater_(new TestDownloadStatusUpdater()), ui_thread_(content::BrowserThread::UI, &loop_) {} - virtual ~DownloadStatusUpdaterTest() { + ~DownloadStatusUpdaterTest() override { for (size_t mgr_idx = 0; mgr_idx < managers_.size(); ++mgr_idx) { EXPECT_CALL(*Manager(mgr_idx), RemoveObserver(_)); } diff --git a/chrome/browser/download/download_ui_controller_unittest.cc b/chrome/browser/download/download_ui_controller_unittest.cc index c909e88..59aa68b 100644 --- a/chrome/browser/download/download_ui_controller_unittest.cc +++ b/chrome/browser/download/download_ui_controller_unittest.cc @@ -87,7 +87,7 @@ class DownloadUIControllerTest : public ChromeRenderViewHostTestHarness { protected: // testing::Test - virtual void SetUp() override; + void SetUp() override; // Returns a TestDelegate. Invoking OnNewDownloadReady on the returned // delegate results in the DownloadItem* being stored in |notified_item_|. diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index c2d95a6..de4dbf1 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc @@ -273,10 +273,10 @@ class SavePackageFinishedObserver : public content::DownloadManager::Observer { class SavePageBrowserTest : public InProcessBrowserTest { public: SavePageBrowserTest() {} - virtual ~SavePageBrowserTest(); + ~SavePageBrowserTest() override; protected: - virtual void SetUp() override { + void SetUp() override { ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir_)); ASSERT_TRUE(save_dir_.CreateUniqueTempDir()); InProcessBrowserTest::SetUp(); @@ -748,7 +748,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, CleanFilenameFromPageTitle) { class SavePageAsMHTMLBrowserTest : public SavePageBrowserTest { public: SavePageAsMHTMLBrowserTest() {} - virtual ~SavePageAsMHTMLBrowserTest(); + ~SavePageAsMHTMLBrowserTest() override; void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kSavePageAsMHTML); } diff --git a/chrome/browser/drive/drive_app_registry_unittest.cc b/chrome/browser/drive/drive_app_registry_unittest.cc index 71e8fbe..6402176 100644 --- a/chrome/browser/drive/drive_app_registry_unittest.cc +++ b/chrome/browser/drive/drive_app_registry_unittest.cc @@ -40,7 +40,7 @@ class TestDriveAppRegistryObserver : public DriveAppRegistryObserver { class DriveAppRegistryTest : public testing::Test { protected: - virtual void SetUp() override { + void SetUp() override { fake_drive_service_.reset(new FakeDriveService); fake_drive_service_->LoadAppListForDriveApi("drive/applist.json"); diff --git a/chrome/browser/drive/drive_uploader_unittest.cc b/chrome/browser/drive/drive_uploader_unittest.cc index 4c3de22..8b160d6 100644 --- a/chrome/browser/drive/drive_uploader_unittest.cc +++ b/chrome/browser/drive/drive_uploader_unittest.cc @@ -304,9 +304,7 @@ class MockDriveServiceNoConnectionAtGetUploadStatus : public DummyDriveService { class DriveUploaderTest : public testing::Test { public: - virtual void SetUp() override { - ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); - } + void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); } protected: content::TestBrowserThreadBundle thread_bundle_; diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc index f4eae6f..dcab17d 100644 --- a/chrome/browser/errorpage_browsertest.cc +++ b/chrome/browser/errorpage_browsertest.cc @@ -293,7 +293,7 @@ class ErrorPageTest : public InProcessBrowserTest { }; ErrorPageTest() : link_doctor_interceptor_(NULL) {} - virtual ~ErrorPageTest() {} + ~ErrorPageTest() override {} // Navigates the active tab to a mock url created for the file at |file_path|. // Needed for StaleCacheStatus and StaleCacheStatusFailedCorrections tests. diff --git a/chrome/browser/external_protocol/external_protocol_handler_unittest.cc b/chrome/browser/external_protocol/external_protocol_handler_unittest.cc index 4518b75..1aac925 100644 --- a/chrome/browser/external_protocol/external_protocol_handler_unittest.cc +++ b/chrome/browser/external_protocol/external_protocol_handler_unittest.cc @@ -103,11 +103,9 @@ class ExternalProtocolHandlerTest : public testing::Test { : ui_thread_(BrowserThread::UI, base::MessageLoop::current()), file_thread_(BrowserThread::FILE) {} - virtual void SetUp() { - file_thread_.Start(); - } + void SetUp() override { file_thread_.Start(); } - virtual void TearDown() { + void TearDown() override { // Ensure that g_accept_requests gets set back to true after test execution. ExternalProtocolHandler::PermitLaunchUrl(); } diff --git a/chrome/browser/favicon/favicon_handler_unittest.cc b/chrome/browser/favicon/favicon_handler_unittest.cc index bc5c27d..f0e2f24 100644 --- a/chrome/browser/favicon/favicon_handler_unittest.cc +++ b/chrome/browser/favicon/favicon_handler_unittest.cc @@ -401,8 +401,7 @@ class FaviconHandlerTest : public ChromeRenderViewHostTestHarness { FaviconHandlerTest() { } - virtual ~FaviconHandlerTest() { - } + ~FaviconHandlerTest() override {} // Simulates requesting a favicon for |page_url| given: // - We have not previously cached anything in history for |page_url| or for @@ -447,7 +446,7 @@ class FaviconHandlerTest : public ChromeRenderViewHostTestHarness { favicon_handler->OnUpdateFaviconURL(candidate_icons); } - virtual void SetUp() { + void SetUp() override { // The score computed by SelectFaviconFrames() is dependent on the supported // scale factors of the platform. It is used for determining the goodness of // a downloaded bitmap in FaviconHandler::OnDidDownloadFavicon(). @@ -461,7 +460,7 @@ class FaviconHandlerTest : public ChromeRenderViewHostTestHarness { ChromeRenderViewHostTestHarness::SetUp(); } - virtual void TearDown() override { + void TearDown() override { Profile* profile = Profile::FromBrowserContext( web_contents()->GetBrowserContext()); FaviconServiceFactory::GetInstance()->SetTestingFactory( diff --git a/chrome/browser/file_select_helper_unittest.cc b/chrome/browser/file_select_helper_unittest.cc index 9c5fbe9..9ab79db 100644 --- a/chrome/browser/file_select_helper_unittest.cc +++ b/chrome/browser/file_select_helper_unittest.cc @@ -18,7 +18,7 @@ class FileSelectHelperTest : public testing::Test { FileSelectHelperTest() {} protected: - virtual void SetUp() override { + void SetUp() override { ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_dir_)); data_dir_ = data_dir_.AppendASCII("file_select_helper"); ASSERT_TRUE(base::PathExists(data_dir_)); diff --git a/chrome/browser/first_run/first_run_browsertest.cc b/chrome/browser/first_run/first_run_browsertest.cc index d28a41c..71dd363 100644 --- a/chrome/browser/first_run/first_run_browsertest.cc +++ b/chrome/browser/first_run/first_run_browsertest.cc @@ -83,7 +83,7 @@ class FirstRunMasterPrefsBrowserTestBase : public InProcessBrowserTest { FirstRunMasterPrefsBrowserTestBase() {} protected: - virtual void SetUp() override { + void SetUp() override { // All users of this test class need to call SetMasterPreferencesForTest() // before this class' SetUp() is invoked. ASSERT_TRUE(text_.get()); @@ -96,7 +96,7 @@ class FirstRunMasterPrefsBrowserTestBase : public InProcessBrowserTest { InProcessBrowserTest::SetUp(); } - virtual void TearDown() override { + void TearDown() override { EXPECT_TRUE(base::DeleteFile(prefs_file_, false)); InProcessBrowserTest::TearDown(); } diff --git a/chrome/browser/first_run/first_run_unittest.cc b/chrome/browser/first_run/first_run_unittest.cc index 8b692e8..ea82a72 100644 --- a/chrome/browser/first_run/first_run_unittest.cc +++ b/chrome/browser/first_run/first_run_unittest.cc @@ -19,7 +19,7 @@ namespace first_run { class FirstRunTest : public testing::Test { protected: FirstRunTest() : user_data_dir_override_(chrome::DIR_USER_DATA) {} - virtual ~FirstRunTest() {} + ~FirstRunTest() override {} private: base::ScopedPathOverride user_data_dir_override_; diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index a28c6e5..1b989fa 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -242,7 +242,7 @@ class GeolocationBrowserTest : public InProcessBrowserTest { }; GeolocationBrowserTest(); - virtual ~GeolocationBrowserTest(); + ~GeolocationBrowserTest() override; // InProcessBrowserTest: void SetUpOnMainThread() override; diff --git a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc index 7ecd357..282a808 100644 --- a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc +++ b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc @@ -105,8 +105,8 @@ class GeolocationPermissionContextTests : public ChromeRenderViewHostTestHarness { protected: // ChromeRenderViewHostTestHarness: - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; PermissionRequestID RequestID(int bridge_id); PermissionRequestID RequestIDForTab(int tab, int bridge_id); diff --git a/chrome/browser/google/google_search_counter_unittest.cc b/chrome/browser/google/google_search_counter_unittest.cc index faee2ef..a2a0625 100644 --- a/chrome/browser/google/google_search_counter_unittest.cc +++ b/chrome/browser/google/google_search_counter_unittest.cc @@ -25,11 +25,11 @@ class MockSearchMetrics : public GoogleSearchMetrics { class GoogleSearchCounterTest : public testing::Test { protected: GoogleSearchCounterTest(); - virtual ~GoogleSearchCounterTest(); + ~GoogleSearchCounterTest() override; // testing::Test - virtual void SetUp(); - virtual void TearDown(); + void SetUp() override; + void TearDown() override; // Test if |url| is a Google search for specific types. When |is_omnibox| is // true, this method will append Omnibox identifiers to the simulated URL diff --git a/chrome/browser/google/google_update_settings_unittest.cc b/chrome/browser/google/google_update_settings_unittest.cc index 3372044..e1747cb 100644 --- a/chrome/browser/google/google_update_settings_unittest.cc +++ b/chrome/browser/google/google_update_settings_unittest.cc @@ -16,7 +16,7 @@ class GoogleUpdateTest : public PlatformTest { protected: GoogleUpdateTest() : user_data_dir_override_(chrome::DIR_USER_DATA) {} - virtual ~GoogleUpdateTest() {} + ~GoogleUpdateTest() override {} private: base::ScopedPathOverride user_data_dir_override_; diff --git a/chrome/browser/importer/firefox_importer_browsertest.cc b/chrome/browser/importer/firefox_importer_browsertest.cc index b2c0000..2bd2af1 100644 --- a/chrome/browser/importer/firefox_importer_browsertest.cc +++ b/chrome/browser/importer/firefox_importer_browsertest.cc @@ -244,7 +244,7 @@ class FirefoxObserver : public ProfileWriter, // supported platforms. class FirefoxProfileImporterBrowserTest : public InProcessBrowserTest { protected: - virtual void SetUp() override { + void SetUp() override { // Creates a new profile in a new subdirectory in the temp directory. ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); base::FilePath test_path = temp_dir_.path().AppendASCII("ImporterTest"); diff --git a/chrome/browser/importer/firefox_profile_lock_unittest.cc b/chrome/browser/importer/firefox_profile_lock_unittest.cc index 4545357..be8a5da 100644 --- a/chrome/browser/importer/firefox_profile_lock_unittest.cc +++ b/chrome/browser/importer/firefox_profile_lock_unittest.cc @@ -13,9 +13,7 @@ class FirefoxProfileLockTest : public testing::Test { protected: - virtual void SetUp() { - ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); - } + void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); } base::ScopedTempDir temp_dir_; }; diff --git a/chrome/browser/importer/profile_writer_unittest.cc b/chrome/browser/importer/profile_writer_unittest.cc index f132772..5dc372c 100644 --- a/chrome/browser/importer/profile_writer_unittest.cc +++ b/chrome/browser/importer/profile_writer_unittest.cc @@ -38,7 +38,7 @@ class ProfileWriterTest : public testing::Test { : ui_thread_(BrowserThread::UI, &loop_), file_thread_(BrowserThread::FILE, &loop_) { } - virtual ~ProfileWriterTest() {} + ~ProfileWriterTest() override {} // Create test bookmark entries to be added to ProfileWriter to // simulate bookmark importing. diff --git a/chrome/browser/internal_auth_unittest.cc b/chrome/browser/internal_auth_unittest.cc index 415bef2..6f62104 100644 --- a/chrome/browser/internal_auth_unittest.cc +++ b/chrome/browser/internal_auth_unittest.cc @@ -20,13 +20,11 @@ class InternalAuthTest : public ::testing::Test { for (int i = 20; i--;) long_string_ += long_string_; } - virtual ~InternalAuthTest() {} + ~InternalAuthTest() override {} - virtual void SetUp() { - } + void SetUp() override {} - virtual void TearDown() { - } + void TearDown() override {} base::MessageLoop message_loop_; std::string long_string_; diff --git a/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc b/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc index 8fae64f..3cb9046 100644 --- a/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc +++ b/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc @@ -48,9 +48,9 @@ class GCMInvalidationBridgeTest : public ::testing::Test { GCMInvalidationBridgeTest() : connection_online_(false) {} - virtual ~GCMInvalidationBridgeTest() {} + ~GCMInvalidationBridgeTest() override {} - virtual void SetUp() override { + void SetUp() override { TestingProfile::Builder builder; builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(), &BuildAutoIssuingFakeProfileOAuth2TokenService); diff --git a/chrome/browser/invalidation/invalidator_storage_unittest.cc b/chrome/browser/invalidation/invalidator_storage_unittest.cc index 86709d5..37e95a7 100644 --- a/chrome/browser/invalidation/invalidator_storage_unittest.cc +++ b/chrome/browser/invalidation/invalidator_storage_unittest.cc @@ -16,7 +16,7 @@ class InvalidatorStorageTest : public testing::Test { public: InvalidatorStorageTest() {} - virtual void SetUp() { + void SetUp() override { InvalidatorStorage::RegisterProfilePrefs(pref_service_.registry()); } diff --git a/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc b/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc index 5522ae9..dc9b0ed 100644 --- a/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc +++ b/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc @@ -27,11 +27,11 @@ namespace invalidation { class TiclProfileSettingsProviderTest : public testing::Test { protected: TiclProfileSettingsProviderTest(); - virtual ~TiclProfileSettingsProviderTest(); + ~TiclProfileSettingsProviderTest() override; // testing::Test: - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; TiclInvalidationService::InvalidationNetworkChannel GetNetworkChannel(); diff --git a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc index 0fed99f..d25188d 100644 --- a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc +++ b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc @@ -34,7 +34,7 @@ class MediaStreamInfoBarTest : public WebRtcTestBase { public: MediaStreamInfoBarTest() {} - virtual ~MediaStreamInfoBarTest() {} + ~MediaStreamInfoBarTest() override {} // InProcessBrowserTest: void SetUpCommandLine(CommandLine* command_line) override { diff --git a/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc index 9a93a99..6e2b6bf 100644 --- a/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc @@ -57,7 +57,7 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase { switches::kUseFakeDeviceForMediaStream); } - virtual void TearDown() override { + void TearDown() override { // Kill any processes we may have brought up. LOG(INFO) << "Entering TearDown"; if (dev_appserver_ != base::kNullProcessHandle) diff --git a/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc b/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc index a3dfab9..c950ed5 100644 --- a/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc @@ -29,7 +29,7 @@ using chrome::VersionInfo; class WebRtcDisableEncryptionFlagBrowserTest : public WebRtcTestBase { public: WebRtcDisableEncryptionFlagBrowserTest() {} - virtual ~WebRtcDisableEncryptionFlagBrowserTest() {} + ~WebRtcDisableEncryptionFlagBrowserTest() override {} void SetUpInProcessBrowserTestFixture() override { DetectErrorsInJavaScript(); // Look for errors in our rather complex js. diff --git a/chrome/browser/media/desktop_media_list_ash_unittest.cc b/chrome/browser/media/desktop_media_list_ash_unittest.cc index f8168e5..f5c87f2 100644 --- a/chrome/browser/media/desktop_media_list_ash_unittest.cc +++ b/chrome/browser/media/desktop_media_list_ash_unittest.cc @@ -28,7 +28,7 @@ class MockDesktopMediaListObserver : public DesktopMediaListObserver { class DesktopMediaListAshTest : public ash::test::AshTestBase { public: DesktopMediaListAshTest() {} - virtual ~DesktopMediaListAshTest() {} + ~DesktopMediaListAshTest() override {} void CreateList(int source_types) { list_.reset(new DesktopMediaListAsh(source_types)); diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc index 15bfc13..2def24e 100644 --- a/chrome/browser/media/encrypted_media_browsertest.cc +++ b/chrome/browser/media/encrypted_media_browsertest.cc @@ -338,7 +338,7 @@ class ECKEncryptedMediaTest : public EncryptedMediaTestBase { // enabled by default. class ECKUnprefixedEncryptedMediaTest : public EncryptedMediaTestBase { protected: - virtual void SetUpCommandLine(CommandLine* command_line) override { + void SetUpCommandLine(CommandLine* command_line) override { EncryptedMediaTestBase::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnableEncryptedMedia); SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, command_line); diff --git a/chrome/browser/media/media_browsertest.h b/chrome/browser/media/media_browsertest.h index 67a62a1..953772f 100644 --- a/chrome/browser/media/media_browsertest.h +++ b/chrome/browser/media/media_browsertest.h @@ -29,7 +29,7 @@ class MediaBrowserTest : public InProcessBrowserTest, static const char kPluginCrashed[]; MediaBrowserTest(); - virtual ~MediaBrowserTest(); + ~MediaBrowserTest() override; // Runs a html page with a list of URL query parameters. // If http is true, the test starts a local http test server to load the test diff --git a/chrome/browser/media/webrtc_browsertest_base.h b/chrome/browser/media/webrtc_browsertest_base.h index 47dd4dd..d6ac00f 100644 --- a/chrome/browser/media/webrtc_browsertest_base.h +++ b/chrome/browser/media/webrtc_browsertest_base.h @@ -37,7 +37,7 @@ class WebRtcTestBase : public InProcessBrowserTest { protected: WebRtcTestBase(); - virtual ~WebRtcTestBase(); + ~WebRtcTestBase() override; // These all require that the loaded page fulfills the public interface in // chrome/test/data/webrtc/message_handling.js. diff --git a/chrome/browser/media/webrtc_log_util_unittest.cc b/chrome/browser/media/webrtc_log_util_unittest.cc index c6a7457..8519be5 100644 --- a/chrome/browser/media/webrtc_log_util_unittest.cc +++ b/chrome/browser/media/webrtc_log_util_unittest.cc @@ -19,7 +19,7 @@ class WebRtcLogUtilTest : public testing::Test { WebRtcLogUtilTest() : file_thread_(content::BrowserThread::FILE, &message_loop_) {} - virtual void SetUp() { + void SetUp() override { // Create three files. One with modified date as of now, one with date one // day younger than the keep limit, one with date one day older than the // limit. The two former are expected to be kept and the last to be deleted diff --git a/chrome/browser/metrics/thread_watcher_unittest.cc b/chrome/browser/metrics/thread_watcher_unittest.cc index dde829b..2f360be 100644 --- a/chrome/browser/metrics/thread_watcher_unittest.cc +++ b/chrome/browser/metrics/thread_watcher_unittest.cc @@ -301,7 +301,7 @@ class ThreadWatcherTest : public ::testing::Test { } } - virtual ~ThreadWatcherTest() { + ~ThreadWatcherTest() override { ThreadWatcherList::DeleteAll(); io_watcher_ = NULL; db_watcher_ = NULL; diff --git a/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc b/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc index eb60432..25bbb3b 100644 --- a/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc +++ b/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc @@ -23,7 +23,7 @@ class NaClGdbTest : public PPAPINaClNewlibTest { NaClGdbTest() { } - virtual void SetUpCommandLine(CommandLine* command_line) override { + void SetUpCommandLine(CommandLine* command_line) override { PPAPINaClNewlibTest::SetUpCommandLine(command_line); base::FilePath mock_nacl_gdb; diff --git a/chrome/browser/net/chrome_network_delegate_unittest.cc b/chrome/browser/net/chrome_network_delegate_unittest.cc index 2fcb197..0dc2baa 100644 --- a/chrome/browser/net/chrome_network_delegate_unittest.cc +++ b/chrome/browser/net/chrome_network_delegate_unittest.cc @@ -31,13 +31,13 @@ class ChromeNetworkDelegateTest : public testing::Test { : forwarder_(new extensions::EventRouterForwarder()) { } - virtual void SetUp() override { + void SetUp() override { never_throttle_requests_original_value_ = ChromeNetworkDelegate::g_never_throttle_requests_; ChromeNetworkDelegate::g_never_throttle_requests_ = false; } - virtual void TearDown() override { + void TearDown() override { ChromeNetworkDelegate::g_never_throttle_requests_ = never_throttle_requests_original_value_; } @@ -103,7 +103,7 @@ class ChromeNetworkDelegateSafeSearchTest : public testing::Test { #endif } - virtual void SetUp() override { + void SetUp() override { ChromeNetworkDelegate::InitializePrefsOnUIThread( &enable_referrers_, NULL, &force_google_safe_search_, profile_.GetTestingPrefService()); @@ -312,7 +312,7 @@ class ChromeNetworkDelegatePrivacyModeTest : public testing::Test { kFirstPartySite("http://cool.things.com"), kBlockedFirstPartySite("http://no.thirdparties.com") {} - virtual void SetUp() override { + void SetUp() override { ChromeNetworkDelegate::InitializePrefsOnUIThread( &enable_referrers_, NULL, NULL, profile_.GetTestingPrefService()); diff --git a/chrome/browser/net/dns_probe_browsertest.cc b/chrome/browser/net/dns_probe_browsertest.cc index b5029d1..5363f67 100644 --- a/chrome/browser/net/dns_probe_browsertest.cc +++ b/chrome/browser/net/dns_probe_browsertest.cc @@ -429,7 +429,7 @@ void DnsProbeBrowserTestIOThreadHelper::StartDelayedProbes( class DnsProbeBrowserTest : public InProcessBrowserTest { public: DnsProbeBrowserTest(); - virtual ~DnsProbeBrowserTest(); + ~DnsProbeBrowserTest() override; void SetUpOnMainThread() override; void TearDownOnMainThread() override; diff --git a/chrome/browser/net/evicted_domain_cookie_counter_unittest.cc b/chrome/browser/net/evicted_domain_cookie_counter_unittest.cc index 85882c1..3f7618c 100644 --- a/chrome/browser/net/evicted_domain_cookie_counter_unittest.cc +++ b/chrome/browser/net/evicted_domain_cookie_counter_unittest.cc @@ -44,11 +44,11 @@ class EvictedDomainCookieCounterTest : public testing::Test { }; EvictedDomainCookieCounterTest(); - virtual ~EvictedDomainCookieCounterTest(); + ~EvictedDomainCookieCounterTest() override; // testing::Test implementation. - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; // Initialization that allows parameters to be specified. void InitCounter(size_t max_size, size_t purge_count); diff --git a/chrome/browser/net/load_timing_browsertest.cc b/chrome/browser/net/load_timing_browsertest.cc index 1900954..9a51330 100644 --- a/chrome/browser/net/load_timing_browsertest.cc +++ b/chrome/browser/net/load_timing_browsertest.cc @@ -268,8 +268,7 @@ class LoadTimingBrowserTest : public InProcessBrowserTest { LoadTimingBrowserTest() { } - virtual ~LoadTimingBrowserTest() { - } + ~LoadTimingBrowserTest() override {} // Navigates to |url| and writes the resulting navigation timings to // |navigation_deltas|. diff --git a/chrome/browser/net/net_error_tab_helper_unittest.cc b/chrome/browser/net/net_error_tab_helper_unittest.cc index cc54335..d225104 100644 --- a/chrome/browser/net/net_error_tab_helper_unittest.cc +++ b/chrome/browser/net/net_error_tab_helper_unittest.cc @@ -54,7 +54,7 @@ class NetErrorTabHelperTest : public ChromeRenderViewHostTestHarness { enum ErrorPage { NORMAL_PAGE, ERROR_PAGE }; enum ErrorType { DNS_ERROR, OTHER_ERROR }; - virtual void SetUp() override { + void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); subframe_ = content::RenderFrameHostTester::For(main_rfh()) ->AppendChild("subframe"); diff --git a/chrome/browser/net/net_log_temp_file_unittest.cc b/chrome/browser/net/net_log_temp_file_unittest.cc index 7e8eaef..e58f63c 100644 --- a/chrome/browser/net/net_log_temp_file_unittest.cc +++ b/chrome/browser/net/net_log_temp_file_unittest.cc @@ -61,7 +61,7 @@ class NetLogTempFileTest : public ::testing::Test { } // ::testing::Test implementation: - virtual void SetUp() override { + void SetUp() override { // Get a temporary file name for unit tests. base::FilePath net_log_dir; ASSERT_TRUE(net_log_temp_file_->GetNetExportLogDirectory(&net_log_dir)); @@ -76,7 +76,7 @@ class NetLogTempFileTest : public ::testing::Test { ASSERT_FALSE(net_export_log_.empty()); } - virtual void TearDown() override { + void TearDown() override { // Delete the temporary file we have created. ASSERT_TRUE(base::DeleteFile(net_export_log_, false)); } diff --git a/chrome/browser/net/network_stats_unittest.cc b/chrome/browser/net/network_stats_unittest.cc index 331abf6..cd16a32 100644 --- a/chrome/browser/net/network_stats_unittest.cc +++ b/chrome/browser/net/network_stats_unittest.cc @@ -21,15 +21,14 @@ class NetworkStatsTest : public PlatformTest { NetworkStatsTest() {} protected: - - virtual void SetUp() { + void SetUp() override { net::NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests(); base::MessageLoop::current()->RunUntilIdle(); mock_writes_.clear(); mock_reads_.clear(); } - virtual void TearDown() { + void TearDown() override { net::NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests(); // Empty the current queue. base::MessageLoop::current()->RunUntilIdle(); diff --git a/chrome/browser/net/predictor_unittest.cc b/chrome/browser/net/predictor_unittest.cc index 3674923..4c68475 100644 --- a/chrome/browser/net/predictor_unittest.cc +++ b/chrome/browser/net/predictor_unittest.cc @@ -81,7 +81,7 @@ class PredictorTest : public testing::Test { } protected: - virtual void SetUp() { + void SetUp() override { #if defined(OS_WIN) net::EnsureWinsockInit(); #endif diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc index 93b1327..1cc1be6 100644 --- a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc +++ b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc @@ -115,7 +115,7 @@ class PrefProxyConfigTrackerImplTestBase : public TESTBASE { class PrefProxyConfigTrackerImplTest : public PrefProxyConfigTrackerImplTestBase<testing::Test> { protected: - virtual void SetUp() { + void SetUp() override { pref_service_.reset(new TestingPrefServiceSimple()); Init(pref_service_.get(), pref_service_->registry()); } @@ -328,7 +328,7 @@ class PrefProxyConfigTrackerImplCommandLineTest PrefProxyConfigTrackerImplCommandLineTest() : command_line_(CommandLine::NO_PROGRAM) {} - virtual void SetUp() { + void SetUp() override { for (size_t i = 0; i < arraysize(GetParam().switches); i++) { const char* name = GetParam().switches[i].name; const char* value = GetParam().switches[i].value; diff --git a/chrome/browser/net/probe_message_unittest.cc b/chrome/browser/net/probe_message_unittest.cc index 34409be..f386089d 100644 --- a/chrome/browser/net/probe_message_unittest.cc +++ b/chrome/browser/net/probe_message_unittest.cc @@ -14,7 +14,7 @@ class ProbeMessageTest : public ::testing::Test { protected: ProbeMessageTest() {} - virtual ~ProbeMessageTest() {} + ~ProbeMessageTest() override {} }; TEST_F(ProbeMessageTest, TestGenerateProbeRequest) { diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc index a1c09ee..950aade 100644 --- a/chrome/browser/net/proxy_browsertest.cc +++ b/chrome/browser/net/proxy_browsertest.cc @@ -81,7 +81,7 @@ class ProxyBrowserTest : public InProcessBrowserTest { base::FilePath()) { } - virtual void SetUp() override { + void SetUp() override { ASSERT_TRUE(proxy_server_.Start()); InProcessBrowserTest::SetUp(); } @@ -149,9 +149,9 @@ class HttpProxyScriptBrowserTest : public InProcessBrowserTest { net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))) { } - virtual ~HttpProxyScriptBrowserTest() {} + ~HttpProxyScriptBrowserTest() override {} - virtual void SetUp() override { + void SetUp() override { ASSERT_TRUE(http_server_.Start()); InProcessBrowserTest::SetUp(); } @@ -176,7 +176,7 @@ IN_PROC_BROWSER_TEST_F(HttpProxyScriptBrowserTest, Verify) { class FileProxyScriptBrowserTest : public InProcessBrowserTest { public: FileProxyScriptBrowserTest() {} - virtual ~FileProxyScriptBrowserTest() {} + ~FileProxyScriptBrowserTest() override {} void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitchASCII(switches::kProxyPacUrl, @@ -201,9 +201,9 @@ class FtpProxyScriptBrowserTest : public InProcessBrowserTest { net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))) { } - virtual ~FtpProxyScriptBrowserTest() {} + ~FtpProxyScriptBrowserTest() override {} - virtual void SetUp() override { + void SetUp() override { ASSERT_TRUE(ftp_server_.Start()); InProcessBrowserTest::SetUp(); } @@ -229,7 +229,7 @@ IN_PROC_BROWSER_TEST_F(FtpProxyScriptBrowserTest, Verify) { class DataProxyScriptBrowserTest : public InProcessBrowserTest { public: DataProxyScriptBrowserTest() {} - virtual ~DataProxyScriptBrowserTest() {} + ~DataProxyScriptBrowserTest() override {} void SetUpCommandLine(CommandLine* command_line) override { std::string contents; diff --git a/chrome/browser/net/proxy_policy_handler_unittest.cc b/chrome/browser/net/proxy_policy_handler_unittest.cc index 6be9305..a1818a1 100644 --- a/chrome/browser/net/proxy_policy_handler_unittest.cc +++ b/chrome/browser/net/proxy_policy_handler_unittest.cc @@ -22,7 +22,7 @@ namespace policy { class ProxyPolicyHandlerTest : public ConfigurationPolicyPrefStoreTest { public: - virtual void SetUp() override { + void SetUp() override { ConfigurationPolicyPrefStoreTest::SetUp(); handler_list_.AddHandler( make_scoped_ptr<ConfigurationPolicyHandler>(new ProxyPolicyHandler)); diff --git a/chrome/browser/net/quota_policy_channel_id_store_unittest.cc b/chrome/browser/net/quota_policy_channel_id_store_unittest.cc index 249f6c8..f82f6e47 100644 --- a/chrome/browser/net/quota_policy_channel_id_store_unittest.cc +++ b/chrome/browser/net/quota_policy_channel_id_store_unittest.cc @@ -67,7 +67,7 @@ class QuotaPolicyChannelIDStoreTest : public testing::Test { return base::Time::FromUTCExploded(exploded_time); } - virtual void SetUp() { + void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); store_ = new QuotaPolicyChannelIDStore( temp_dir_.path().Append(kTestChannelIDFilename), @@ -85,7 +85,7 @@ class QuotaPolicyChannelIDStoreTest : public testing::Test { "b")); } - virtual void TearDown() { + void TearDown() override { store_ = NULL; loop_.RunUntilIdle(); } diff --git a/chrome/browser/net/safe_search_util_unittest.cc b/chrome/browser/net/safe_search_util_unittest.cc index 564f0c2..4a1872b 100644 --- a/chrome/browser/net/safe_search_util_unittest.cc +++ b/chrome/browser/net/safe_search_util_unittest.cc @@ -14,7 +14,7 @@ class SafeSearchUtilTest : public ::testing::Test { protected: SafeSearchUtilTest() {} - virtual ~SafeSearchUtilTest() {} + ~SafeSearchUtilTest() override {} scoped_ptr<net::URLRequest> CreateYoutubeRequest() { return context_.CreateRequest(GURL("http://www.youtube.com"), diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator_unittest.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator_unittest.cc index 06848fa..7b55500 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator_unittest.cc +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator_unittest.cc @@ -17,7 +17,7 @@ class DataReductionProxyConfigTest : public testing::Test { public: - virtual void SetUp() { + void SetUp() override { PrefRegistrySimple* registry = pref_service_.registry(); registry->RegisterDictionaryPref(prefs::kProxy); config_.reset(new DataReductionProxyChromeConfigurator( diff --git a/chrome/browser/notifications/desktop_notification_profile_util_unittest.cc b/chrome/browser/notifications/desktop_notification_profile_util_unittest.cc index 150f07d..28c331e 100644 --- a/chrome/browser/notifications/desktop_notification_profile_util_unittest.cc +++ b/chrome/browser/notifications/desktop_notification_profile_util_unittest.cc @@ -10,9 +10,7 @@ class DesktopNotificationServiceTest : public ChromeRenderViewHostTestHarness { protected: - virtual void SetUp() { - ChromeRenderViewHostTestHarness::SetUp(); - } + void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); } }; diff --git a/chrome/browser/notifications/extension_welcome_notification_unittest.cc b/chrome/browser/notifications/extension_welcome_notification_unittest.cc index 2c4544d..d4ecf2d 100644 --- a/chrome/browser/notifications/extension_welcome_notification_unittest.cc +++ b/chrome/browser/notifications/extension_welcome_notification_unittest.cc @@ -128,7 +128,7 @@ class ExtensionWelcomeNotificationTest : public testing::Test { ExtensionWelcomeNotification::RegisterProfilePrefs(pref_registry.get()); } - virtual void SetUp() { + void SetUp() override { task_runner_ = new base::TestSimpleTaskRunner(); thread_task_runner_handle_.reset( new base::ThreadTaskRunnerHandle(task_runner_)); @@ -138,7 +138,7 @@ class ExtensionWelcomeNotificationTest : public testing::Test { ExtensionWelcomeNotification::Create(profile_.get(), delegate_)); } - virtual void TearDown() { + void TearDown() override { delegate_ = NULL; welcome_notification_.reset(); profile_.reset(); diff --git a/chrome/browser/notifications/message_center_notifications_unittest.cc b/chrome/browser/notifications/message_center_notifications_unittest.cc index 8403880..a216f85 100644 --- a/chrome/browser/notifications/message_center_notifications_unittest.cc +++ b/chrome/browser/notifications/message_center_notifications_unittest.cc @@ -40,7 +40,7 @@ class MessageCenterNotificationManagerTest : public BrowserWithTestWindowTest { MessageCenterNotificationManagerTest() {} protected: - virtual void SetUp() { + void SetUp() override { BrowserWithTestWindowTest::SetUp(); #if !defined(OS_CHROMEOS) // BrowserWithTestWindowTest owns an AshTestHelper on OS_CHROMEOS, which @@ -76,7 +76,7 @@ class MessageCenterNotificationManagerTest : public BrowserWithTestWindowTest { #endif } - virtual void TearDown() { + void TearDown() override { run_loop_.reset(); first_run_pref_.reset(); profile_manager_.reset(); diff --git a/chrome/browser/notifications/message_center_settings_controller_unittest.cc b/chrome/browser/notifications/message_center_settings_controller_unittest.cc index 75670ee..d0e70d9a 100644 --- a/chrome/browser/notifications/message_center_settings_controller_unittest.cc +++ b/chrome/browser/notifications/message_center_settings_controller_unittest.cc @@ -25,16 +25,14 @@ class MessageCenterSettingsControllerTest : public testing::Test { protected: MessageCenterSettingsControllerTest() : testing_profile_manager_(TestingBrowserProcess::GetGlobal()) {}; - virtual ~MessageCenterSettingsControllerTest() {}; + ~MessageCenterSettingsControllerTest() override{}; base::FilePath GetProfilePath(const std::string& base_name) { return testing_profile_manager_.profile_manager()->user_data_dir() .AppendASCII(base_name); } - virtual void SetUp() override { - ASSERT_TRUE(testing_profile_manager_.SetUp()); - } + void SetUp() override { ASSERT_TRUE(testing_profile_manager_.SetUp()); } virtual void CreateProfile(const std::string& name) { testing_profile_manager_.CreateTestingProfile(name); diff --git a/chrome/browser/notifications/notification_conversion_helper_unittest.cc b/chrome/browser/notifications/notification_conversion_helper_unittest.cc index 598f6237..47a5fba 100644 --- a/chrome/browser/notifications/notification_conversion_helper_unittest.cc +++ b/chrome/browser/notifications/notification_conversion_helper_unittest.cc @@ -18,9 +18,9 @@ class NotificationConversionHelperTest : public testing::Test { public: NotificationConversionHelperTest() {} - virtual void SetUp() override {} + void SetUp() override {} - virtual void TearDown() override {} + void TearDown() override {} protected: scoped_ptr<Notification> CreateNotification( diff --git a/chrome/browser/plugins/plugin_info_message_filter_unittest.cc b/chrome/browser/plugins/plugin_info_message_filter_unittest.cc index afddd93..7d53aca 100644 --- a/chrome/browser/plugins/plugin_info_message_filter_unittest.cc +++ b/chrome/browser/plugins/plugin_info_message_filter_unittest.cc @@ -85,7 +85,7 @@ class PluginInfoMessageFilterTest : public ::testing::Test { context_(0, &profile_) { } - virtual void SetUp() override { + void SetUp() override { content::WebPluginInfo foo_plugin(base::ASCIIToUTF16("Foo Plug-in"), foo_plugin_path_, base::ASCIIToUTF16("1"), diff --git a/chrome/browser/plugins/plugin_prefs_unittest.cc b/chrome/browser/plugins/plugin_prefs_unittest.cc index 217a4ae..12c4277 100644 --- a/chrome/browser/plugins/plugin_prefs_unittest.cc +++ b/chrome/browser/plugins/plugin_prefs_unittest.cc @@ -58,9 +58,7 @@ void GotPlugins(const base::Closure& quit_closure, class PluginPrefsTest : public ::testing::Test { public: - virtual void SetUp() override { - plugin_prefs_ = new PluginPrefs(); - } + void SetUp() override { plugin_prefs_ = new PluginPrefs(); } void SetPolicyEnforcedPluginPatterns( const std::set<base::string16>& disabled, diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc index 1cfd9da..e04465d 100644 --- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc @@ -198,7 +198,7 @@ class CloudPolicyTest : public InProcessBrowserTest, public PolicyService::Observer { protected: CloudPolicyTest() {} - virtual ~CloudPolicyTest() {} + ~CloudPolicyTest() override {} void SetUpInProcessBrowserTestFixture() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc index 349733b..28010b0 100644 --- a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc @@ -48,7 +48,7 @@ class CloudPolicyInvalidatorTest : public testing::Test { CloudPolicyInvalidatorTest(); - virtual void TearDown() override; + void TearDown() override; // Starts the invalidator which will be tested. // |initialize| determines if the invalidator should be initialized. @@ -854,7 +854,7 @@ class CloudPolicyInvalidatorUserTypedTest virtual ~CloudPolicyInvalidatorUserTypedTest(); // CloudPolicyInvalidatorTest: - virtual void SetUp() override; + void SetUp() override; // Get the current count for the given metric. base::HistogramBase::Count GetCount(MetricPolicyRefresh metric); diff --git a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc index 6ee06d2..785cc4c 100644 --- a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc @@ -47,7 +47,7 @@ namespace policy { class CloudPolicyManagerTest : public InProcessBrowserTest { protected: CloudPolicyManagerTest() {} - virtual ~CloudPolicyManagerTest() {} + ~CloudPolicyManagerTest() override {} void SetUpInProcessBrowserTestFixture() override { CommandLine* command_line = CommandLine::ForCurrentProcess(); diff --git a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc index c69fccf..cb287ba 100644 --- a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc @@ -103,7 +103,7 @@ bool Base64UrlEncode(const std::string& value, std::string* encoded) { class ComponentCloudPolicyTest : public ExtensionBrowserTest { protected: ComponentCloudPolicyTest() {} - virtual ~ComponentCloudPolicyTest() {} + ~ComponentCloudPolicyTest() override {} void SetUpCommandLine(CommandLine* command_line) override { ExtensionBrowserTest::SetUpCommandLine(command_line); diff --git a/chrome/browser/policy/javascript_policy_handler_unittest.cc b/chrome/browser/policy/javascript_policy_handler_unittest.cc index 2d0c8df..36b6e82 100644 --- a/chrome/browser/policy/javascript_policy_handler_unittest.cc +++ b/chrome/browser/policy/javascript_policy_handler_unittest.cc @@ -14,7 +14,7 @@ namespace policy { class JavascriptPolicyHandlerTest : public ConfigurationPolicyPrefStoreTest { - virtual void SetUp() override { + void SetUp() override { handler_list_.AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( new JavascriptPolicyHandler)); } diff --git a/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc b/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc index 4e67986..7737e71 100644 --- a/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc +++ b/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc @@ -19,7 +19,7 @@ namespace policy { class ManagedBookmarksPolicyHandlerTest : public ConfigurationPolicyPrefStoreTest { - virtual void SetUp() override { + void SetUp() override { Schema chrome_schema = Schema::Wrap(GetChromeSchemaData()); handler_list_.AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( new ManagedBookmarksPolicyHandler(chrome_schema))); diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index d0b81ed..b30bd2c 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -558,10 +558,10 @@ class TestAddAppWindowObserver : public extensions::AppWindowRegistry::Observer { public: explicit TestAddAppWindowObserver(extensions::AppWindowRegistry* registry); - virtual ~TestAddAppWindowObserver(); + ~TestAddAppWindowObserver() override; // extensions::AppWindowRegistry::Observer: - virtual void OnAppWindowAdded(extensions::AppWindow* app_window) override; + void OnAppWindowAdded(extensions::AppWindow* app_window) override; extensions::AppWindow* WaitForAppWindow(); @@ -601,9 +601,9 @@ extensions::AppWindow* TestAddAppWindowObserver::WaitForAppWindow() { class PolicyTest : public InProcessBrowserTest { protected: PolicyTest() {} - virtual ~PolicyTest() {} + ~PolicyTest() override {} - virtual void SetUp() override { + void SetUp() override { test_extension_cache_.reset(new extensions::ExtensionCacheFake()); InProcessBrowserTest::SetUp(); } @@ -3038,7 +3038,7 @@ INSTANTIATE_TEST_CASE_P( class PolicyStatisticsCollectorTest : public PolicyTest { public: PolicyStatisticsCollectorTest() {} - virtual ~PolicyStatisticsCollectorTest() {} + ~PolicyStatisticsCollectorTest() override {} void SetUpInProcessBrowserTestFixture() override { PolicyTest::SetUpInProcessBrowserTestFixture(); diff --git a/chrome/browser/policy/profile_policy_connector_unittest.cc b/chrome/browser/policy/profile_policy_connector_unittest.cc index b4423e3..2c7f553 100644 --- a/chrome/browser/policy/profile_policy_connector_unittest.cc +++ b/chrome/browser/policy/profile_policy_connector_unittest.cc @@ -30,9 +30,9 @@ namespace policy { class ProfilePolicyConnectorTest : public testing::Test { protected: ProfilePolicyConnectorTest() {} - virtual ~ProfilePolicyConnectorTest() {} + ~ProfilePolicyConnectorTest() override {} - virtual void SetUp() override { + void SetUp() override { // This must be set up before the TestingBrowserProcess is created. BrowserPolicyConnector::SetPolicyProviderForTesting(&mock_provider_); @@ -48,7 +48,7 @@ class ProfilePolicyConnectorTest : public testing::Test { loop_.message_loop_proxy())); } - virtual void TearDown() { + void TearDown() override { TestingBrowserProcess::GetGlobal()->SetBrowserPolicyConnector(NULL); cloud_policy_manager_->Shutdown(); } diff --git a/chrome/browser/policy/url_blacklist_manager_unittest.cc b/chrome/browser/policy/url_blacklist_manager_unittest.cc index 83d7324..688d35b 100644 --- a/chrome/browser/policy/url_blacklist_manager_unittest.cc +++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc @@ -89,14 +89,14 @@ class URLBlacklistManagerTest : public testing::Test { protected: URLBlacklistManagerTest() {} - virtual void SetUp() override { + void SetUp() override { pref_service_.registry()->RegisterListPref(policy_prefs::kUrlBlacklist); pref_service_.registry()->RegisterListPref(policy_prefs::kUrlWhitelist); blacklist_manager_.reset(new TestingURLBlacklistManager(&pref_service_)); loop_.RunUntilIdle(); } - virtual void TearDown() override { + void TearDown() override { if (blacklist_manager_.get()) blacklist_manager_->ShutdownOnUIThread(); loop_.RunUntilIdle(); diff --git a/chrome/browser/power/process_power_collector_unittest.cc b/chrome/browser/power/process_power_collector_unittest.cc index 9a93cf3..5bcd785 100644 --- a/chrome/browser/power/process_power_collector_unittest.cc +++ b/chrome/browser/power/process_power_collector_unittest.cc @@ -35,9 +35,9 @@ using power::OriginPowerMapFactory; class BrowserProcessPowerTest : public BrowserWithTestWindowTest { public: BrowserProcessPowerTest() {} - virtual ~BrowserProcessPowerTest() {} + ~BrowserProcessPowerTest() override {} - virtual void SetUp() override { + void SetUp() override { BrowserWithTestWindowTest::SetUp(); collector.reset(new ProcessPowerCollector); @@ -55,7 +55,7 @@ class BrowserProcessPowerTest : public BrowserWithTestWindowTest { ASSERT_TRUE(profile_manager_->SetUp()); } - virtual void TearDown() override { + void TearDown() override { collector.reset(); BrowserWithTestWindowTest::TearDown(); } diff --git a/chrome/browser/predictors/autocomplete_action_predictor_table_unittest.cc b/chrome/browser/predictors/autocomplete_action_predictor_table_unittest.cc index 4cc47bd..938d10a 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor_table_unittest.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor_table_unittest.cc @@ -26,10 +26,10 @@ namespace predictors { class AutocompleteActionPredictorTableTest : public testing::Test { public: AutocompleteActionPredictorTableTest(); - virtual ~AutocompleteActionPredictorTableTest(); + ~AutocompleteActionPredictorTableTest() override; - virtual void SetUp(); - virtual void TearDown(); + void SetUp() override; + void TearDown() override; size_t CountRecords() const; @@ -61,7 +61,7 @@ class AutocompleteActionPredictorTableTest : public testing::Test { class AutocompleteActionPredictorTableReopenTest : public AutocompleteActionPredictorTableTest { public: - virtual void SetUp() { + void SetUp() override { // By calling SetUp twice, we make sure that the table already exists for // this fixture. AutocompleteActionPredictorTableTest::SetUp(); diff --git a/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc b/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc index 170ac5f..9224fdf 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc @@ -90,13 +90,13 @@ class AutocompleteActionPredictorTest : public testing::Test { predictor_(new AutocompleteActionPredictor(profile_.get())) { } - virtual ~AutocompleteActionPredictorTest() { + ~AutocompleteActionPredictorTest() override { predictor_.reset(NULL); profile_.reset(NULL); loop_.RunUntilIdle(); } - virtual void SetUp() { + void SetUp() override { CommandLine::ForCurrentProcess()->AppendSwitchASCII( switches::kPrerenderFromOmnibox, switches::kPrerenderFromOmniboxSwitchValueEnabled); @@ -110,7 +110,7 @@ class AutocompleteActionPredictorTest : public testing::Test { ASSERT_TRUE(db_id_cache()->empty()); } - virtual void TearDown() { + void TearDown() override { profile_->DestroyHistoryService(); predictor_->Shutdown(); } diff --git a/chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc b/chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc index 37fc6a1..9cc50e5 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc +++ b/chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc @@ -20,9 +20,9 @@ namespace predictors { class ResourcePrefetchPredictorTablesTest : public testing::Test { public: ResourcePrefetchPredictorTablesTest(); - virtual ~ResourcePrefetchPredictorTablesTest(); - virtual void SetUp() override; - virtual void TearDown() override; + ~ResourcePrefetchPredictorTablesTest() override; + void SetUp() override; + void TearDown() override; protected: void TestGetAllData(); @@ -76,7 +76,7 @@ class ResourcePrefetchPredictorTablesTest : public testing::Test { class ResourcePrefetchPredictorTablesReopenTest : public ResourcePrefetchPredictorTablesTest { public: - virtual void SetUp() override { + void SetUp() override { // Write data to the table, and then reopen the db. ResourcePrefetchPredictorTablesTest::SetUp(); ResourcePrefetchPredictorTablesTest::TearDown(); diff --git a/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc b/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc index 675f6dd..fba54ca 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc +++ b/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc @@ -72,9 +72,9 @@ class MockResourcePrefetchPredictorTables class ResourcePrefetchPredictorTest : public testing::Test { public: ResourcePrefetchPredictorTest(); - virtual ~ResourcePrefetchPredictorTest(); - virtual void SetUp() override; - virtual void TearDown() override; + ~ResourcePrefetchPredictorTest() override; + void SetUp() override; + void TearDown() override; protected: void AddUrlToHistory(const std::string& url, int visit_count) { diff --git a/chrome/browser/predictors/resource_prefetcher_unittest.cc b/chrome/browser/predictors/resource_prefetcher_unittest.cc index ab3bebe..a2bd443 100644 --- a/chrome/browser/predictors/resource_prefetcher_unittest.cc +++ b/chrome/browser/predictors/resource_prefetcher_unittest.cc @@ -75,7 +75,7 @@ class TestResourcePrefetcherDelegate : public ResourcePrefetcher::Delegate { class ResourcePrefetcherTest : public testing::Test { public: ResourcePrefetcherTest(); - virtual ~ResourcePrefetcherTest(); + ~ResourcePrefetcherTest() override; protected: typedef ResourcePrefetcher::Request Request; diff --git a/chrome/browser/prefs/chrome_pref_service_unittest.cc b/chrome/browser/prefs/chrome_pref_service_unittest.cc index ecbc4dd..8c840897 100644 --- a/chrome/browser/prefs/chrome_pref_service_unittest.cc +++ b/chrome/browser/prefs/chrome_pref_service_unittest.cc @@ -63,7 +63,7 @@ TEST(ChromePrefServiceTest, UpdateCommandLinePrefStore) { class ChromePrefServiceUserFilePrefsTest : public testing::Test { protected: - virtual void SetUp() { + void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_dir_)); @@ -91,7 +91,7 @@ class ChromePrefServiceUserFilePrefsTest : public testing::Test { class ChromePrefServiceWebKitPrefs : public ChromeRenderViewHostTestHarness { protected: - virtual void SetUp() { + void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); // Supply our own profile so we use the correct profile data. The test diff --git a/chrome/browser/prefs/incognito_mode_prefs_unittest.cc b/chrome/browser/prefs/incognito_mode_prefs_unittest.cc index fc343d5..ccbb489 100644 --- a/chrome/browser/prefs/incognito_mode_prefs_unittest.cc +++ b/chrome/browser/prefs/incognito_mode_prefs_unittest.cc @@ -10,7 +10,7 @@ class IncognitoModePrefsTest : public testing::Test { protected: - virtual void SetUp() { + void SetUp() override { IncognitoModePrefs::RegisterProfilePrefs(prefs_.registry()); } diff --git a/chrome/browser/prefs/leveldb_pref_store_unittest.cc b/chrome/browser/prefs/leveldb_pref_store_unittest.cc index e29df52..dbe29a5 100644 --- a/chrome/browser/prefs/leveldb_pref_store_unittest.cc +++ b/chrome/browser/prefs/leveldb_pref_store_unittest.cc @@ -32,7 +32,7 @@ class MockReadErrorDelegate : public PersistentPrefStore::ReadErrorDelegate { class LevelDBPrefStoreTest : public testing::Test { protected: - virtual void SetUp() override { + void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_dir_)); @@ -40,9 +40,7 @@ class LevelDBPrefStoreTest : public testing::Test { ASSERT_TRUE(PathExists(data_dir_)); } - virtual void TearDown() override { - Close(); - } + void TearDown() override { Close(); } void Open() { pref_store_ = new LevelDBPrefStore( diff --git a/chrome/browser/prefs/pref_model_associator_unittest.cc b/chrome/browser/prefs/pref_model_associator_unittest.cc index 9529355..44e5577 100644 --- a/chrome/browser/prefs/pref_model_associator_unittest.cc +++ b/chrome/browser/prefs/pref_model_associator_unittest.cc @@ -12,9 +12,7 @@ class AbstractPreferenceMergeTest : public testing::Test { protected: - virtual void SetUp() { - pref_service_ = profile_.GetPrefs(); - } + void SetUp() override { pref_service_ = profile_.GetPrefs(); } void SetContentPattern(base::DictionaryValue* patterns_dict, const std::string& expression, @@ -59,7 +57,7 @@ class ListPreferenceMergeTest : public AbstractPreferenceMergeTest { local_url0_("http://example.com/local0"), local_url1_("http://example.com/local1") {} - virtual void SetUp() { + void SetUp() override { AbstractPreferenceMergeTest::SetUp(); server_url_list_.Append(new base::StringValue(server_url0_)); server_url_list_.Append(new base::StringValue(server_url1_)); @@ -206,7 +204,7 @@ class DictionaryPreferenceMergeTest : public AbstractPreferenceMergeTest { content_type0_("content_type0"), content_type1_("content_type1") {} - virtual void SetUp() { + void SetUp() override { AbstractPreferenceMergeTest::SetUp(); SetContentPattern(&server_patterns_, expression0_, content_type0_, 1); SetContentPattern(&server_patterns_, expression0_, content_type1_, 2); @@ -365,7 +363,7 @@ class IndividualPreferenceMergeTest : public AbstractPreferenceMergeTest { expression1_("expression1"), content_type0_("content_type0") {} - virtual void SetUp() { + void SetUp() override { AbstractPreferenceMergeTest::SetUp(); server_url_list_.Append(new base::StringValue(url0_)); SetContentPattern(&server_patterns_, expression0_, content_type0_, 1); diff --git a/chrome/browser/prefs/prefs_syncable_service_unittest.cc b/chrome/browser/prefs/prefs_syncable_service_unittest.cc index 462c46d..896648c 100644 --- a/chrome/browser/prefs/prefs_syncable_service_unittest.cc +++ b/chrome/browser/prefs/prefs_syncable_service_unittest.cc @@ -73,7 +73,7 @@ class PrefsSyncableServiceTest : public testing::Test { test_processor_(NULL), next_pref_remote_sync_node_id_(0) {} - virtual void SetUp() { + void SetUp() override { prefs_.registry()->RegisterStringPref( kUnsyncedPreferenceName, kUnsyncedPreferenceDefaultValue, diff --git a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc index bc9d983..03f47ae 100644 --- a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc +++ b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc @@ -95,7 +95,7 @@ class ProfilePrefStoreManagerTest : public testing::Test { seed_("seed"), reset_recorded_(false) {} - virtual void SetUp() override { + void SetUp() override { ProfilePrefStoreManager::RegisterPrefs(local_state_.registry()); ProfilePrefStoreManager::RegisterProfilePrefs(profile_pref_registry_.get()); for (const PrefHashFilter::TrackedPreferenceMetadata* it = kConfiguration; @@ -140,7 +140,7 @@ class ProfilePrefStoreManagerTest : public testing::Test { &local_state_)); } - virtual void TearDown() override { DestroyPrefStore(); } + void TearDown() override { DestroyPrefStore(); } protected: // Verifies whether a reset was reported via the RecordReset() hook. Also diff --git a/chrome/browser/prefs/proxy_policy_unittest.cc b/chrome/browser/prefs/proxy_policy_unittest.cc index f22b3c3..7e20c33 100644 --- a/chrome/browser/prefs/proxy_policy_unittest.cc +++ b/chrome/browser/prefs/proxy_policy_unittest.cc @@ -84,7 +84,7 @@ class ProxyPolicyTest : public testing::Test { ProxyPolicyTest() : command_line_(CommandLine::NO_PROGRAM) {} - virtual void SetUp() override { + void SetUp() override { EXPECT_CALL(provider_, IsInitializationComplete(_)) .WillRepeatedly(Return(true)); @@ -94,9 +94,7 @@ class ProxyPolicyTest : public testing::Test { provider_.Init(); } - virtual void TearDown() override { - provider_.Shutdown(); - } + void TearDown() override { provider_.Shutdown(); } scoped_ptr<PrefService> CreatePrefService(bool with_managed_policies) { PrefServiceMockFactory factory; diff --git a/chrome/browser/prefs/session_startup_pref_unittest.cc b/chrome/browser/prefs/session_startup_pref_unittest.cc index c43a67f..8712435 100644 --- a/chrome/browser/prefs/session_startup_pref_unittest.cc +++ b/chrome/browser/prefs/session_startup_pref_unittest.cc @@ -16,7 +16,7 @@ // Unit tests for SessionStartupPref. class SessionStartupPrefTest : public testing::Test { public: - virtual void SetUp() { + void SetUp() override { pref_service_.reset(new TestingPrefServiceSyncable); SessionStartupPref::RegisterProfilePrefs(registry()); registry()->RegisterBooleanPref( diff --git a/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc b/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc index f99ea75..af9a361 100644 --- a/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc +++ b/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc @@ -39,7 +39,7 @@ using testing::_; class SyncedPrefChangeRegistrarTest : public InProcessBrowserTest { public: SyncedPrefChangeRegistrarTest() : next_sync_data_id_(0) {} - virtual ~SyncedPrefChangeRegistrarTest() {} + ~SyncedPrefChangeRegistrarTest() override {} #if defined(ENABLE_CONFIGURATION_POLICY) void UpdateChromePolicy(const policy::PolicyMap& policies) { diff --git a/chrome/browser/prefs/tracked/pref_hash_filter_unittest.cc b/chrome/browser/prefs/tracked/pref_hash_filter_unittest.cc index 3c3e58e..5440da0 100644 --- a/chrome/browser/prefs/tracked/pref_hash_filter_unittest.cc +++ b/chrome/browser/prefs/tracked/pref_hash_filter_unittest.cc @@ -366,7 +366,7 @@ class PrefHashFilterTest last_filter_on_load_modified_prefs_(false), reset_recorded_(false) {} - virtual void SetUp() override { + void SetUp() override { base::StatisticsRecorder::Initialize(); Reset(); } diff --git a/chrome/browser/prefs/tracked/pref_service_hash_store_contents_unittest.cc b/chrome/browser/prefs/tracked/pref_service_hash_store_contents_unittest.cc index d0e83e3..cf7f879 100644 --- a/chrome/browser/prefs/tracked/pref_service_hash_store_contents_unittest.cc +++ b/chrome/browser/prefs/tracked/pref_service_hash_store_contents_unittest.cc @@ -13,7 +13,7 @@ class PrefServiceHashStoreContentsTest : public testing::Test { public: - virtual void SetUp() override { + void SetUp() override { PrefServiceHashStoreContents::RegisterPrefs(local_state_.registry()); } diff --git a/chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc b/chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc index 693fbfcc..27b45d7 100644 --- a/chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc +++ b/chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc @@ -62,7 +62,7 @@ class SegregatedPrefStoreTest : public testing::Test { read_error_delegate_( new MockReadErrorDelegate(&read_error_delegate_data_)) {} - virtual void SetUp() override { + void SetUp() override { selected_store_ = new TestingPrefStore; default_store_ = new TestingPrefStore; @@ -77,9 +77,7 @@ class SegregatedPrefStoreTest : public testing::Test { segregated_store_->AddObserver(&observer_); } - virtual void TearDown() override { - segregated_store_->RemoveObserver(&observer_); - } + void TearDown() override { segregated_store_->RemoveObserver(&observer_); } protected: scoped_ptr<PersistentPrefStore::ReadErrorDelegate> GetReadErrorDelegate() { diff --git a/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc b/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc index c753596..871e914 100644 --- a/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc +++ b/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc @@ -84,7 +84,7 @@ class TrackedPreferencesMigrationTest : public testing::Test { unprotected_store_migration_complete_(false), protected_store_migration_complete_(false) {} - virtual void SetUp() override { + void SetUp() override { ProfilePrefStoreManager::RegisterPrefs(local_state_.registry()); Reset(); } diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 48a9eb5..0aa25da 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -1048,7 +1048,7 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { loader_path_("files/prerender/prerender_loader.html"), explicitly_set_browser_(NULL) {} - virtual ~PrerenderBrowserTest() {} + ~PrerenderBrowserTest() override {} content::SessionStorageNamespace* GetSessionStorageNamespace() const { WebContents* web_contents = GetActiveWebContents(); @@ -3527,7 +3527,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, class PrerenderBrowserTestWithNaCl : public PrerenderBrowserTest { public: PrerenderBrowserTestWithNaCl() {} - virtual ~PrerenderBrowserTestWithNaCl() {} + ~PrerenderBrowserTestWithNaCl() override {} void SetUpCommandLine(CommandLine* command_line) override { PrerenderBrowserTest::SetUpCommandLine(command_line); @@ -3615,9 +3615,7 @@ class PrerenderBrowserTestWithExtensions : public PrerenderBrowserTest, autostart_test_server_ = false; } - virtual void SetUp() override { - PrerenderBrowserTest::SetUp(); - } + void SetUp() override { PrerenderBrowserTest::SetUp(); } void SetUpCommandLine(CommandLine* command_line) override { PrerenderBrowserTest::SetUpCommandLine(command_line); diff --git a/chrome/browser/prerender/prerender_tracker_unittest.cc b/chrome/browser/prerender/prerender_tracker_unittest.cc index 70cce6b..d7eed1d 100644 --- a/chrome/browser/prerender/prerender_tracker_unittest.cc +++ b/chrome/browser/prerender/prerender_tracker_unittest.cc @@ -175,7 +175,7 @@ class PrerenderTrackerTest : public testing::Test { chrome_browser_net::SetUrlRequestMocksEnabled(true); } - virtual ~PrerenderTrackerTest() { + ~PrerenderTrackerTest() override { chrome_browser_net::SetUrlRequestMocksEnabled(false); // Cleanup work so the file IO tasks from URLRequestMockHTTPJob diff --git a/chrome/browser/prerender/prerender_unittest.cc b/chrome/browser/prerender/prerender_unittest.cc index 0a54294..9799084 100644 --- a/chrome/browser/prerender/prerender_unittest.cc +++ b/chrome/browser/prerender/prerender_unittest.cc @@ -328,7 +328,7 @@ class PrerenderTest : public testing::Test { switches::kPrerenderFromOmniboxSwitchValueEnabled); } - virtual ~PrerenderTest() { + ~PrerenderTest() override { prerender_link_manager_->OnChannelClosing(kDefaultChildId); prerender_link_manager_->Shutdown(); prerender_manager_->Shutdown(); diff --git a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc index c3bfbeb..f25bd4b 100644 --- a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc +++ b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc @@ -300,10 +300,10 @@ class CloudPrintProxyPolicyStartupTest : public base::MultiProcessTest, public IPC::Listener { public: CloudPrintProxyPolicyStartupTest(); - virtual ~CloudPrintProxyPolicyStartupTest(); + ~CloudPrintProxyPolicyStartupTest() override; - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; scoped_refptr<base::MessageLoopProxy> IOMessageLoopProxy() { return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); diff --git a/chrome/browser/printing/print_dialog_cloud_unittest.cc b/chrome/browser/printing/print_dialog_cloud_unittest.cc index 17e468e..42f44dd 100644 --- a/chrome/browser/printing/print_dialog_cloud_unittest.cc +++ b/chrome/browser/printing/print_dialog_cloud_unittest.cc @@ -145,7 +145,7 @@ class CloudPrintDataSenderTest : public testing::Test { io_thread_(BrowserThread::IO, &message_loop_) {} protected: - virtual void SetUp() { + void SetUp() override { mock_helper_.reset(new MockCloudPrintDataSenderHelper); } @@ -222,7 +222,7 @@ class CloudPrintWebDialogDelegateTest : public testing::Test { : ui_thread_(BrowserThread::UI, &message_loop_) {} protected: - virtual void SetUp() { + void SetUp() override { base::string16 mock_title; base::string16 mock_print_ticket; std::string mock_file_type; @@ -236,7 +236,7 @@ class CloudPrintWebDialogDelegateTest : public testing::Test { std::string())); } - virtual void TearDown() { + void TearDown() override { delegate_.reset(); if (mock_flow_handler_.get()) delete mock_flow_handler_.get(); diff --git a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc index facedba..b4402af 100644 --- a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc +++ b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc @@ -98,7 +98,7 @@ class PrintPreviewDialogDestroyedObserver : public WebContentsObserver { class PrintPreviewDialogControllerBrowserTest : public InProcessBrowserTest { public: PrintPreviewDialogControllerBrowserTest() : initiator_(NULL) {} - virtual ~PrintPreviewDialogControllerBrowserTest() {} + ~PrintPreviewDialogControllerBrowserTest() override {} WebContents* initiator() { return initiator_; diff --git a/chrome/browser/printing/print_preview_pdf_generated_browsertest.cc b/chrome/browser/printing/print_preview_pdf_generated_browsertest.cc index 646f954e..62f1786 100644 --- a/chrome/browser/printing/print_preview_pdf_generated_browsertest.cc +++ b/chrome/browser/printing/print_preview_pdf_generated_browsertest.cc @@ -299,7 +299,7 @@ class PrintPreviewObserver : public WebContentsObserver { class PrintPreviewPdfGeneratedBrowserTest : public InProcessBrowserTest { public: PrintPreviewPdfGeneratedBrowserTest() {} - virtual ~PrintPreviewPdfGeneratedBrowserTest() {} + ~PrintPreviewPdfGeneratedBrowserTest() override {} // Navigates to the given web page, then initiates print preview and waits // for all the settings to be set, then save the preview to PDF. diff --git a/chrome/browser/printing/print_preview_test.h b/chrome/browser/printing/print_preview_test.h index 2a843c4..50d56dc 100644 --- a/chrome/browser/printing/print_preview_test.h +++ b/chrome/browser/printing/print_preview_test.h @@ -10,10 +10,10 @@ class PrintPreviewTest : public BrowserWithTestWindowTest { public: PrintPreviewTest(); - virtual ~PrintPreviewTest(); + ~PrintPreviewTest() override; protected: - virtual void SetUp() override; + void SetUp() override; // Create a browser window to provide parenting for web contents modal dialog. BrowserWindow* CreateBrowserWindow() override; diff --git a/chrome/browser/process_singleton_browsertest.cc b/chrome/browser/process_singleton_browsertest.cc index 4a682a2..16262f7 100644 --- a/chrome/browser/process_singleton_browsertest.cc +++ b/chrome/browser/process_singleton_browsertest.cc @@ -139,7 +139,7 @@ class ProcessSingletonTest : public InProcessBrowserTest { EXPECT_TRUE(temp_profile_dir_.CreateUniqueTempDir()); } - virtual void SetUp() { + void SetUp() override { // Start the threads and create the starters. for (size_t i = 0; i < kNbThreads; ++i) { chrome_starter_threads_[i].reset(new base::Thread("ChromeStarter")); @@ -149,7 +149,7 @@ class ProcessSingletonTest : public InProcessBrowserTest { } } - virtual void TearDown() { + void TearDown() override { // Stop the threads. for (size_t i = 0; i < kNbThreads; ++i) chrome_starter_threads_[i]->Stop(); @@ -169,7 +169,7 @@ class ProcessSingletonTest : public InProcessBrowserTest { explicit ProcessTreeFilter(base::ProcessId parent_pid) { ancestor_pids_.insert(parent_pid); } - virtual bool Includes(const base::ProcessEntry & entry) const override { + bool Includes(const base::ProcessEntry& entry) const override { if (ancestor_pids_.find(entry.parent_pid()) != ancestor_pids_.end()) { ancestor_pids_.insert(entry.pid()); return true; diff --git a/chrome/browser/process_singleton_posix_unittest.cc b/chrome/browser/process_singleton_posix_unittest.cc index 9153c1f..f12e3ff 100644 --- a/chrome/browser/process_singleton_posix_unittest.cc +++ b/chrome/browser/process_singleton_posix_unittest.cc @@ -71,7 +71,7 @@ class ProcessSingletonPosixTest : public testing::Test { io_thread_.StartIOThread(); } - virtual void SetUp() { + void SetUp() override { testing::Test::SetUp(); ProcessSingleton::DisablePromptForTesting(); @@ -89,7 +89,7 @@ class ProcessSingletonPosixTest : public testing::Test { cookie_path_ = user_data_path_.Append(chrome::kSingletonCookieFilename); } - virtual void TearDown() { + void TearDown() override { scoped_refptr<base::ThreadTestHelper> io_helper(new base::ThreadTestHelper( BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO).get())); ASSERT_TRUE(io_helper->Run()); diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc index c37e4ec..b487a46 100644 --- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc +++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc @@ -100,10 +100,10 @@ class ProfileResetterTest : public extensions::ExtensionServiceTestBase, public ProfileResetterTestBase { public: ProfileResetterTest(); - virtual ~ProfileResetterTest(); + ~ProfileResetterTest() override; protected: - virtual void SetUp() override; + void SetUp() override; TestingProfile* profile() { return profile_.get(); } @@ -161,7 +161,7 @@ KeyedService* ProfileResetterTest::CreateTemplateURLService( class PinnedTabsResetTest : public BrowserWithTestWindowTest, public ProfileResetterTestBase { protected: - virtual void SetUp() override; + void SetUp() override; content::WebContents* CreateWebContents(); }; diff --git a/chrome/browser/profiles/gaia_info_update_service_unittest.cc b/chrome/browser/profiles/gaia_info_update_service_unittest.cc index b4554847..4a89e37 100644 --- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc +++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc @@ -135,8 +135,8 @@ class GAIAInfoUpdateServiceTest : public ProfileInfoCacheTest { } private: - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; Profile* profile_; scoped_ptr<NiceMock<GAIAInfoUpdateServiceMock> > service_; diff --git a/chrome/browser/profiles/incognito_mode_policy_handler_unittest.cc b/chrome/browser/profiles/incognito_mode_policy_handler_unittest.cc index 9ca0653..5fac6d6 100644 --- a/chrome/browser/profiles/incognito_mode_policy_handler_unittest.cc +++ b/chrome/browser/profiles/incognito_mode_policy_handler_unittest.cc @@ -15,7 +15,7 @@ namespace policy { class IncognitoModePolicyHandlerTest : public ConfigurationPolicyPrefStoreTest { public: - virtual void SetUp() override { + void SetUp() override { handler_list_.AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( new IncognitoModePolicyHandler)); } diff --git a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc index 4040a71..86184c2 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc @@ -79,10 +79,10 @@ class OffTheRecordProfileImplTest : public BrowserWithTestWindowTest { protected: OffTheRecordProfileImplTest() {} - virtual ~OffTheRecordProfileImplTest() {} + ~OffTheRecordProfileImplTest() override {} // testing::Test overrides: - virtual void SetUp() override { + void SetUp() override { profile_manager_.reset(new TestingProfileManager(browser_process())); ASSERT_TRUE(profile_manager_->SetUp()); @@ -93,7 +93,7 @@ class OffTheRecordProfileImplTest : public BrowserWithTestWindowTest { BrowserWithTestWindowTest::SetUp(); } - virtual void TearDown() override { + void TearDown() override { BrowserWithTestWindowTest::TearDown(); testing_io_thread_state_.reset(); diff --git a/chrome/browser/profiles/profile_downloader_unittest.cc b/chrome/browser/profiles/profile_downloader_unittest.cc index 4bcfc6f..00e3e3b 100644 --- a/chrome/browser/profiles/profile_downloader_unittest.cc +++ b/chrome/browser/profiles/profile_downloader_unittest.cc @@ -40,8 +40,7 @@ class ProfileDownloaderTest : public testing::Test { ProfileDownloaderTest() { } - virtual ~ProfileDownloaderTest() { - } + ~ProfileDownloaderTest() override {} void VerifyWithAccountData(const std::string& full_name, const std::string& given_name, diff --git a/chrome/browser/profiles/profile_info_cache_unittest.h b/chrome/browser/profiles/profile_info_cache_unittest.h index 4908342..97d97e4 100644 --- a/chrome/browser/profiles/profile_info_cache_unittest.h +++ b/chrome/browser/profiles/profile_info_cache_unittest.h @@ -45,10 +45,10 @@ class ProfileNameVerifierObserver : public ProfileInfoCacheObserver { class ProfileInfoCacheTest : public testing::Test { protected: ProfileInfoCacheTest(); - virtual ~ProfileInfoCacheTest(); + ~ProfileInfoCacheTest() override; - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; ProfileInfoCache* GetCache(); base::FilePath GetProfilePath(const std::string& base_name); diff --git a/chrome/browser/profiles/profile_list_desktop_unittest.cc b/chrome/browser/profiles/profile_list_desktop_unittest.cc index e4cf9d7..b4e74a3 100644 --- a/chrome/browser/profiles/profile_list_desktop_unittest.cc +++ b/chrome/browser/profiles/profile_list_desktop_unittest.cc @@ -48,7 +48,7 @@ class ProfileListDesktopTest : public testing::Test { : manager_(TestingBrowserProcess::GetGlobal()) { } - virtual void SetUp() { + void SetUp() override { ASSERT_TRUE(manager_.SetUp()); #if defined(OS_CHROMEOS) // AvatarMenu and multiple profiles works after user logged in. diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc index e86c883..671a1a9 100644 --- a/chrome/browser/profiles/profile_manager_unittest.cc +++ b/chrome/browser/profiles/profile_manager_unittest.cc @@ -104,7 +104,7 @@ class ProfileManagerTest : public testing::Test { : local_state_(TestingBrowserProcess::GetGlobal()) { } - virtual void SetUp() { + void SetUp() override { // Create a new temporary directory, and store the path ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); TestingBrowserProcess::GetGlobal()->SetProfileManager( @@ -116,7 +116,7 @@ class ProfileManagerTest : public testing::Test { #endif } - virtual void TearDown() { + void TearDown() override { TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL); base::RunLoop().RunUntilIdle(); } @@ -402,7 +402,7 @@ class UnittestGuestProfileManager : public UnittestProfileManager { class ProfileManagerGuestTest : public ProfileManagerTest { protected: - virtual void SetUp() { + void SetUp() override { // Create a new temporary directory, and store the path ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); TestingBrowserProcess::GetGlobal()->SetProfileManager( diff --git a/chrome/browser/referrer_policy_browsertest.cc b/chrome/browser/referrer_policy_browsertest.cc index 71ac137..897cd62 100644 --- a/chrome/browser/referrer_policy_browsertest.cc +++ b/chrome/browser/referrer_policy_browsertest.cc @@ -35,9 +35,9 @@ const base::FilePath::CharType kDocRoot[] = class ReferrerPolicyTest : public InProcessBrowserTest { public: ReferrerPolicyTest() {} - virtual ~ReferrerPolicyTest() {} + ~ReferrerPolicyTest() override {} - virtual void SetUp() override { + void SetUp() override { test_server_.reset(new net::SpawnedTestServer( net::SpawnedTestServer::TYPE_HTTP, net::SpawnedTestServer::kLocalhost, diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc index 529b5b12..011ee54 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc @@ -242,12 +242,12 @@ TEST_F(RenderViewContextMenuTest, TargetIgnoredForSelectionOnImage) { class RenderViewContextMenuPrefsTest : public ChromeRenderViewHostTestHarness { public: - virtual void SetUp() override { + void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); registry_.reset(new ProtocolHandlerRegistry(profile(), NULL)); } - virtual void TearDown() override { + void TearDown() override { registry_.reset(); ChromeRenderViewHostTestHarness::TearDown(); } diff --git a/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_browsertest.cc b/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_browsertest.cc index ab248d2..608df49 100644 --- a/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_browsertest.cc +++ b/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_browsertest.cc @@ -113,7 +113,7 @@ class MockRenderViewContextMenu : public ui::SimpleMenuModel::Delegate, class SpellCheckerSubMenuObserverTest : public InProcessBrowserTest { public: SpellCheckerSubMenuObserverTest() {} - virtual ~SpellCheckerSubMenuObserverTest() {} + ~SpellCheckerSubMenuObserverTest() override {} private: DISALLOW_COPY_AND_ASSIGN(SpellCheckerSubMenuObserverTest); diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc b/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc index 4055cf7..7c68b41 100644 --- a/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc +++ b/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc @@ -238,7 +238,7 @@ class SpellingMenuObserverTest : public InProcessBrowserTest { menu()->GetBrowserContext(), SpellingServiceClient::SPELLCHECK)); } - virtual ~SpellingMenuObserverTest(); + ~SpellingMenuObserverTest() override; MockRenderViewContextMenu* menu() { return menu_.get(); } SpellingMenuObserver* observer() { return observer_.get(); } private: diff --git a/chrome/browser/screensaver_window_finder_x11.h b/chrome/browser/screensaver_window_finder_x11.h index 7cfe66f..2793497 100644 --- a/chrome/browser/screensaver_window_finder_x11.h +++ b/chrome/browser/screensaver_window_finder_x11.h @@ -14,7 +14,7 @@ class ScreensaverWindowFinder : public ui::EnumerateWindowsDelegate { static bool ScreensaverWindowExists(); protected: - virtual bool ShouldStopIterating(XID window) override; + bool ShouldStopIterating(XID window) override; private: ScreensaverWindowFinder(); diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc index 8300371..2a35b34 100644 --- a/chrome/browser/search/hotword_service_unittest.cc +++ b/chrome/browser/search/hotword_service_unittest.cc @@ -93,7 +93,7 @@ class HotwordServiceTest : #endif } - virtual void SetUp() { + void SetUp() override { extension_id_ = GetParam(); if (extension_id_ == extension_misc::kHotwordSharedModuleId) { base::CommandLine::ForCurrentProcess()->AppendSwitch( diff --git a/chrome/browser/search/iframe_source_unittest.cc b/chrome/browser/search/iframe_source_unittest.cc index 4adfe03..728de4c 100644 --- a/chrome/browser/search/iframe_source_unittest.cc +++ b/chrome/browser/search/iframe_source_unittest.cc @@ -126,7 +126,7 @@ class IframeSourceTest : public testing::Test { } private: - virtual void SetUp() override { + void SetUp() override { source_.reset(new TestIframeSource()); callback_ = base::Bind(&IframeSourceTest::SaveResponse, base::Unretained(this)); @@ -137,9 +137,7 @@ class IframeSourceTest : public testing::Test { response_ = NULL; } - virtual void TearDown() { - source_.reset(); - } + void TearDown() override { source_.reset(); } void SaveResponse(base::RefCountedMemory* data) { response_ = data; diff --git a/chrome/browser/search/instant_service_unittest.cc b/chrome/browser/search/instant_service_unittest.cc index c24cde5..bacd7ae 100644 --- a/chrome/browser/search/instant_service_unittest.cc +++ b/chrome/browser/search/instant_service_unittest.cc @@ -34,14 +34,14 @@ class MockInstantServiceObserver : public InstantServiceObserver { class InstantServiceTest : public InstantUnitTestBase { protected: - virtual void SetUp() override { + void SetUp() override { InstantUnitTestBase::SetUp(); instant_service_observer_.reset(new MockInstantServiceObserver()); instant_service_->AddObserver(instant_service_observer_.get()); } - virtual void TearDown() override { + void TearDown() override { instant_service_->RemoveObserver(instant_service_observer_.get()); InstantUnitTestBase::TearDown(); } @@ -59,7 +59,7 @@ class InstantServiceTest : public InstantUnitTestBase { class InstantServiceEnabledTest : public InstantServiceTest { protected: - virtual void SetUp() override { + void SetUp() override { ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial( "EmbeddedSearch", "Group1 use_cacheable_ntp:1")); InstantServiceTest::SetUp(); diff --git a/chrome/browser/search/instant_unittest_base.h b/chrome/browser/search/instant_unittest_base.h index 2aa48f6..a99b2f0 100644 --- a/chrome/browser/search/instant_unittest_base.h +++ b/chrome/browser/search/instant_unittest_base.h @@ -20,10 +20,10 @@ class InstantServiceObserver; class InstantUnitTestBase : public BrowserWithTestWindowTest { protected: InstantUnitTestBase(); - virtual ~InstantUnitTestBase(); + ~InstantUnitTestBase() override; - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; #if !defined(OS_IOS) && !defined(OS_ANDROID) // Query extraction is always enabled on Android and iOS. diff --git a/chrome/browser/search/most_visited_iframe_source_unittest.cc b/chrome/browser/search/most_visited_iframe_source_unittest.cc index 232b936..f330913 100644 --- a/chrome/browser/search/most_visited_iframe_source_unittest.cc +++ b/chrome/browser/search/most_visited_iframe_source_unittest.cc @@ -19,7 +19,7 @@ class MostVisitedIframeSourceTest : public testing::Test { MostVisitedIframeSource* source() { return source_.get(); } private: - virtual void SetUp() { source_.reset(new MostVisitedIframeSource()); } + void SetUp() override { source_.reset(new MostVisitedIframeSource()); } scoped_ptr<MostVisitedIframeSource> source_; }; diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc index b3bfe2b..7a4187f 100644 --- a/chrome/browser/search/search_unittest.cc +++ b/chrome/browser/search/search_unittest.cc @@ -41,7 +41,7 @@ namespace chrome { class SearchTest : public BrowserWithTestWindowTest { protected: - virtual void SetUp() override { + void SetUp() override { BrowserWithTestWindowTest::SetUp(); field_trial_list_.reset(new base::FieldTrialList( new metrics::SHA1EntropyProvider("42"))); diff --git a/chrome/browser/search_engines/default_search_pref_migration_unittest.cc b/chrome/browser/search_engines/default_search_pref_migration_unittest.cc index 14a912f..0ff5c79 100644 --- a/chrome/browser/search_engines/default_search_pref_migration_unittest.cc +++ b/chrome/browser/search_engines/default_search_pref_migration_unittest.cc @@ -24,7 +24,7 @@ class DefaultSearchPrefMigrationTest : public testing::Test { DefaultSearchPrefMigrationTest(); // testing::Test: - virtual void SetUp() override; + void SetUp() override; scoped_ptr<TemplateURL> CreateKeyword(const std::string& short_name, const std::string& keyword, diff --git a/chrome/browser/search_engines/search_provider_install_data_unittest.cc b/chrome/browser/search_engines/search_provider_install_data_unittest.cc index 017a7c5..31c0434 100644 --- a/chrome/browser/search_engines/search_provider_install_data_unittest.cc +++ b/chrome/browser/search_engines/search_provider_install_data_unittest.cc @@ -119,8 +119,8 @@ class SearchProviderInstallDataTest : public testing::Test { public: SearchProviderInstallDataTest(); - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; TemplateURL* AddNewTemplateURL(const std::string& url, const base::string16& keyword); diff --git a/chrome/browser/services/gcm/gcm_account_tracker_unittest.cc b/chrome/browser/services/gcm/gcm_account_tracker_unittest.cc index b9b2b4f..2211d76 100644 --- a/chrome/browser/services/gcm/gcm_account_tracker_unittest.cc +++ b/chrome/browser/services/gcm/gcm_account_tracker_unittest.cc @@ -146,7 +146,7 @@ void CustomFakeGCMDriver::ResetResults() { class GCMAccountTrackerTest : public testing::Test { public: GCMAccountTrackerTest(); - virtual ~GCMAccountTrackerTest(); + ~GCMAccountTrackerTest() override; // Helpers to pass fake events to the tracker. Tests should have either a pair // of Start/FinishAccountSignIn or SignInAccount per account. Don't mix. diff --git a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc index ce682ab..3c9fb7b 100644 --- a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc +++ b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc @@ -54,11 +54,11 @@ KeyedService* BuildGCMProfileService(content::BrowserContext* context) { class GCMProfileServiceTest : public testing::Test { protected: GCMProfileServiceTest(); - virtual ~GCMProfileServiceTest(); + ~GCMProfileServiceTest() override; // testing::Test: - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; FakeGCMClient* GetGCMClient() const; diff --git a/chrome/browser/services/gcm/push_messaging_browsertest.cc b/chrome/browser/services/gcm/push_messaging_browsertest.cc index 67d0321..d9ab8cb 100644 --- a/chrome/browser/services/gcm/push_messaging_browsertest.cc +++ b/chrome/browser/services/gcm/push_messaging_browsertest.cc @@ -44,7 +44,7 @@ class InfoBarResponder : public infobars::InfoBarManager::Observer { virtual ~InfoBarResponder() { infobar_service_->RemoveObserver(this); } // infobars::InfoBarManager::Observer - virtual void OnInfoBarAdded(infobars::InfoBar* infobar) override { + void OnInfoBarAdded(infobars::InfoBar* infobar) override { if (has_observed_) return; has_observed_ = true; @@ -77,10 +77,10 @@ class InfoBarResponder : public infobars::InfoBarManager::Observer { class PushMessagingBrowserTest : public InProcessBrowserTest { public: PushMessagingBrowserTest() : gcm_service_(nullptr) {} - virtual ~PushMessagingBrowserTest() {} + ~PushMessagingBrowserTest() override {} // InProcessBrowserTest: - virtual void SetUpCommandLine(base::CommandLine* command_line) override { + void SetUpCommandLine(base::CommandLine* command_line) override { command_line->AppendSwitch( switches::kEnableExperimentalWebPlatformFeatures); @@ -88,7 +88,7 @@ class PushMessagingBrowserTest : public InProcessBrowserTest { } // InProcessBrowserTest: - virtual void SetUp() override { + void SetUp() override { https_server_.reset(new net::SpawnedTestServer( net::SpawnedTestServer::TYPE_HTTPS, net::BaseTestServer::SSLOptions( @@ -100,7 +100,7 @@ class PushMessagingBrowserTest : public InProcessBrowserTest { } // InProcessBrowserTest: - virtual void SetUpOnMainThread() override { + void SetUpOnMainThread() override { gcm_service_ = static_cast<FakeGCMProfileService*>( GCMProfileServiceFactory::GetInstance()->SetTestingFactoryAndUse( browser()->profile(), &FakeGCMProfileService::Build)); diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc index 395ac20..73c971f 100644 --- a/chrome/browser/sessions/better_session_restore_browsertest.cc +++ b/chrome/browser/sessions/better_session_restore_browsertest.cc @@ -583,7 +583,8 @@ IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, class RestartTest : public BetterSessionRestoreTest { public: RestartTest() { } - virtual ~RestartTest() { } + ~RestartTest() override {} + protected: void Restart() { // Simulate restarting the browser, but let the test exit peacefully. diff --git a/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc b/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc index 8a52e61..4a30d1b 100644 --- a/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc +++ b/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc @@ -66,8 +66,7 @@ class PersistentTabRestoreServiceTest : public ChromeRenderViewHostTestHarness { time_factory_(NULL) { } - virtual ~PersistentTabRestoreServiceTest() { - } + ~PersistentTabRestoreServiceTest() override {} protected: enum { @@ -75,13 +74,13 @@ class PersistentTabRestoreServiceTest : public ChromeRenderViewHostTestHarness { }; // testing::Test: - virtual void SetUp() override { + void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); time_factory_ = new PersistentTabRestoreTimeFactory(); service_.reset(new PersistentTabRestoreService(profile(), time_factory_)); } - virtual void TearDown() override { + void TearDown() override { service_->Shutdown(); service_.reset(); delete time_factory_; diff --git a/chrome/browser/sessions/session_backend_unittest.cc b/chrome/browser/sessions/session_backend_unittest.cc index 972834f..0c7ea0f 100644 --- a/chrome/browser/sessions/session_backend_unittest.cc +++ b/chrome/browser/sessions/session_backend_unittest.cc @@ -32,7 +32,7 @@ SessionCommand* CreateCommandFromData(const TestData& data) { class SessionBackendTest : public testing::Test { protected: - virtual void SetUp() { + void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); path_ = temp_dir_.path().Append(FILE_PATH_LITERAL("SessionTestDirs")); base::CreateDirectory(path_); diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc index 64f6fd5..db6da82 100644 --- a/chrome/browser/sessions/session_service_unittest.cc +++ b/chrome/browser/sessions/session_service_unittest.cc @@ -47,7 +47,7 @@ class SessionServiceTest : public BrowserWithTestWindowTest, SessionServiceTest() : window_bounds(0, 1, 2, 3), sync_save_count_(0) {} protected: - virtual void SetUp() { + void SetUp() override { BrowserWithTestWindowTest::SetUp(); profile_manager_.reset( @@ -76,7 +76,7 @@ class SessionServiceTest : public BrowserWithTestWindowTest, sync_save_count_++; } - virtual void TearDown() { + void TearDown() override { helper_.SetService(NULL); BrowserWithTestWindowTest::TearDown(); } diff --git a/chrome/browser/shell_integration_linux_unittest.cc b/chrome/browser/shell_integration_linux_unittest.cc index c2471f2..ae62300 100644 --- a/chrome/browser/shell_integration_linux_unittest.cc +++ b/chrome/browser/shell_integration_linux_unittest.cc @@ -43,7 +43,7 @@ class MockEnvironment : public base::Environment { variables_[name] = value; } - virtual bool GetVar(const char* variable_name, std::string* result) override { + bool GetVar(const char* variable_name, std::string* result) override { if (ContainsKey(variables_, variable_name)) { *result = variables_[variable_name]; return true; @@ -52,13 +52,13 @@ class MockEnvironment : public base::Environment { return false; } - virtual bool SetVar(const char* variable_name, - const std::string& new_value) override { + bool SetVar(const char* variable_name, + const std::string& new_value) override { ADD_FAILURE(); return false; } - virtual bool UnSetVar(const char* variable_name) override { + bool UnSetVar(const char* variable_name) override { ADD_FAILURE(); return false; } diff --git a/chrome/browser/signin/account_reconcilor_unittest.cc b/chrome/browser/signin/account_reconcilor_unittest.cc index 4dd4665..7178d35 100644 --- a/chrome/browser/signin/account_reconcilor_unittest.cc +++ b/chrome/browser/signin/account_reconcilor_unittest.cc @@ -79,7 +79,7 @@ MockAccountReconcilor::MockAccountReconcilor( class AccountReconcilorTest : public ::testing::TestWithParam<bool> { public: AccountReconcilorTest(); - virtual void SetUp() override; + void SetUp() override; TestingProfile* profile() { return profile_; } FakeSigninManagerForTesting* signin_manager() { return signin_manager_; } diff --git a/chrome/browser/signin/easy_unlock_screenlock_state_handler_unittest.cc b/chrome/browser/signin/easy_unlock_screenlock_state_handler_unittest.cc index a6106ff..38c477d 100644 --- a/chrome/browser/signin/easy_unlock_screenlock_state_handler_unittest.cc +++ b/chrome/browser/signin/easy_unlock_screenlock_state_handler_unittest.cc @@ -195,9 +195,9 @@ class TestLockHandler : public ScreenlockBridge::LockHandler { class EasyUnlockScreenlockStateHandlerTest : public testing::Test { public: EasyUnlockScreenlockStateHandlerTest() : user_email_("test_user@gmail.com") {} - virtual ~EasyUnlockScreenlockStateHandlerTest() {} + ~EasyUnlockScreenlockStateHandlerTest() override {} - virtual void SetUp() override { + void SetUp() override { TestingBrowserProcess::GetGlobal()->SetApplicationLocale("en-US"); // Create and inject fake lock handler to the screenlock bridge. @@ -212,7 +212,7 @@ class EasyUnlockScreenlockStateHandlerTest : public testing::Test { screenlock_bridge)); } - virtual void TearDown() override { + void TearDown() override { ScreenlockBridge::Get()->SetLockHandler(NULL); lock_handler_.reset(); state_handler_.reset(); diff --git a/chrome/browser/signin/signin_browsertest.cc b/chrome/browser/signin/signin_browsertest.cc index b7645c4..a3ff1fc 100644 --- a/chrome/browser/signin/signin_browsertest.cc +++ b/chrome/browser/signin/signin_browsertest.cc @@ -56,7 +56,7 @@ class SigninBrowserTest : public InProcessBrowserTest { command_line->AppendSwitch(switches::kEnableWebBasedSignin); } - virtual void SetUp() override { + void SetUp() override { factory_.reset(new net::URLFetcherImplFactory()); fake_factory_.reset(new net::FakeURLFetcherFactory(factory_.get())); fake_factory_->SetFakeResponse( @@ -69,7 +69,7 @@ class SigninBrowserTest : public InProcessBrowserTest { InProcessBrowserTest::SetUp(); } - virtual void TearDown() override { + void TearDown() override { if (fake_factory_.get()) { fake_factory_->ClearFakeResponses(); fake_factory_.reset(); diff --git a/chrome/browser/signin/signin_error_notifier_ash.cc b/chrome/browser/signin/signin_error_notifier_ash.cc index cd61bb0..d1f9f58 100644 --- a/chrome/browser/signin/signin_error_notifier_ash.cc +++ b/chrome/browser/signin/signin_error_notifier_ash.cc @@ -50,16 +50,16 @@ class SigninNotificationDelegate : 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 ~SigninNotificationDelegate(); + ~SigninNotificationDelegate() override; private: void FixSignIn(); diff --git a/chrome/browser/signin/signin_error_notifier_ash.h b/chrome/browser/signin/signin_error_notifier_ash.h index 1b7a2d7..c371fb3 100644 --- a/chrome/browser/signin/signin_error_notifier_ash.h +++ b/chrome/browser/signin/signin_error_notifier_ash.h @@ -20,13 +20,13 @@ class SigninErrorNotifier : public SigninErrorController::Observer, public KeyedService { public: SigninErrorNotifier(SigninErrorController* controller, Profile* profile); - virtual ~SigninErrorNotifier(); + ~SigninErrorNotifier() override; // KeyedService: - virtual void Shutdown() override; + void Shutdown() override; // SigninErrorController::Observer: - virtual void OnErrorChanged() override; + void OnErrorChanged() override; private: base::string16 GetMessageBody() const; diff --git a/chrome/browser/signin/signin_error_notifier_ash_unittest.cc b/chrome/browser/signin/signin_error_notifier_ash_unittest.cc index e0d539a..0f5b4f2 100644 --- a/chrome/browser/signin/signin_error_notifier_ash_unittest.cc +++ b/chrome/browser/signin/signin_error_notifier_ash_unittest.cc @@ -62,7 +62,7 @@ class ScreenTypeDelegateDesktop : public gfx::ScreenTypeDelegate { class SigninErrorNotifierTest : public AshTestBase { public: - virtual void SetUp() override { + void SetUp() override { // Create a signed-in profile. TestingProfile::Builder builder; builder.AddTestingFactory(SigninManagerFactory::GetInstance(), @@ -91,7 +91,7 @@ class SigninErrorNotifierTest : public AshTestBase { notification_ui_manager_ = g_browser_process->notification_ui_manager(); } - virtual void TearDown() override { + void TearDown() override { #if defined(OS_WIN) test_screen_.reset(); #endif diff --git a/chrome/browser/signin/signin_error_notifier_factory_ash.h b/chrome/browser/signin/signin_error_notifier_factory_ash.h index d9af918..7071b65 100644 --- a/chrome/browser/signin/signin_error_notifier_factory_ash.h +++ b/chrome/browser/signin/signin_error_notifier_factory_ash.h @@ -27,10 +27,10 @@ class SigninErrorNotifierFactory : public BrowserContextKeyedServiceFactory { friend struct DefaultSingletonTraits<SigninErrorNotifierFactory>; SigninErrorNotifierFactory(); - virtual ~SigninErrorNotifierFactory(); + ~SigninErrorNotifierFactory() override; // BrowserContextKeyedServiceFactory: - virtual KeyedService* BuildServiceInstanceFor( + KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const override; DISALLOW_COPY_AND_ASSIGN(SigninErrorNotifierFactory); diff --git a/chrome/browser/signin/signin_global_error_unittest.cc b/chrome/browser/signin/signin_global_error_unittest.cc index 8f6c08c..f01e9e91 100644 --- a/chrome/browser/signin/signin_global_error_unittest.cc +++ b/chrome/browser/signin/signin_global_error_unittest.cc @@ -27,7 +27,7 @@ static const char kTestUsername[] = "testuser@test.com"; class SigninGlobalErrorTest : public testing::Test { public: - virtual void SetUp() override { + void SetUp() override { // Create a signed-in profile. TestingProfile::Builder builder; builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(), diff --git a/chrome/browser/signin/signin_manager_unittest.cc b/chrome/browser/signin/signin_manager_unittest.cc index 1c43999..f1bee6f 100644 --- a/chrome/browser/signin/signin_manager_unittest.cc +++ b/chrome/browser/signin/signin_manager_unittest.cc @@ -91,9 +91,9 @@ class TestSigninManagerObserver : public SigninManagerBase::Observer { class SigninManagerTest : public testing::Test { public: SigninManagerTest() : manager_(NULL) {} - virtual ~SigninManagerTest() {} + ~SigninManagerTest() override {} - virtual void SetUp() override { + void SetUp() override { manager_ = NULL; prefs_.reset(new TestingPrefServiceSimple); chrome::RegisterLocalState(prefs_->registry()); @@ -113,7 +113,7 @@ class SigninManagerTest : public testing::Test { SetURLRequestContext(profile_->GetRequestContext()); } - virtual void TearDown() override { + void TearDown() override { if (manager_) manager_->RemoveObserver(&test_observer_); diff --git a/chrome/browser/signin/signin_names_io_thread_unittest.cc b/chrome/browser/signin/signin_names_io_thread_unittest.cc index 937252f..d79013e 100644 --- a/chrome/browser/signin/signin_names_io_thread_unittest.cc +++ b/chrome/browser/signin/signin_names_io_thread_unittest.cc @@ -22,8 +22,8 @@ class SigninNamesOnIOThreadTest : public testing::Test { public: SigninNamesOnIOThreadTest(); - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; void SimulateSignin(const base::string16& email); void AddNewProfile(const base::string16& name, const base::string16& email); diff --git a/chrome/browser/signin/signin_tracker_unittest.cc b/chrome/browser/signin/signin_tracker_unittest.cc index d72c3fa..e982549 100644 --- a/chrome/browser/signin/signin_tracker_unittest.cc +++ b/chrome/browser/signin/signin_tracker_unittest.cc @@ -51,7 +51,7 @@ class MockObserver : public SigninTracker::Observer { class SigninTrackerTest : public testing::Test { public: SigninTrackerTest() {} - virtual void SetUp() override { + void SetUp() override { TestingProfile::Builder builder; builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(), BuildFakeProfileOAuth2TokenService); @@ -69,7 +69,7 @@ class SigninTrackerTest : public testing::Test { tracker_ = SigninTrackerFactory::CreateForProfile(profile_.get(), &observer_); } - virtual void TearDown() override { + void TearDown() override { tracker_.reset(); profile_.reset(); } diff --git a/chrome/browser/speech/tts_linux.cc b/chrome/browser/speech/tts_linux.cc index f9fc27d..e3aa093 100644 --- a/chrome/browser/speech/tts_linux.cc +++ b/chrome/browser/speech/tts_linux.cc @@ -33,18 +33,17 @@ struct SPDChromeVoice { class TtsPlatformImplLinux : public TtsPlatformImpl { public: - virtual bool PlatformImplAvailable() override; - virtual bool Speak( - int utterance_id, - const std::string& utterance, - const std::string& lang, - const VoiceData& voice, - const UtteranceContinuousParameters& params) override; - virtual bool StopSpeaking() override; - virtual void Pause() override; - virtual void Resume() override; - virtual bool IsSpeaking() override; - virtual void GetVoices(std::vector<VoiceData>* out_voices) override; + bool PlatformImplAvailable() override; + bool Speak(int utterance_id, + const std::string& utterance, + const std::string& lang, + const VoiceData& voice, + const UtteranceContinuousParameters& params) override; + bool StopSpeaking() override; + void Pause() override; + void Resume() override; + bool IsSpeaking() override; + void GetVoices(std::vector<VoiceData>* out_voices) override; void OnSpeechEvent(SPDNotificationType type); @@ -53,7 +52,7 @@ class TtsPlatformImplLinux : public TtsPlatformImpl { private: TtsPlatformImplLinux(); - virtual ~TtsPlatformImplLinux(); + ~TtsPlatformImplLinux() override; // Initiate the connection with the speech dispatcher. void Initialize(); diff --git a/chrome/browser/spellchecker/feedback_sender_unittest.cc b/chrome/browser/spellchecker/feedback_sender_unittest.cc index 3c93034..6c278a9 100644 --- a/chrome/browser/spellchecker/feedback_sender_unittest.cc +++ b/chrome/browser/spellchecker/feedback_sender_unittest.cc @@ -66,7 +66,7 @@ class FeedbackSenderTest : public testing::Test { feedback_->StartFeedbackCollection(); } - virtual ~FeedbackSenderTest() {} + ~FeedbackSenderTest() override {} protected: // Appends the "--enable-spelling-service-feedback" switch to the diff --git a/chrome/browser/spellchecker/feedback_unittest.cc b/chrome/browser/spellchecker/feedback_unittest.cc index e1c773d..09d0af7 100644 --- a/chrome/browser/spellchecker/feedback_unittest.cc +++ b/chrome/browser/spellchecker/feedback_unittest.cc @@ -27,7 +27,7 @@ const uint32 kMisspellingHash = 42; class FeedbackTest : public testing::Test { public: FeedbackTest() {} - virtual ~FeedbackTest() {} + ~FeedbackTest() override {} protected: void AddMisspelling(int renderer_process_id, uint32 hash) { diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc index ea63572..3947eec 100644 --- a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc +++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc @@ -63,7 +63,7 @@ static KeyedService* BuildSpellcheckService(content::BrowserContext* profile) { class SpellcheckCustomDictionaryTest : public testing::Test { protected: - virtual void SetUp() override { + void SetUp() override { // Use SetTestingFactoryAndUse to force creation and initialization. SpellcheckServiceFactory::GetInstance()->SetTestingFactoryAndUse( &profile_, &BuildSpellcheckService); diff --git a/chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc b/chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc index bfbd814..f66379a 100644 --- a/chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc +++ b/chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc @@ -27,9 +27,7 @@ class SpellcheckHostMetricsTest : public testing::Test { base::StatisticsRecorder::Initialize(); } - virtual void SetUp() override { - metrics_.reset(new SpellCheckHostMetrics); - } + void SetUp() override { metrics_.reset(new SpellCheckHostMetrics); } SpellCheckHostMetrics* metrics() { return metrics_.get(); } void RecordWordCountsForTesting() { metrics_->RecordWordCounts(); } diff --git a/chrome/browser/spellchecker/spellcheck_service_unittest.cc b/chrome/browser/spellchecker/spellcheck_service_unittest.cc index 1c44157..5d30455 100644 --- a/chrome/browser/spellchecker/spellcheck_service_unittest.cc +++ b/chrome/browser/spellchecker/spellcheck_service_unittest.cc @@ -23,7 +23,7 @@ static KeyedService* BuildSpellcheckService(content::BrowserContext* profile) { class SpellcheckServiceTest : public testing::Test { protected: - virtual void SetUp() override { + void SetUp() override { // Use SetTestingFactoryAndUse to force creation and initialization. SpellcheckServiceFactory::GetInstance()->SetTestingFactoryAndUse( &profile_, &BuildSpellcheckService); diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 11a0c23..e3abb4d 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -738,7 +738,7 @@ class SSLUITestWithClientCert : public SSLUITest { public: SSLUITestWithClientCert() : cert_db_(NULL) {} - virtual void SetUpOnMainThread() override { + void SetUpOnMainThread() override { SSLUITest::SetUpOnMainThread(); base::RunLoop loop; diff --git a/chrome/browser/ssl/ssl_client_certificate_selector_test.h b/chrome/browser/ssl/ssl_client_certificate_selector_test.h index ca8c6fe..d646c49 100644 --- a/chrome/browser/ssl/ssl_client_certificate_selector_test.h +++ b/chrome/browser/ssl/ssl_client_certificate_selector_test.h @@ -18,7 +18,7 @@ class URLRequestContextGetter; class SSLClientCertificateSelectorTestBase : public InProcessBrowserTest { public: SSLClientCertificateSelectorTestBase(); - virtual ~SSLClientCertificateSelectorTestBase(); + ~SSLClientCertificateSelectorTestBase() override; // InProcessBrowserTest: void SetUpInProcessBrowserTestFixture() override; diff --git a/chrome/browser/status_icons/status_icon_menu_model_unittest.cc b/chrome/browser/status_icons/status_icon_menu_model_unittest.cc index b0d73f6e..4c2a2b0 100644 --- a/chrome/browser/status_icons/status_icon_menu_model_unittest.cc +++ b/chrome/browser/status_icons/status_icon_menu_model_unittest.cc @@ -20,15 +20,13 @@ using base::ASCIIToUTF16; class StatusIconMenuModelTest : public testing::Test, public StatusIconMenuModel::Observer { public: - virtual void SetUp() override { + void SetUp() override { menu_.reset(new StatusIconMenuModel(NULL)); menu_->AddObserver(this); changed_count_ = 0; } - virtual void TearDown() override { - menu_->RemoveObserver(this); - } + void TearDown() override { menu_->RemoveObserver(this); } virtual int changed_count() { return changed_count_; diff --git a/chrome/browser/supervised_user/supervised_user_browsertest.cc b/chrome/browser/supervised_user/supervised_user_browsertest.cc index dc8c286..213e0b5 100644 --- a/chrome/browser/supervised_user/supervised_user_browsertest.cc +++ b/chrome/browser/supervised_user/supervised_user_browsertest.cc @@ -53,7 +53,7 @@ class SupervisedUserBlockModeTest : public InProcessBrowserTest { }; SupervisedUserBlockModeTest() : supervised_user_service_(NULL) {} - virtual ~SupervisedUserBlockModeTest() {} + ~SupervisedUserBlockModeTest() override {} void CheckShownPageIsInterstitial(WebContents* tab) { CheckShownPage(tab, content::PAGE_TYPE_INTERSTITIAL); diff --git a/chrome/browser/supervised_user/supervised_user_pref_mapping_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_pref_mapping_service_unittest.cc index 3c0af60..bae82f9 100644 --- a/chrome/browser/supervised_user/supervised_user_pref_mapping_service_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_pref_mapping_service_unittest.cc @@ -28,14 +28,12 @@ class SupervisedUserPrefMappingServiceTest : public ::testing::Test { SupervisedUserPrefMappingServiceFactory::GetForBrowserContext( &profile_); } - virtual ~SupervisedUserPrefMappingServiceTest() {} + ~SupervisedUserPrefMappingServiceTest() override {} // testing::Test overrides: - virtual void SetUp() override { - mapping_service_->Init(); - } + void SetUp() override { mapping_service_->Init(); } - virtual void TearDown() override { + void TearDown() override { mapping_service_->Shutdown(); shared_settings_service_->Shutdown(); } diff --git a/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc b/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc index 49ca495..7e80748 100644 --- a/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc @@ -72,8 +72,8 @@ void SupervisedUserPrefStoreFixture::OnInitializationCompleted(bool succeeded) { class SupervisedUserPrefStoreTest : public ::testing::Test { public: - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; protected: SupervisedUserSettingsService service_; diff --git a/chrome/browser/supervised_user/supervised_user_refresh_token_fetcher_unittest.cc b/chrome/browser/supervised_user/supervised_user_refresh_token_fetcher_unittest.cc index 621d3ca..9e03160 100644 --- a/chrome/browser/supervised_user/supervised_user_refresh_token_fetcher_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_refresh_token_fetcher_unittest.cc @@ -89,7 +89,7 @@ void VerifyTokenRequest( class SupervisedUserRefreshTokenFetcherTest : public testing::Test { public: SupervisedUserRefreshTokenFetcherTest(); - virtual ~SupervisedUserRefreshTokenFetcherTest() {} + ~SupervisedUserRefreshTokenFetcherTest() override {} protected: void StartFetching(); diff --git a/chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc b/chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc index a5831cb..2e37027 100644 --- a/chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc @@ -89,9 +89,9 @@ class MockSupervisedUserRefreshTokenFetcher class SupervisedUserRegistrationUtilityTest : public ::testing::Test { public: SupervisedUserRegistrationUtilityTest(); - virtual ~SupervisedUserRegistrationUtilityTest(); + ~SupervisedUserRegistrationUtilityTest() override; - virtual void TearDown() override; + void TearDown() override; protected: scoped_ptr<SyncChangeProcessor> CreateChangeProcessor(); diff --git a/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc b/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc index ac57bcf..f198127 100644 --- a/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc +++ b/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc @@ -30,7 +30,7 @@ using content::WebContents; class SupervisedUserResourceThrottleTest : public InProcessBrowserTest { protected: SupervisedUserResourceThrottleTest() : supervised_user_service_(NULL) {} - virtual ~SupervisedUserResourceThrottleTest() {} + ~SupervisedUserResourceThrottleTest() override {} private: void SetUpOnMainThread() override; diff --git a/chrome/browser/supervised_user/supervised_user_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_service_unittest.cc index a37c3af..8e6a531 100644 --- a/chrome/browser/supervised_user/supervised_user_service_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_service_unittest.cc @@ -98,7 +98,7 @@ class SupervisedUserServiceTest : public ::testing::Test { public: SupervisedUserServiceTest() {} - virtual void SetUp() override { + void SetUp() override { TestingProfile::Builder builder; builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(), BuildFakeProfileOAuth2TokenService); @@ -107,11 +107,9 @@ class SupervisedUserServiceTest : public ::testing::Test { SupervisedUserServiceFactory::GetForProfile(profile_.get()); } - virtual void TearDown() override { - profile_.reset(); - } + void TearDown() override { profile_.reset(); } - virtual ~SupervisedUserServiceTest() {} + ~SupervisedUserServiceTest() override {} protected: void AddAccessRequest(const GURL& url, AsyncResultHolder* result_holder) { @@ -275,9 +273,9 @@ class SupervisedUserServiceExtensionTestBase explicit SupervisedUserServiceExtensionTestBase(bool is_supervised) : is_supervised_(is_supervised), channel_(chrome::VersionInfo::CHANNEL_DEV) {} - virtual ~SupervisedUserServiceExtensionTestBase() {} + ~SupervisedUserServiceExtensionTestBase() override {} - virtual void SetUp() override { + void SetUp() override { ExtensionServiceTestBase::SetUp(); ExtensionServiceTestBase::ExtensionServiceInitParams params = CreateDefaultInitParams(); diff --git a/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc index 934d6a9..3435e32 100644 --- a/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc @@ -57,7 +57,7 @@ const char kSplitItemName[] = "X-SuperMoosePowers"; class SupervisedUserSettingsServiceTest : public ::testing::Test { protected: SupervisedUserSettingsServiceTest() {} - virtual ~SupervisedUserSettingsServiceTest() {} + ~SupervisedUserSettingsServiceTest() override {} scoped_ptr<syncer::SyncChangeProcessor> CreateSyncProcessor() { sync_processor_.reset(new syncer::FakeSyncChangeProcessor); @@ -119,7 +119,7 @@ class SupervisedUserSettingsServiceTest : public ::testing::Test { } // testing::Test overrides: - virtual void SetUp() override { + void SetUp() override { TestingPrefStore* pref_store = new TestingPrefStore; settings_service_.Init(pref_store); settings_service_.Subscribe( @@ -131,9 +131,7 @@ class SupervisedUserSettingsServiceTest : public ::testing::Test { ASSERT_TRUE(settings_); } - virtual void TearDown() override { - settings_service_.Shutdown(); - } + void TearDown() override { settings_service_.Shutdown(); } base::DictionaryValue split_items_; scoped_ptr<base::Value> atomic_setting_value_; diff --git a/chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc index 72e3f8e..619daca 100644 --- a/chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc @@ -81,7 +81,7 @@ class SupervisedUserSharedSettingsServiceTest : public ::testing::Test { SupervisedUserSharedSettingsServiceTest() : settings_service_(profile_.GetPrefs()) {} - virtual ~SupervisedUserSharedSettingsServiceTest() {} + ~SupervisedUserSharedSettingsServiceTest() override {} void StartSyncing(const syncer::SyncDataList& initial_sync_data) { sync_processor_.reset(new syncer::FakeSyncChangeProcessor); @@ -114,13 +114,13 @@ class SupervisedUserSharedSettingsServiceTest : public ::testing::Test { } // testing::Test overrides: - virtual void SetUp() override { + void SetUp() override { subscription_ = settings_service_.Subscribe( base::Bind(&SupervisedUserSharedSettingsServiceTest::OnSettingChanged, base::Unretained(this))); } - virtual void TearDown() override { settings_service_.Shutdown(); } + void TearDown() override { settings_service_.Shutdown(); } void OnSettingChanged(const std::string& su_id, const std::string& key) { const Value* value = settings_service_.GetValue(su_id, key); diff --git a/chrome/browser/supervised_user/supervised_user_shared_settings_update_unittest.cc b/chrome/browser/supervised_user/supervised_user_shared_settings_update_unittest.cc index 1266ccde..9289738 100644 --- a/chrome/browser/supervised_user/supervised_user_shared_settings_update_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_shared_settings_update_unittest.cc @@ -13,7 +13,7 @@ class SupervisedUserSharedSettingsUpdateTest : public testing::Test { public: SupervisedUserSharedSettingsUpdateTest() : service_(profile_.GetPrefs()) {} - virtual ~SupervisedUserSharedSettingsUpdateTest() {} + ~SupervisedUserSharedSettingsUpdateTest() override {} void OnSettingUpdated(bool success) { result_.reset(new bool(success)); diff --git a/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc index 6c50265..c99da73 100644 --- a/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc @@ -84,7 +84,7 @@ void GetSupervisedUsersCallback(const base::DictionaryValue** dict, class SupervisedUserSyncServiceTest : public ::testing::Test { public: SupervisedUserSyncServiceTest(); - virtual ~SupervisedUserSyncServiceTest(); + ~SupervisedUserSyncServiceTest() override; protected: scoped_ptr<SyncChangeProcessor> CreateChangeProcessor(); diff --git a/chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc b/chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc index 4885b6c..2ea0127 100644 --- a/chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc @@ -18,9 +18,7 @@ class SupervisedUserURLFilterTest : public ::testing::Test, filter_->AddObserver(this); } - virtual ~SupervisedUserURLFilterTest() { - filter_->RemoveObserver(this); - } + ~SupervisedUserURLFilterTest() override { filter_->RemoveObserver(this); } // SupervisedUserURLFilter::Observer: void OnSiteListUpdated() override { run_loop_.Quit(); } diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index e090c6c..2cd34c2 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -64,7 +64,7 @@ const base::FilePath::CharType* kTitle1File = FILE_PATH_LITERAL("title1.html"); class TaskManagerBrowserTest : public ExtensionBrowserTest { public: TaskManagerBrowserTest() {} - virtual ~TaskManagerBrowserTest() {} + ~TaskManagerBrowserTest() override {} TaskManagerModel* model() const { return TaskManager::GetInstance()->model(); diff --git a/chrome/browser/themes/theme_service_aurax11.cc b/chrome/browser/themes/theme_service_aurax11.cc index bc52094..7f25e50 100644 --- a/chrome/browser/themes/theme_service_aurax11.cc +++ b/chrome/browser/themes/theme_service_aurax11.cc @@ -20,14 +20,14 @@ class SystemThemeX11 : public CustomThemeSupplier { explicit SystemThemeX11(PrefService* pref_service); // Overridden from CustomThemeSupplier: - virtual void StartUsingTheme() override; - virtual void StopUsingTheme() override; - virtual bool GetColor(int id, SkColor* color) const override; - virtual gfx::Image GetImageNamed(int id) override; - virtual bool HasCustomImage(int id) const override; + void StartUsingTheme() override; + void StopUsingTheme() override; + bool GetColor(int id, SkColor* color) const override; + gfx::Image GetImageNamed(int id) override; + bool HasCustomImage(int id) const override; private: - virtual ~SystemThemeX11(); + ~SystemThemeX11() override; // These pointers are not owned by us. views::LinuxUI* const linux_ui_; diff --git a/chrome/browser/themes/theme_service_aurax11.h b/chrome/browser/themes/theme_service_aurax11.h index 3b192c9..eb229f2 100644 --- a/chrome/browser/themes/theme_service_aurax11.h +++ b/chrome/browser/themes/theme_service_aurax11.h @@ -12,14 +12,14 @@ class ThemeServiceAuraX11 : public ThemeService { public: ThemeServiceAuraX11(); - virtual ~ThemeServiceAuraX11(); + ~ThemeServiceAuraX11() override; // Overridden from ThemeService: - virtual bool ShouldInitWithSystemTheme() const override; - virtual void UseSystemTheme() override; - virtual bool IsSystemThemeDistinctFromDefaultTheme() const override; - virtual bool UsingDefaultTheme() const override; - virtual bool UsingSystemTheme() const override; + bool ShouldInitWithSystemTheme() const override; + void UseSystemTheme() override; + bool IsSystemThemeDistinctFromDefaultTheme() const override; + bool UsingDefaultTheme() const override; + bool UsingSystemTheme() const override; private: DISALLOW_COPY_AND_ASSIGN(ThemeServiceAuraX11); diff --git a/chrome/browser/themes/theme_service_browsertest.cc b/chrome/browser/themes/theme_service_browsertest.cc index 9a59b7e..dd8c84e 100644 --- a/chrome/browser/themes/theme_service_browsertest.cc +++ b/chrome/browser/themes/theme_service_browsertest.cc @@ -27,10 +27,9 @@ class ThemeServiceBrowserTest : public ExtensionBrowserTest { public: ThemeServiceBrowserTest() { } - virtual ~ThemeServiceBrowserTest() { - } + ~ThemeServiceBrowserTest() override {} - virtual void SetUp() override { + void SetUp() override { extensions::ComponentLoader::EnableBackgroundExtensionsForTesting(); ExtensionBrowserTest::SetUp(); } diff --git a/chrome/browser/themes/theme_service_unittest.cc b/chrome/browser/themes/theme_service_unittest.cc index 44266d9..e8d760a 100644 --- a/chrome/browser/themes/theme_service_unittest.cc +++ b/chrome/browser/themes/theme_service_unittest.cc @@ -36,7 +36,7 @@ class ThemeServiceTest : public extensions::ExtensionServiceTestBase { public: ThemeServiceTest() : is_supervised_(false), registry_(NULL) {} - virtual ~ThemeServiceTest() {} + ~ThemeServiceTest() override {} // Moves a minimal theme to |temp_dir_path| and unpacks it from that // directory. @@ -86,7 +86,7 @@ class ThemeServiceTest : public extensions::ExtensionServiceTestBase { base::MessageLoop::current()->RunUntilIdle(); } - virtual void SetUp() { + void SetUp() override { extensions::ExtensionServiceTestBase::SetUp(); extensions::ExtensionServiceTestBase::ExtensionServiceInitParams params = CreateDefaultInitParams(); @@ -241,9 +241,9 @@ TEST_F(ThemeServiceTest, ThemeUpgrade) { class ThemeServiceSupervisedUserTest : public ThemeServiceTest { public: ThemeServiceSupervisedUserTest() {} - virtual ~ThemeServiceSupervisedUserTest() {} + ~ThemeServiceSupervisedUserTest() override {} - virtual void SetUp() override { + void SetUp() override { is_supervised_ = true; ThemeServiceTest::SetUp(); } diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc index df0ea15..265133d 100644 --- a/chrome/browser/themes/theme_syncable_service_unittest.cc +++ b/chrome/browser/themes/theme_syncable_service_unittest.cc @@ -145,9 +145,9 @@ class ThemeSyncableServiceTest : public testing::Test { file_thread_(content::BrowserThread::FILE, &loop_), fake_theme_service_(NULL) {} - virtual ~ThemeSyncableServiceTest() {} + ~ThemeSyncableServiceTest() override {} - virtual void SetUp() { + void SetUp() override { profile_.reset(new TestingProfile); fake_theme_service_ = BuildForProfile(profile_.get()); theme_sync_service_.reset(new ThemeSyncableService(profile_.get(), @@ -156,7 +156,7 @@ class ThemeSyncableServiceTest : public testing::Test { SetUpExtension(); } - virtual void TearDown() { + void TearDown() override { profile_.reset(); loop_.RunUntilIdle(); } diff --git a/chrome/browser/undo/bookmark_undo_service_test.cc b/chrome/browser/undo/bookmark_undo_service_test.cc index 54976e7..072004a 100644 --- a/chrome/browser/undo/bookmark_undo_service_test.cc +++ b/chrome/browser/undo/bookmark_undo_service_test.cc @@ -21,8 +21,8 @@ class BookmarkUndoServiceTest : public testing::Test { public: BookmarkUndoServiceTest(); - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; BookmarkModel* GetModel(); BookmarkUndoService* GetUndoService(); diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc index ad99a1f..13359e7 100644 --- a/chrome/browser/web_applications/web_app_unittest.cc +++ b/chrome/browser/web_applications/web_app_unittest.cc @@ -22,7 +22,7 @@ using content::RenderViewHostTester; class WebApplicationTest : public ChromeRenderViewHostTestHarness { protected: - virtual void SetUp() override { + void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); #if defined(TOOLKIT_VIEWS) extensions::TabHelper::CreateForWebContents(web_contents()); diff --git a/chrome/browser/web_resource/eula_accepted_notifier_unittest.cc b/chrome/browser/web_resource/eula_accepted_notifier_unittest.cc index d339ca7..86c55de 100644 --- a/chrome/browser/web_resource/eula_accepted_notifier_unittest.cc +++ b/chrome/browser/web_resource/eula_accepted_notifier_unittest.cc @@ -17,7 +17,7 @@ class EulaAcceptedNotifierTest : public testing::Test, } // testing::Test overrides. - virtual void SetUp() override { + void SetUp() override { local_state_.registry()->RegisterBooleanPref(prefs::kEulaAccepted, false); notifier_.reset(new EulaAcceptedNotifier(&local_state_)); notifier_->Init(this); diff --git a/chrome/browser/web_resource/resource_request_allowed_notifier_unittest.cc b/chrome/browser/web_resource/resource_request_allowed_notifier_unittest.cc index 836c378..fbda993 100644 --- a/chrome/browser/web_resource/resource_request_allowed_notifier_unittest.cc +++ b/chrome/browser/web_resource/resource_request_allowed_notifier_unittest.cc @@ -81,7 +81,7 @@ class ResourceRequestAllowedNotifierTest resource_request_allowed_notifier_.InitWithEulaAcceptNotifier( this, scoped_ptr<EulaAcceptedNotifier>(eula_notifier_)); } - virtual ~ResourceRequestAllowedNotifierTest() { } + ~ResourceRequestAllowedNotifierTest() override {} bool was_notified() const { return was_notified_; } @@ -128,7 +128,7 @@ class ResourceRequestAllowedNotifierTest SetNeedsEulaAcceptance(true); } - virtual void SetUp() override { + void SetUp() override { // Assume the test service has already requested permission, as all tests // just test that criteria changes notify the server. // Set default EULA state to done (not waiting and EULA accepted) to diff --git a/chrome/browser/webdata/keyword_table_unittest.cc b/chrome/browser/webdata/keyword_table_unittest.cc index 738edd9..0f528ba 100644 --- a/chrome/browser/webdata/keyword_table_unittest.cc +++ b/chrome/browser/webdata/keyword_table_unittest.cc @@ -24,10 +24,10 @@ using base::TimeDelta; class KeywordTableTest : public testing::Test { public: KeywordTableTest() {} - virtual ~KeywordTableTest() {} + ~KeywordTableTest() override {} protected: - virtual void SetUp() { + void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); file_ = temp_dir_.path().AppendASCII("TestWebDatabase"); |