Index: chrome/browser/lifetime/browser_close_manager_browsertest.cc |
diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc |
index 28e4d6e81685cb6633fc0d6c87f73ee1f1602cdb..dd5fae9afc853f984e99b1a9f32b2cac52489eff 100644 |
--- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc |
+++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc |
@@ -101,9 +101,9 @@ class RepeatedNotificationObserver : public content::NotificationObserver { |
registrar_.Add(this, type, content::NotificationService::AllSources()); |
} |
- virtual void Observe(int type, |
- const content::NotificationSource& source, |
- const content::NotificationDetails& details) override { |
+ void Observe(int type, |
+ const content::NotificationSource& source, |
+ const content::NotificationDetails& details) override { |
ASSERT_GT(num_outstanding_, 0); |
if (!--num_outstanding_ && running_) { |
content::BrowserThread::PostTask( |
@@ -145,9 +145,9 @@ class TestBrowserCloseManager : public BrowserCloseManager { |
} |
protected: |
- virtual ~TestBrowserCloseManager() {} |
+ ~TestBrowserCloseManager() override {} |
- virtual void ConfirmCloseWithPendingDownloads( |
+ void ConfirmCloseWithPendingDownloads( |
int download_count, |
const base::Callback<void(bool)>& callback) override { |
EXPECT_NE(NO_USER_CHOICE, user_choice_); |
@@ -179,9 +179,9 @@ class TestDownloadManagerDelegate : public ChromeDownloadManagerDelegate { |
: ChromeDownloadManagerDelegate(profile) { |
GetDownloadIdReceiverCallback().Run(content::DownloadItem::kInvalidId + 1); |
} |
- virtual ~TestDownloadManagerDelegate() {} |
+ ~TestDownloadManagerDelegate() override {} |
- virtual bool DetermineDownloadTarget( |
+ bool DetermineDownloadTarget( |
content::DownloadItem* item, |
const content::DownloadTargetCallback& callback) override { |
content::DownloadTargetCallback dangerous_callback = |
@@ -211,12 +211,12 @@ class FakeBackgroundModeManager : public BackgroundModeManager { |
&g_browser_process->profile_manager()->GetProfileInfoCache()), |
suspended_(false) {} |
- virtual void SuspendBackgroundMode() override { |
+ void SuspendBackgroundMode() override { |
BackgroundModeManager::SuspendBackgroundMode(); |
suspended_ = true; |
} |
- virtual void ResumeBackgroundMode() override { |
+ void ResumeBackgroundMode() override { |
BackgroundModeManager::ResumeBackgroundMode(); |
suspended_ = false; |
} |
@@ -237,7 +237,7 @@ class BrowserCloseManagerBrowserTest |
: public InProcessBrowserTest, |
public testing::WithParamInterface<bool> { |
protected: |
- virtual void SetUpOnMainThread() override { |
+ void SetUpOnMainThread() override { |
InProcessBrowserTest::SetUpOnMainThread(); |
SessionStartupPref::SetStartupPref( |
browser()->profile(), SessionStartupPref(SessionStartupPref::LAST)); |
@@ -249,7 +249,7 @@ class BrowserCloseManagerBrowserTest |
base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true)); |
} |
- virtual void SetUpCommandLine(CommandLine* command_line) override { |
+ void SetUpCommandLine(CommandLine* command_line) override { |
if (GetParam()) |
command_line->AppendSwitch(switches::kEnableFastUnload); |
#if defined(OS_CHROMEOS) |
@@ -712,7 +712,7 @@ class BrowserCloseManagerWithDownloadsBrowserTest : |
BrowserCloseManagerWithDownloadsBrowserTest() {} |
virtual ~BrowserCloseManagerWithDownloadsBrowserTest() {} |
- virtual void SetUpOnMainThread() override { |
+ void SetUpOnMainThread() override { |
BrowserCloseManagerBrowserTest::SetUpOnMainThread(); |
ASSERT_TRUE(scoped_download_directory_.CreateUniqueTempDir()); |
} |
@@ -894,7 +894,7 @@ class BrowserCloseManagerWithBackgroundModeBrowserTest |
public: |
BrowserCloseManagerWithBackgroundModeBrowserTest() {} |
- virtual void SetUpOnMainThread() override { |
+ void SetUpOnMainThread() override { |
BrowserCloseManagerBrowserTest::SetUpOnMainThread(); |
g_browser_process->set_background_mode_manager_for_test( |
scoped_ptr<BackgroundModeManager>(new FakeBackgroundModeManager)); |