| Index: net/http/http_proxy_client_socket.cc
|
| diff --git a/net/http/http_proxy_client_socket.cc b/net/http/http_proxy_client_socket.cc
|
| index 1a2bac5eaac4e7bb2853b2be3b53fcea304e5e34..47aaa7b8a46971f0abab4940f8d41f67395f8496 100644
|
| --- a/net/http/http_proxy_client_socket.cc
|
| +++ b/net/http/http_proxy_client_socket.cc
|
| @@ -34,7 +34,7 @@ HttpProxyClientSocket::HttpProxyClientSocket(
|
| HttpAuthHandlerFactory* http_auth_handler_factory,
|
| bool tunnel,
|
| bool using_spdy,
|
| - SSLClientSocket::NextProto protocol_negotiated,
|
| + NextProto protocol_negotiated,
|
| bool is_https_proxy)
|
| : ALLOW_THIS_IN_INITIALIZER_LIST(io_callback_(
|
| base::Bind(&HttpProxyClientSocket::OnIOComplete,
|
| @@ -92,8 +92,7 @@ bool HttpProxyClientSocket::IsUsingSpdy() const {
|
| return using_spdy_;
|
| }
|
|
|
| -SSLClientSocket::NextProto
|
| -HttpProxyClientSocket::GetProtocolNegotiated() const {
|
| +NextProto HttpProxyClientSocket::GetProtocolNegotiated() const {
|
| return protocol_negotiated_;
|
| }
|
|
|
|
|