| Index: chrome/browser/net/proxy_browsertest.cc
|
| diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc
|
| index 0a630cf0c2b70a7e37a83635a5a7065c7338f57c..7f834bc98325089f159d4d5f946d68c7460ba1d2 100644
|
| --- a/chrome/browser/net/proxy_browsertest.cc
|
| +++ b/chrome/browser/net/proxy_browsertest.cc
|
| @@ -82,7 +82,7 @@ class ProxyBrowserTest : public InProcessBrowserTest {
|
| base::FilePath()) {
|
| }
|
|
|
| - virtual void SetUp() override {
|
| + void SetUp() override {
|
| ASSERT_TRUE(proxy_server_.Start());
|
| InProcessBrowserTest::SetUp();
|
| }
|
| @@ -150,9 +150,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();
|
| }
|
| @@ -177,7 +177,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,
|
| @@ -202,9 +202,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();
|
| }
|
| @@ -230,7 +230,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;
|
|
|