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..24053374e61724a5026b3dd3874908a26aaaad4e 100644 |
--- a/net/websockets/websocket_end_to_end_test.cc |
+++ b/net/websockets/websocket_end_to_end_test.cc |
@@ -2,20 +2,21 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
// End-to-end tests for WebSocket. |
// |
// A python server is (re)started for each test, which is moderately |
// inefficient. However, it makes these tests a good fit for scenarios which |
// require special server configurations. |
#include <stdint.h> |
+ |
#include <string> |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
#include "base/callback.h" |
#include "base/location.h" |
#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/run_loop.h" |
#include "base/single_thread_task_runner.h" |
@@ -203,20 +204,21 @@ class TestProxyDelegateWithProxyInfo : public ProxyDelegate { |
GURL url; |
ProxyInfo proxy_info; |
}; |
const ResolvedProxyInfo& resolved_proxy_info() const { |
return resolved_proxy_info_; |
} |
protected: |
void OnResolveProxy(const GURL& url, |
+ const std::string& method, |
int load_flags, |
const ProxyService& proxy_service, |
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 {} |