summaryrefslogtreecommitdiffstats
path: root/net/http/http_server_properties_manager_unittest.cc
diff options
context:
space:
mode:
authornick <nick@chromium.org>2015-04-23 03:18:37 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-23 10:18:55 +0000
commitd3f30d02fb6e676e9a46776325e21f64903c201d (patch)
tree3f2d9113ffc8c5be8f4a4d00397f84d705d8f0fc /net/http/http_server_properties_manager_unittest.cc
parentb34f1e5b97667e4285d5a3fdf5c2840d14128954 (diff)
downloadchromium_src-d3f30d02fb6e676e9a46776325e21f64903c201d.zip
chromium_src-d3f30d02fb6e676e9a46776325e21f64903c201d.tar.gz
chromium_src-d3f30d02fb6e676e9a46776325e21f64903c201d.tar.bz2
Update {virtual,override} to follow C++11 style in net.
The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override. This patch was manually generated using a regex and a text editor. BUG=417463 Review URL: https://codereview.chromium.org/1088903008 Cr-Commit-Position: refs/heads/master@{#326489}
Diffstat (limited to 'net/http/http_server_properties_manager_unittest.cc')
-rw-r--r--net/http/http_server_properties_manager_unittest.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc
index fb548bc..55dc7b8 100644
--- a/net/http/http_server_properties_manager_unittest.cc
+++ b/net/http/http_server_properties_manager_unittest.cc
@@ -40,15 +40,14 @@ class TestingHttpServerPropertiesManager : public HttpServerPropertiesManager {
InitializeOnNetworkThread();
}
- virtual ~TestingHttpServerPropertiesManager() {}
+ ~TestingHttpServerPropertiesManager() override {}
// Make these methods public for testing.
using HttpServerPropertiesManager::ScheduleUpdateCacheOnPrefThread;
using HttpServerPropertiesManager::ScheduleUpdatePrefsOnNetworkThread;
// Post tasks without a delay during tests.
- virtual void StartPrefsUpdateTimerOnNetworkThread(
- base::TimeDelta delay) override {
+ void StartPrefsUpdateTimerOnNetworkThread(base::TimeDelta delay) override {
HttpServerPropertiesManager::StartPrefsUpdateTimerOnNetworkThread(
base::TimeDelta());
}
@@ -58,8 +57,7 @@ class TestingHttpServerPropertiesManager : public HttpServerPropertiesManager {
}
// Post tasks without a delay during tests.
- virtual void StartCacheUpdateTimerOnPrefThread(
- base::TimeDelta delay) override {
+ void StartCacheUpdateTimerOnPrefThread(base::TimeDelta delay) override {
HttpServerPropertiesManager::StartCacheUpdateTimerOnPrefThread(
base::TimeDelta());
}