| Index: chrome/browser/unload_browsertest.cc
|
| diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc
|
| index 9b4add4d459bc8028ad0e3dbc35a982bbb6f597a..8a0b62d6a7baa0dd41a9db0d4373881beb9c9ff8 100644
|
| --- a/chrome/browser/unload_browsertest.cc
|
| +++ b/chrome/browser/unload_browsertest.cc
|
| @@ -113,7 +113,7 @@ const std::string CLOSE_TAB_WHEN_OTHER_TAB_HAS_LISTENER =
|
|
|
| class UnloadTest : public InProcessBrowserTest {
|
| public:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| const testing::TestInfo* const test_info =
|
| testing::UnitTest::GetInstance()->current_test_info();
|
| if (strcmp(test_info->name(),
|
| @@ -126,7 +126,7 @@ class UnloadTest : public InProcessBrowserTest {
|
| }
|
| }
|
|
|
| - virtual void SetUpOnMainThread() OVERRIDE {
|
| + virtual void SetUpOnMainThread() override {
|
| BrowserThread::PostTask(
|
| BrowserThread::IO, FROM_HERE,
|
| base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true));
|
| @@ -416,16 +416,16 @@ IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseTabWhenOtherTabHasListener) {
|
|
|
| class FastUnloadTest : public UnloadTest {
|
| public:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| UnloadTest::SetUpCommandLine(command_line);
|
| command_line->AppendSwitch(switches::kEnableFastUnload);
|
| }
|
|
|
| - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
|
| + virtual void SetUpInProcessBrowserTestFixture() override {
|
| ASSERT_TRUE(test_server()->Start());
|
| }
|
|
|
| - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
|
| + virtual void TearDownInProcessBrowserTestFixture() override {
|
| test_server()->Stop();
|
| }
|
|
|
| @@ -468,7 +468,7 @@ class FastTabCloseTabStripModelObserver : public TabStripModelObserver {
|
|
|
| // TabStripModelObserver:
|
| virtual void TabDetachedAt(content::WebContents* contents,
|
| - int index) OVERRIDE {
|
| + int index) override {
|
| run_loop_->Quit();
|
| }
|
|
|
|
|