| Index: net/http/http_pipelined_connection_impl.h
|
| diff --git a/net/http/http_pipelined_connection_impl.h b/net/http/http_pipelined_connection_impl.h
|
| index 3f9e26969fd16828869bbad9b5a43928cdffa2d1..a20361d76093202d607ba575017d01f38fc660d0 100644
|
| --- a/net/http/http_pipelined_connection_impl.h
|
| +++ b/net/http/http_pipelined_connection_impl.h
|
| @@ -56,7 +56,7 @@ class NET_EXPORT_PRIVATE HttpPipelinedConnectionImpl
|
| const ProxyInfo& used_proxy_info,
|
| const BoundNetLog& net_log,
|
| bool was_npn_negotiated,
|
| - SSLClientSocket::NextProto protocol_negotiated) OVERRIDE {
|
| + NextProto protocol_negotiated) OVERRIDE {
|
| return new HttpPipelinedConnectionImpl(connection, delegate, origin,
|
| used_ssl_config, used_proxy_info,
|
| net_log, was_npn_negotiated,
|
| @@ -71,7 +71,7 @@ class NET_EXPORT_PRIVATE HttpPipelinedConnectionImpl
|
| const ProxyInfo& used_proxy_info,
|
| const BoundNetLog& net_log,
|
| bool was_npn_negotiated,
|
| - SSLClientSocket::NextProto protocol_negotiated);
|
| + NextProto protocol_negotiated);
|
| virtual ~HttpPipelinedConnectionImpl();
|
|
|
| // HttpPipelinedConnection interface.
|
| @@ -89,7 +89,7 @@ class NET_EXPORT_PRIVATE HttpPipelinedConnectionImpl
|
| virtual const ProxyInfo& used_proxy_info() const OVERRIDE;
|
| virtual const BoundNetLog& net_log() const OVERRIDE;
|
| virtual bool was_npn_negotiated() const OVERRIDE;
|
| - virtual SSLClientSocket::NextProto protocol_negotiated() const OVERRIDE;
|
| + virtual NextProto protocol_negotiated() const OVERRIDE;
|
|
|
| // Used by HttpPipelinedStream.
|
|
|
| @@ -307,7 +307,7 @@ class NET_EXPORT_PRIVATE HttpPipelinedConnectionImpl
|
| BoundNetLog net_log_;
|
| bool was_npn_negotiated_;
|
| // Protocol negotiated with the server.
|
| - SSLClientSocket::NextProto protocol_negotiated_;
|
| + NextProto protocol_negotiated_;
|
| scoped_refptr<GrowableIOBuffer> read_buf_;
|
| int next_pipeline_id_;
|
| bool active_;
|
|
|