1 files changed, 5 insertions, 13 deletions
diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h
index 104cca3..ca4393b 100644
--- a/net/socket/ssl_client_socket.h
+++ b/net/socket/ssl_client_socket.h
@@ -11,12 +11,9 @@
 #include "net/base/completion_callback.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
+#include "net/socket/ssl_socket.h"
 #include "net/socket/stream_socket.h"
 
-namespace base {
-class StringPiece;
-}  // namespace base
-
 namespace net {
 
 class CertVerifier;
@@ -79,7 +76,7 @@ struct SSLClientSocketContext {
 // connection is established.  If a SSL error occurs during the handshake,
 // Connect will fail.
 //
-class NET_EXPORT SSLClientSocket : public StreamSocket {
+class NET_EXPORT SSLClientSocket : public SSLSocket {
  public:
   SSLClientSocket();
 
@@ -107,6 +104,9 @@ class NET_EXPORT SSLClientSocket : public StreamSocket {
   };
 
   // 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;
 
   // Gets the SSL CertificateRequest info of the socket after Connect failed
@@ -114,14 +114,6 @@ class NET_EXPORT SSLClientSocket : public StreamSocket {
   virtual void GetSSLCertRequestInfo(
       SSLCertRequestInfo* cert_request_info) = 0;
 
-  // Exports data derived from the SSL master-secret (see RFC 5705).
-  // The call will fail with an error if the socket is not connected, or the
-  // SSL implementation does not support the operation.
-  virtual int ExportKeyingMaterial(const base::StringPiece& label,
-                                   const base::StringPiece& context,
-                                   unsigned char *out,
-                                   unsigned int outlen) = 0;
-
   // 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).