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

2 files changed, 11 insertions, 1 deletions

diff --git a/net/curvecp/curvecp_client_socket.cc b/net/curvecp/curvecp_client_socket.cc
index 8da55b68..f042189 100644
--- a/net/curvecp/curvecp_client_socket.cc
+++ b/net/curvecp/curvecp_client_socket.cc
@@ -85,10 +85,18 @@ base::TimeDelta CurveCPClientSocket::GetConnectTimeMicros() const {
   return base::TimeDelta::FromMicroseconds(-1);
 }
 
+bool CurveCPClientSocket::WasNpnNegotiated() const {
+  return false;
+}
+
 NextProto CurveCPClientSocket::GetNegotiatedProtocol() const {
   return kProtoUnknown;
 }
 
+bool CurveCPClientSocket::GetSSLInfo(SSLInfo* ssl_info) {
+  return false;
+}
+
 int CurveCPClientSocket::Read(IOBuffer* buf,
                               int buf_len,
                               const CompletionCallback& callback) {
diff --git a/net/curvecp/curvecp_client_socket.h b/net/curvecp/curvecp_client_socket.h
index de3e86a..80734b7 100644
--- a/net/curvecp/curvecp_client_socket.h
+++ b/net/curvecp/curvecp_client_socket.h
@@ -38,7 +38,9 @@ class CurveCPClientSocket : public StreamSocket {
   virtual bool UsingTCPFastOpen() const OVERRIDE;
   virtual int64 NumBytesRead() const OVERRIDE;
   virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
-  virtual net::NextProto GetNegotiatedProtocol() const OVERRIDE;
+  virtual bool WasNpnNegotiated() const OVERRIDE;
+  virtual NextProto GetNegotiatedProtocol() const OVERRIDE;
+  virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
 
   // Socket methods:
   virtual int Read(IOBuffer* buf,