| Index: net/proxy/mock_proxy_resolver.h
|
| diff --git a/net/proxy/mock_proxy_resolver.h b/net/proxy/mock_proxy_resolver.h
|
| index 3864d530de94e6eb6d35ab2941153a13105955bc..5a616ddf6fa7c7b31033db9d82e5fefc16cbc96c 100644
|
| --- a/net/proxy/mock_proxy_resolver.h
|
| +++ b/net/proxy/mock_proxy_resolver.h
|
| @@ -77,13 +77,13 @@ class MockAsyncProxyResolverBase : public ProxyResolver {
|
| ProxyInfo* results,
|
| const net::CompletionCallback& callback,
|
| RequestHandle* request_handle,
|
| - const BoundNetLog& /*net_log*/) OVERRIDE;
|
| - virtual void CancelRequest(RequestHandle request_handle) OVERRIDE;
|
| - virtual LoadState GetLoadState(RequestHandle request_handle) const OVERRIDE;
|
| + const BoundNetLog& /*net_log*/) override;
|
| + virtual void CancelRequest(RequestHandle request_handle) override;
|
| + virtual LoadState GetLoadState(RequestHandle request_handle) const override;
|
| virtual int SetPacScript(
|
| const scoped_refptr<ProxyResolverScriptData>& script_data,
|
| - const net::CompletionCallback& callback) OVERRIDE;
|
| - virtual void CancelSetPacScript() OVERRIDE;
|
| + const net::CompletionCallback& callback) override;
|
| + virtual void CancelSetPacScript() override;
|
|
|
| const RequestsList& pending_requests() const {
|
| return pending_requests_;
|
|
|