diff options
| author | mostynb <mostynb@opera.com> | 2014-10-09 04:01:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-09 11:01:43 +0000 |
| commit | ba063d6038f4e0df5188cdd46589c62388d8e06b (patch) | |
| tree | 5dd4b0be08ab43875cb16ed59f4c2c281f6c7412 /net/http/http_server_properties_manager_unittest.cc | |
| parent | c239532659a8ac3422094ffbd9f90e38abe0bf48 (diff) | |
| download | chromium_src-ba063d6038f4e0df5188cdd46589c62388d8e06b.zip chromium_src-ba063d6038f4e0df5188cdd46589c62388d8e06b.tar.gz chromium_src-ba063d6038f4e0df5188cdd46589c62388d8e06b.tar.bz2 | |
replace OVERRIDE and FINAL with override and final in net/
BUG=417463
Review URL: https://codereview.chromium.org/623213004
Cr-Commit-Position: refs/heads/master@{#298844}
Diffstat (limited to 'net/http/http_server_properties_manager_unittest.cc')
| -rw-r--r-- | net/http/http_server_properties_manager_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc index 012a46d..dbbfc2d 100644 --- a/net/http/http_server_properties_manager_unittest.cc +++ b/net/http/http_server_properties_manager_unittest.cc @@ -44,7 +44,7 @@ class TestingHttpServerPropertiesManager : public HttpServerPropertiesManager { // Post tasks without a delay during tests. virtual void StartPrefsUpdateTimerOnNetworkThread( - base::TimeDelta delay) OVERRIDE { + base::TimeDelta delay) override { HttpServerPropertiesManager::StartPrefsUpdateTimerOnNetworkThread( base::TimeDelta()); } @@ -55,7 +55,7 @@ class TestingHttpServerPropertiesManager : public HttpServerPropertiesManager { // Post tasks without a delay during tests. virtual void StartCacheUpdateTimerOnPrefThread( - base::TimeDelta delay) OVERRIDE { + base::TimeDelta delay) override { HttpServerPropertiesManager::StartCacheUpdateTimerOnPrefThread( base::TimeDelta()); } @@ -88,7 +88,7 @@ class HttpServerPropertiesManagerTest : public testing::Test { protected: HttpServerPropertiesManagerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { pref_service_.registry()->RegisterDictionaryPref(kTestHttpServerProperties); http_server_props_manager_.reset( new StrictMock<TestingHttpServerPropertiesManager>( @@ -99,7 +99,7 @@ class HttpServerPropertiesManagerTest : public testing::Test { base::RunLoop().RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (http_server_props_manager_.get()) http_server_props_manager_->ShutdownOnPrefThread(); base::RunLoop().RunUntilIdle(); |