Index: net/base/test_proxy_delegate.cc |
diff --git a/net/base/test_proxy_delegate.cc b/net/base/test_proxy_delegate.cc |
index d4a3c61712f13e98eaa13454dc24fffa76627681..d3bba6dfbc8cfbab3de40f4d8f20cc4ea103e047 100644 |
--- a/net/base/test_proxy_delegate.cc |
+++ b/net/base/test_proxy_delegate.cc |
@@ -35,20 +35,21 @@ void TestProxyDelegate::VerifyOnTunnelHeadersReceived( |
EXPECT_TRUE(HostPortPair::FromString(origin).Equals( |
on_tunnel_headers_received_origin_)); |
EXPECT_TRUE(HostPortPair::FromString(proxy_server) |
.Equals(on_tunnel_headers_received_proxy_server_)); |
EXPECT_EQ(status_line, on_tunnel_headers_received_status_line_); |
} |
void TestProxyDelegate::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) {} |
void TestProxyDelegate::OnTunnelConnectCompleted( |
const HostPortPair& endpoint, |
const HostPortPair& proxy_server, |
int net_error) { |
on_tunnel_request_completed_called_ = true; |
on_tunnel_request_completed_endpoint_ = endpoint; |
on_tunnel_request_completed_proxy_server_ = proxy_server; |
} |
@@ -76,11 +77,11 @@ void TestProxyDelegate::OnTunnelHeadersReceived( |
on_tunnel_headers_received_origin_ = origin; |
on_tunnel_headers_received_proxy_server_ = proxy_server; |
on_tunnel_headers_received_status_line_ = response_headers.GetStatusLine(); |
} |
bool TestProxyDelegate::IsTrustedSpdyProxy( |
const net::ProxyServer& proxy_server) { |
return proxy_server.is_valid() && trusted_spdy_proxy_ == proxy_server; |
} |
-} // namespace net |
+} // namespace net |