5 files changed, 3 insertions, 23 deletions
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index c84ba5c..dfc241f 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -517,8 +517,9 @@ void SpdyHttpStream::GetSSLInfo(SSLInfo* ssl_info) {
 
 void SpdyHttpStream::GetSSLCertRequestInfo(
     SSLCertRequestInfo* cert_request_info) {
-  DCHECK(stream_.get());
-  stream_->GetSSLCertRequestInfo(cert_request_info);
+  // A SPDY stream cannot request client certificates. Client authentication may
+  // only occur during the initial SSL handshake.
+  NOTREACHED();
 }
 
 bool SpdyHttpStream::IsSpdyHttpStream() const {
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 1c2df26..3964772 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -1975,14 +1975,6 @@ bool SpdySession::GetSSLInfo(SSLInfo* ssl_info,
   return connection_->socket()->GetSSLInfo(ssl_info);
 }
 
-bool SpdySession::GetSSLCertRequestInfo(
-    SSLCertRequestInfo* cert_request_info) {
-  if (!is_secure_)
-    return false;
-  GetSSLClientSocket()->GetSSLCertRequestInfo(cert_request_info);
-  return true;
-}
-
 void SpdySession::OnError(SpdyFramer::SpdyError error_code) {
   CHECK(in_io_loop_);
 
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index 1e7c78c..fdbf73d 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -358,10 +358,6 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
                   bool* was_npn_negotiated,
                   NextProto* protocol_negotiated);
 
-  // Fills SSL Certificate Request info |cert_request_info| and returns
-  // true when SSL is in use.
-  bool GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);
-
   // Send a WINDOW_UPDATE frame for a stream. Called by a stream
   // whenever receive window size is increased.
   void SendStreamWindowUpdate(SpdyStreamId stream_id,
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
index 9f8c02a9..97d0c9d 100644
--- a/net/spdy/spdy_stream.cc
+++ b/net/spdy/spdy_stream.cc
@@ -710,10 +710,6 @@ bool SpdyStream::GetSSLInfo(SSLInfo* ssl_info,
       ssl_info, was_npn_negotiated, protocol_negotiated);
 }
 
-bool SpdyStream::GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info) {
-  return session_->GetSSLCertRequestInfo(cert_request_info);
-}
-
 void SpdyStream::PossiblyResumeIfSendStalled() {
   if (IsLocallyClosed()) {
     return;
diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h
index a1821a3..73288ce 100644
--- a/net/spdy/spdy_stream.h
+++ b/net/spdy/spdy_stream.h
@@ -31,7 +31,6 @@ namespace net {
 class AddressList;
 class IPEndPoint;
 struct LoadTimingInfo;
-class SSLCertRequestInfo;
 class SSLInfo;
 class SpdySession;
 
@@ -378,10 +377,6 @@ class NET_EXPORT_PRIVATE SpdyStream {
                   bool* was_npn_negotiated,
                   NextProto* protocol_negotiated);
 
-  // Fills SSL Certificate Request info |cert_request_info| and returns
-  // true when SSL is in use.
-  bool GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);
-
   // If the stream is stalled on sending data, but the session is not
   // stalled on sending data and |send_window_size_| is positive, then
   // set |send_stalled_by_flow_control_| to false and unstall the data