Change SpdySession::GetSSLInfo to get the SSLInfo from the underlying socket

even if the session is not "secure".  This required refactoring StreamSocket
to add WasNpnNegotiated() and GetSSLInfo() methods.

This allows for a change to SpdySession::GetSSLInfo to accurately return the correct SSLInfo in the case of SPDY Proxy sessions.

BUG=134690
TEST=\*DoNotUseSpdySessionIfCertDoesNotMatch\*



Review URL: https://chromiumcodereview.appspot.com/10690122

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147479 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 9 deletions

diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 5528617..d0190df 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -1191,15 +1191,10 @@ scoped_refptr<SpdyStream> SpdySession::GetActivePushStream(
 bool SpdySession::GetSSLInfo(SSLInfo* ssl_info,
                              bool* was_npn_negotiated,
                              NextProto* protocol_negotiated) {
-  if (!is_secure_) {
-    *protocol_negotiated = kProtoUnknown;
-    return false;
-  }
-  SSLClientSocket* ssl_socket = GetSSLClientSocket();
-  ssl_socket->GetSSLInfo(ssl_info);
-  *was_npn_negotiated = ssl_socket->was_npn_negotiated();
-  *protocol_negotiated = ssl_socket->GetNegotiatedProtocol();
-  return true;
+
+  *was_npn_negotiated = connection_->socket()->WasNpnNegotiated();
+  *protocol_negotiated = connection_->socket()->GetNegotiatedProtocol();
+  return connection_->socket()->GetSSLInfo(ssl_info);
 }
 
 bool SpdySession::GetSSLCertRequestInfo(