Chromium Code Reviews| Index: net/websockets/websocket_end_to_end_test.cc |
| diff --git a/net/websockets/websocket_end_to_end_test.cc b/net/websockets/websocket_end_to_end_test.cc |
| index 3dcf3361ce2b9621e40a8e619f567704270d82fc..52204f3d7eb89691150bfc5380966a0fa2f6417a 100644 |
| --- a/net/websockets/websocket_end_to_end_test.cc |
| +++ b/net/websockets/websocket_end_to_end_test.cc |
| @@ -205,20 +205,21 @@ class TestProxyDelegateWithProxyInfo : public ProxyDelegate { |
| }; |
| const ResolvedProxyInfo& resolved_proxy_info() const { |
| return resolved_proxy_info_; |
| } |
| protected: |
| void OnResolveProxy(const GURL& url, |
| int load_flags, |
| const ProxyService& proxy_service, |
| + const std::string& method, |
|
bengr
2016/02/16 20:00:14
Move the method to just after the url.
RyanSturm
2016/02/17 21:46:12
Done.
|
| ProxyInfo* result) override { |
| resolved_proxy_info_.url = url; |
| resolved_proxy_info_.proxy_info = *result; |
| } |
| 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, |