Index: chrome/browser/prerender/prerender_browsertest.cc |
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc |
index 48a9eb595014ee11e379040f9294a16ad3cbf93e..0aa25da296110cf3fecf5a1c1573bcab29654a2a 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(); } |
James Hawkins
2014/10/28 23:04:23
Undo this pull-up.
|
void SetUpCommandLine(CommandLine* command_line) override { |
PrerenderBrowserTest::SetUpCommandLine(command_line); |