Index: net/socket/ssl_client_socket.h |
diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h |
index 61986be84cee0f162c84da6432c06b72f4ab0704..dab28f7bcb3c6991f75304f14c3a9dd8bf7ab4cf 100644 |
--- a/net/socket/ssl_client_socket.h |
+++ b/net/socket/ssl_client_socket.h |
@@ -70,20 +70,16 @@ 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; |
Ryan Sleevi
2012/07/13 18:32:03
If this is part of the StreamSocket impl, then the
Ryan Hamilton
2012/07/16 19:24:08
Done.
|
// 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). |
@@ -111,8 +107,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; |