Chromium Code Reviews| Index: net/base/test_proxy_delegate.h |
| diff --git a/net/base/test_proxy_delegate.h b/net/base/test_proxy_delegate.h |
| index a6698c6b8cf4999d56bae8a273c71d88cda33f7d..69e2e6b8570a5a7e740d2bf327286805d5c4c018 100644 |
| --- a/net/base/test_proxy_delegate.h |
| +++ b/net/base/test_proxy_delegate.h |
| @@ -46,21 +46,23 @@ class TestProxyDelegate : public ProxyDelegate { |
| const std::string& proxy_server) const; |
| void VerifyOnTunnelHeadersReceived(const std::string& origin, |
| const std::string& proxy_server, |
| const std::string& status_line) const; |
| // ProxyDelegate implementation: |
| void OnResolveProxy(const GURL& url, |
| int load_flags, |
| const ProxyService& proxy_service, |
| + const std::string& method, |
|
bengr
2016/02/16 20:00:13
Move the method to just after the url.
RyanSturm
2016/02/17 21:46:11
Done.
|
| ProxyInfo* result) override; |
| + |
| void OnTunnelConnectCompleted(const HostPortPair& endpoint, |
| const HostPortPair& proxy_server, |
| int net_error) override; |
| void OnFallback(const ProxyServer& bad_proxy, int net_error) override; |
| void OnBeforeSendHeaders(URLRequest* request, |
| const ProxyInfo& proxy_info, |
| HttpRequestHeaders* headers) override; |
| void OnBeforeTunnelRequest(const HostPortPair& proxy_server, |
| HttpRequestHeaders* extra_headers) override; |
| void OnTunnelHeadersReceived( |
| @@ -76,11 +78,11 @@ class TestProxyDelegate : public ProxyDelegate { |
| net::ProxyServer trusted_spdy_proxy_; |
| HostPortPair on_tunnel_request_completed_endpoint_; |
| HostPortPair on_tunnel_request_completed_proxy_server_; |
| HostPortPair on_tunnel_headers_received_origin_; |
| HostPortPair on_tunnel_headers_received_proxy_server_; |
| std::string on_tunnel_headers_received_status_line_; |
| }; |
| } // namespace net |
| -#endif // NET_BASE_TEST_PROXY_DELEGATE_H_ |
| +#endif // NET_BASE_TEST_PROXY_DELEGATE_H_ |