| Index: net/proxy/mock_proxy_resolver.h
|
| diff --git a/net/proxy/mock_proxy_resolver.h b/net/proxy/mock_proxy_resolver.h
|
| index 5a616ddf6fa7c7b31033db9d82e5fefc16cbc96c..8ae551d96a7f5b134384a692a92a40494b6bf416 100644
|
| --- a/net/proxy/mock_proxy_resolver.h
|
| +++ b/net/proxy/mock_proxy_resolver.h
|
| @@ -70,20 +70,19 @@ class MockAsyncProxyResolverBase : public ProxyResolver {
|
|
|
| typedef std::vector<scoped_refptr<Request> > RequestsList;
|
|
|
| - virtual ~MockAsyncProxyResolverBase();
|
| + ~MockAsyncProxyResolverBase() override;
|
|
|
| // ProxyResolver implementation.
|
| - virtual int GetProxyForURL(const GURL& url,
|
| - 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;
|
| - virtual int SetPacScript(
|
| - const scoped_refptr<ProxyResolverScriptData>& script_data,
|
| - const net::CompletionCallback& callback) override;
|
| - virtual void CancelSetPacScript() override;
|
| + int GetProxyForURL(const GURL& url,
|
| + ProxyInfo* results,
|
| + const net::CompletionCallback& callback,
|
| + RequestHandle* request_handle,
|
| + const BoundNetLog& /*net_log*/) override;
|
| + void CancelRequest(RequestHandle request_handle) override;
|
| + LoadState GetLoadState(RequestHandle request_handle) const override;
|
| + int SetPacScript(const scoped_refptr<ProxyResolverScriptData>& script_data,
|
| + const net::CompletionCallback& callback) override;
|
| + void CancelSetPacScript() override;
|
|
|
| const RequestsList& pending_requests() const {
|
| return pending_requests_;
|
|
|