| Index: net/socket/ssl_client_socket.h
|
| diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h
|
| index 8f1284da896feb1345b61ba4ff11c05840cb1dae..14cf163de4c69cc414ceb12b94bf5ce15ee86250 100644
|
| --- a/net/socket/ssl_client_socket.h
|
| +++ b/net/socket/ssl_client_socket.h
|
| @@ -88,6 +88,9 @@ class NET_EXPORT SSLClientSocket : public SSLSocket {
|
| virtual void GetSSLCertRequestInfo(
|
| SSLCertRequestInfo* cert_request_info) = 0;
|
|
|
| + // StreamSocket:
|
| + virtual NextProto GetNegotiatedProtocol() const OVERRIDE;
|
| +
|
| // Get the application level protocol that we negotiated with the server.
|
| // *proto is set to the resulting protocol (n.b. that the string may have
|
| // embedded NULs).
|
| @@ -123,8 +126,6 @@ class NET_EXPORT SSLClientSocket : public SSLSocket {
|
|
|
| virtual bool set_was_spdy_negotiated(bool negotiated);
|
|
|
| - virtual NextProto protocol_negotiated() const;
|
| -
|
| virtual void set_protocol_negotiated(NextProto protocol_negotiated);
|
|
|
| // Returns the ServerBoundCertService used by this socket, or NULL if
|
|
|