Index: net/proxy/multi_threaded_proxy_resolver_unittest.cc |
diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc |
index d2e465ca0f90bbb2fd1fb40c89bb14c016eedcdb..7a8db63d1de5dba8fb09c749eb8c759270c97a85 100644 |
--- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc |
+++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc |
@@ -36,11 +36,11 @@ class MockProxyResolver : public ProxyResolver { |
request_count_(0) {} |
// ProxyResolver implementation. |
- virtual int GetProxyForURL(const GURL& query_url, |
- ProxyInfo* results, |
- const CompletionCallback& callback, |
- RequestHandle* request, |
- const BoundNetLog& net_log) override { |
+ int GetProxyForURL(const GURL& query_url, |
+ ProxyInfo* results, |
+ const CompletionCallback& callback, |
+ RequestHandle* request, |
+ const BoundNetLog& net_log) override { |
if (resolve_latency_ != base::TimeDelta()) |
base::PlatformThread::Sleep(resolve_latency_); |
@@ -58,22 +58,17 @@ class MockProxyResolver : public ProxyResolver { |
return request_count_++; |
} |
- virtual void CancelRequest(RequestHandle request) override { |
- NOTREACHED(); |
- } |
+ void CancelRequest(RequestHandle request) override { NOTREACHED(); } |
- virtual LoadState GetLoadState(RequestHandle request) const override { |
+ LoadState GetLoadState(RequestHandle request) const override { |
NOTREACHED(); |
return LOAD_STATE_IDLE; |
} |
- virtual void CancelSetPacScript() override { |
- NOTREACHED(); |
- } |
+ void CancelSetPacScript() override { NOTREACHED(); } |
- virtual int SetPacScript( |
- const scoped_refptr<ProxyResolverScriptData>& script_data, |
- const CompletionCallback& callback) override { |
+ int SetPacScript(const scoped_refptr<ProxyResolverScriptData>& script_data, |
+ const CompletionCallback& callback) override { |
CheckIsOnWorkerThread(); |
last_script_data_ = script_data; |
return OK; |
@@ -133,11 +128,11 @@ class BlockableProxyResolver : public MockProxyResolver { |
blocked_.Wait(); |
} |
- virtual int GetProxyForURL(const GURL& query_url, |
- ProxyInfo* results, |
- const CompletionCallback& callback, |
- RequestHandle* request, |
- const BoundNetLog& net_log) override { |
+ int GetProxyForURL(const GURL& query_url, |
+ ProxyInfo* results, |
+ const CompletionCallback& callback, |
+ RequestHandle* request, |
+ const BoundNetLog& net_log) override { |
if (should_block_) { |
blocked_.Signal(); |
unblocked_.Wait(); |
@@ -160,31 +155,28 @@ class ForwardingProxyResolver : public ProxyResolver { |
: ProxyResolver(impl->expects_pac_bytes()), |
impl_(impl) {} |
- virtual int GetProxyForURL(const GURL& query_url, |
- ProxyInfo* results, |
- const CompletionCallback& callback, |
- RequestHandle* request, |
- const BoundNetLog& net_log) override { |
+ int GetProxyForURL(const GURL& query_url, |
+ ProxyInfo* results, |
+ const CompletionCallback& callback, |
+ RequestHandle* request, |
+ const BoundNetLog& net_log) override { |
return impl_->GetProxyForURL( |
query_url, results, callback, request, net_log); |
} |
- virtual void CancelRequest(RequestHandle request) override { |
+ void CancelRequest(RequestHandle request) override { |
impl_->CancelRequest(request); |
} |
- virtual LoadState GetLoadState(RequestHandle request) const override { |
+ LoadState GetLoadState(RequestHandle request) const override { |
NOTREACHED(); |
return LOAD_STATE_IDLE; |
} |
- virtual void CancelSetPacScript() override { |
- impl_->CancelSetPacScript(); |
- } |
+ void CancelSetPacScript() override { impl_->CancelSetPacScript(); } |
- virtual int SetPacScript( |
- const scoped_refptr<ProxyResolverScriptData>& script_data, |
- const CompletionCallback& callback) override { |
+ int SetPacScript(const scoped_refptr<ProxyResolverScriptData>& script_data, |
+ const CompletionCallback& callback) override { |
return impl_->SetPacScript(script_data, callback); |
} |
@@ -200,7 +192,7 @@ class ForwardingProxyResolverFactory : public ProxyResolverFactory { |
: ProxyResolverFactory(resolver->expects_pac_bytes()), |
resolver_(resolver) {} |
- virtual ProxyResolver* CreateProxyResolver() override { |
+ ProxyResolver* CreateProxyResolver() override { |
return new ForwardingProxyResolver(resolver_); |
} |
@@ -213,11 +205,9 @@ class BlockableProxyResolverFactory : public ProxyResolverFactory { |
public: |
BlockableProxyResolverFactory() : ProxyResolverFactory(true) {} |
- virtual ~BlockableProxyResolverFactory() { |
- STLDeleteElements(&resolvers_); |
- } |
+ ~BlockableProxyResolverFactory() override { STLDeleteElements(&resolvers_); } |
- virtual ProxyResolver* CreateProxyResolver() override { |
+ ProxyResolver* CreateProxyResolver() override { |
BlockableProxyResolver* resolver = new BlockableProxyResolver; |
resolvers_.push_back(resolver); |
return new ForwardingProxyResolver(resolver); |