diff options
Diffstat (limited to 'chrome/browser/download')
11 files changed, 19 insertions, 26 deletions
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); } |