summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net/proxy_browsertest.cc
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-29 17:32:40 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-30 00:34:59 +0000
commite1bc798bf7bf270dfbaa1814bba36d0676de8d7d (patch)
treee34762765c153d1a2417231e6927438b352df282 /chrome/browser/net/proxy_browsertest.cc
parent750ade3fa8cad705e9f522269fbc2fbb12ec184e (diff)
downloadchromium_src-e1bc798bf7bf270dfbaa1814bba36d0676de8d7d.zip
chromium_src-e1bc798bf7bf270dfbaa1814bba36d0676de8d7d.tar.gz
chromium_src-e1bc798bf7bf270dfbaa1814bba36d0676de8d7d.tar.bz2
Standardize usage of virtual/override/final specifiers.
The Google C++ style guide states: Explicitly annotate overrides of virtual functions or virtual destructors with an override or (less frequently) final specifier. Older (pre-C++11) code will use the virtual keyword as an inferior alternative annotation. For clarity, use exactly one of override, final, or virtual when declaring an override. To better conform to these guidelines, the following constructs have been rewritten: - if a base class has a virtual destructor, then: virtual ~Foo(); -> ~Foo() override; - virtual void Foo() override; -> void Foo() override; - virtual void Foo() override final; -> void Foo() final; This patch was automatically generated. The clang plugin can generate fixit hints, which are suggested edits when it is 100% sure it knows how to fix a problem. The hints from the clang plugin were applied to the source tree using the tool in https://codereview.chromium.org/598073004. BUG=417463 R=jhawkins@chromium.org Review URL: https://codereview.chromium.org/684613002 Cr-Commit-Position: refs/heads/master@{#301990}
Diffstat (limited to 'chrome/browser/net/proxy_browsertest.cc')
-rw-r--r--chrome/browser/net/proxy_browsertest.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc
index a1c09ee..950aade 100644
--- a/chrome/browser/net/proxy_browsertest.cc
+++ b/chrome/browser/net/proxy_browsertest.cc
@@ -81,7 +81,7 @@ class ProxyBrowserTest : public InProcessBrowserTest {
base::FilePath()) {
}
- virtual void SetUp() override {
+ void SetUp() override {
ASSERT_TRUE(proxy_server_.Start());
InProcessBrowserTest::SetUp();
}
@@ -149,9 +149,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();
}
@@ -176,7 +176,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,
@@ -201,9 +201,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();
}
@@ -229,7 +229,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;