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/proxy/proxy_resolver_v8_tracing_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/proxy/proxy_resolver_v8_tracing_unittest.cc')
-rw-r--r-- | net/proxy/proxy_resolver_v8_tracing_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/proxy/proxy_resolver_v8_tracing_unittest.cc b/net/proxy/proxy_resolver_v8_tracing_unittest.cc index b5ea3e8..a6e38cb 100644 --- a/net/proxy/proxy_resolver_v8_tracing_unittest.cc +++ b/net/proxy/proxy_resolver_v8_tracing_unittest.cc @@ -31,7 +31,7 @@ namespace { class ProxyResolverV8TracingTest : public testing::Test { public: - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Drain any pending messages, which may be left over from cancellation. // This way they get reliably run as part of the current test, rather than // spilling into the next test's execution. @@ -71,7 +71,7 @@ class MockErrorObserver : public ProxyResolverErrorObserver { MockErrorObserver() : event_(true, false) {} virtual void OnPACScriptError(int line_number, - const base::string16& error) OVERRIDE { + const base::string16& error) override { { base::AutoLock l(lock_); output += base::StringPrintf("Error: line %d: %s\n", line_number, @@ -768,7 +768,7 @@ class BlockableHostResolver : public HostResolver { AddressList* addresses, const CompletionCallback& callback, RequestHandle* out_req, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { EXPECT_FALSE(callback.is_null()); EXPECT_TRUE(out_req); @@ -791,12 +791,12 @@ class BlockableHostResolver : public HostResolver { virtual int ResolveFromCache(const RequestInfo& info, AddressList* addresses, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { NOTREACHED(); return ERR_DNS_CACHE_MISS; } - virtual void CancelRequest(RequestHandle req) OVERRIDE { + virtual void CancelRequest(RequestHandle req) override { EXPECT_EQ(reinterpret_cast<RequestHandle*>(1), req); num_cancelled_requests_++; } |