| Index: net/proxy/multi_threaded_proxy_resolver.h
|
| diff --git a/net/proxy/multi_threaded_proxy_resolver.h b/net/proxy/multi_threaded_proxy_resolver.h
|
| index 5c470f4c54c1d14f2dd2dcb7de1f6db526b29e29..0a144611bb55a785eeabde59a1ad2fd49a35f718 100644
|
| --- a/net/proxy/multi_threaded_proxy_resolver.h
|
| +++ b/net/proxy/multi_threaded_proxy_resolver.h
|
| @@ -95,13 +95,13 @@ class NET_EXPORT_PRIVATE MultiThreadedProxyResolver
|
| ProxyInfo* results,
|
| const CompletionCallback& callback,
|
| RequestHandle* request,
|
| - const BoundNetLog& net_log) OVERRIDE;
|
| - virtual void CancelRequest(RequestHandle request) OVERRIDE;
|
| - virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE;
|
| - virtual void CancelSetPacScript() OVERRIDE;
|
| + const BoundNetLog& net_log) override;
|
| + virtual void CancelRequest(RequestHandle request) override;
|
| + virtual LoadState GetLoadState(RequestHandle request) const override;
|
| + virtual void CancelSetPacScript() override;
|
| virtual int SetPacScript(
|
| const scoped_refptr<ProxyResolverScriptData>& script_data,
|
| - const CompletionCallback& callback) OVERRIDE;
|
| + const CompletionCallback& callback) override;
|
|
|
| private:
|
| class Executor;
|
|
|