| Index: net/socket/ssl_client_socket.h
|
| diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h
|
| index 6748e6e12658358ffe90c7aec312b85629e419fe..41ee0873347a1c416db906d3c0d9e4dc5bef358c 100644
|
| --- a/net/socket/ssl_client_socket.h
|
| +++ b/net/socket/ssl_client_socket.h
|
| @@ -69,20 +69,15 @@ class NET_EXPORT SSLClientSocket : public SSLSocket {
|
| // the first protocol in our list.
|
| };
|
|
|
| - // Gets the SSL connection information of the socket.
|
| - //
|
| - // TODO(sergeyu): Move this method to the SSLSocket interface and
|
| - // implemented in SSLServerSocket too.
|
| - virtual void GetSSLInfo(SSLInfo* ssl_info) = 0;
|
| + // StreamSocket:
|
| + virtual bool WasNpnNegotiated() const OVERRIDE;
|
| + virtual NextProto GetNegotiatedProtocol() const OVERRIDE;
|
|
|
| // Gets the SSL CertificateRequest info of the socket after Connect failed
|
| // with ERR_SSL_CLIENT_AUTH_CERT_NEEDED.
|
| 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).
|
| @@ -110,8 +105,6 @@ class NET_EXPORT SSLClientSocket : public SSLSocket {
|
| // sessions.
|
| static void ClearSessionCache();
|
|
|
| - virtual bool was_npn_negotiated() const;
|
| -
|
| virtual bool set_was_npn_negotiated(bool negotiated);
|
|
|
| virtual bool was_spdy_negotiated() const;
|
|
|