Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(644)

Unified Diff: net/proxy/proxy_config_service_linux_unittest.cc

Issue 623213004: replace OVERRIDE and FINAL with override and final in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo unwanted change in comment Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/proxy_config_service_linux.cc ('k') | net/proxy/proxy_config_service_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_config_service_linux_unittest.cc
diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc
index 5ca0fdc92d500f608f9622c375dae525d1292afd..cfb0cff90402786c30db8e538c531294f876f22c 100644
--- a/net/proxy/proxy_config_service_linux_unittest.cc
+++ b/net/proxy/proxy_config_service_linux_unittest.cc
@@ -107,7 +107,7 @@ class MockEnvironment : public base::Environment {
}
// Begin base::Environment implementation.
- virtual bool GetVar(const char* variable_name, std::string* result) OVERRIDE {
+ virtual bool GetVar(const char* variable_name, std::string* result) override {
std::map<std::string, const char**>::iterator it =
table.find(variable_name);
if (it != table.end() && *(it->second) != NULL) {
@@ -119,12 +119,12 @@ class MockEnvironment : public base::Environment {
}
virtual bool SetVar(const char* variable_name, const std::string& new_value)
- OVERRIDE {
+ override {
ADD_FAILURE();
return false;
}
- virtual bool UnSetVar(const char* variable_name) OVERRIDE {
+ virtual bool UnSetVar(const char* variable_name) override {
ADD_FAILURE();
return false;
}
@@ -178,28 +178,28 @@ class MockSettingGetter
virtual bool Init(
const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner,
const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner)
- OVERRIDE {
+ override {
task_runner_ = glib_task_runner;
return true;
}
- virtual void ShutDown() OVERRIDE {}
+ virtual void ShutDown() override {}
virtual bool SetUpNotifications(ProxyConfigServiceLinux::Delegate* delegate)
- OVERRIDE {
+ override {
return true;
}
virtual const scoped_refptr<base::SingleThreadTaskRunner>&
- GetNotificationTaskRunner() OVERRIDE {
+ GetNotificationTaskRunner() override {
return task_runner_;
}
- virtual ProxyConfigSource GetConfigSource() OVERRIDE {
+ virtual ProxyConfigSource GetConfigSource() override {
return PROXY_CONFIG_SOURCE_TEST;
}
- virtual bool GetString(StringSetting key, std::string* result) OVERRIDE {
+ virtual bool GetString(StringSetting key, std::string* result) override {
const char* value = strings_table.Get(key);
if (value) {
*result = value;
@@ -208,7 +208,7 @@ class MockSettingGetter
return false;
}
- virtual bool GetBool(BoolSetting key, bool* result) OVERRIDE {
+ virtual bool GetBool(BoolSetting key, bool* result) override {
BoolSettingValue value = bools_table.Get(key);
switch (value) {
case UNSET:
@@ -222,24 +222,24 @@ class MockSettingGetter
return true;
}
- virtual bool GetInt(IntSetting key, int* result) OVERRIDE {
+ virtual bool GetInt(IntSetting key, int* result) override {
// We don't bother to distinguish unset keys from 0 values.
*result = ints_table.Get(key);
return true;
}
virtual bool GetStringList(StringListSetting key,
- std::vector<std::string>* result) OVERRIDE {
+ std::vector<std::string>* result) override {
*result = string_lists_table.Get(key);
// We don't bother to distinguish unset keys from empty lists.
return !result->empty();
}
- virtual bool BypassListIsReversed() OVERRIDE {
+ virtual bool BypassListIsReversed() override {
return false;
}
- virtual bool MatchHostsUsingSuffixMatching() OVERRIDE {
+ virtual bool MatchHostsUsingSuffixMatching() override {
return false;
}
@@ -355,7 +355,7 @@ namespace net {
// must use the same test fixture class (also "ProxyConfigServiceLinuxTest").
class ProxyConfigServiceLinuxTest : public PlatformTest {
protected:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
PlatformTest::SetUp();
// Set up a temporary KDE home directory.
std::string prefix("ProxyConfigServiceLinuxTest_user_home");
@@ -372,7 +372,7 @@ class ProxyConfigServiceLinuxTest : public PlatformTest {
kioslaverc4_ = kde4_config_.Append(FILE_PATH_LITERAL("kioslaverc"));
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
// Delete the temporary KDE home directory.
base::DeleteFile(user_home_, true);
PlatformTest::TearDown();
« no previous file with comments | « net/proxy/proxy_config_service_linux.cc ('k') | net/proxy/proxy_config_service_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698