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, 10 insertions, 0 deletions

diff --git a/remoting/protocol/fake_session.cc b/remoting/protocol/fake_session.cc
index de6f7cf..69f87db 100644
--- a/remoting/protocol/fake_session.cc
+++ b/remoting/protocol/fake_session.cc
@@ -165,11 +165,19 @@ base::TimeDelta FakeSocket::GetConnectTimeMicros() const {
   return base::TimeDelta();
 }
 
+bool FakeSocket::WasNpnNegotiated() const {
+  return false;
+}
+
 net::NextProto FakeSocket::GetNegotiatedProtocol() const {
   NOTIMPLEMENTED();
   return net::kProtoUnknown;
 }
 
+bool FakeSocket::GetSSLInfo(net::SSLInfo* ssl_info) {
+  return false;
+}
+
 FakeUdpSocket::FakeUdpSocket()
     : read_pending_(false),
       input_pos_(0),
diff --git a/remoting/protocol/fake_session.h b/remoting/protocol/fake_session.h
index 4000cbc..5b59d90 100644
--- a/remoting/protocol/fake_session.h
+++ b/remoting/protocol/fake_session.h
@@ -69,7 +69,9 @@ class FakeSocket : public net::StreamSocket {
   virtual bool UsingTCPFastOpen() const OVERRIDE;
   virtual int64 NumBytesRead() const OVERRIDE;
   virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
+  virtual bool WasNpnNegotiated() const OVERRIDE;
   virtual net::NextProto GetNegotiatedProtocol() const OVERRIDE;
+  virtual bool GetSSLInfo(net::SSLInfo* ssl_info) OVERRIDE;
 
  private:
   int next_read_error_;