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

diff --git a/content/browser/renderer_host/p2p/socket_host_test_utils.h b/content/browser/renderer_host/p2p/socket_host_test_utils.h
index 3ab5de3..c3deea8 100644
--- a/content/browser/renderer_host/p2p/socket_host_test_utils.h
+++ b/content/browser/renderer_host/p2p/socket_host_test_utils.h
@@ -75,7 +75,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:
   bool read_pending_;
@@ -219,10 +221,18 @@ base::TimeDelta FakeSocket::GetConnectTimeMicros() const {
   return base::TimeDelta::FromMicroseconds(-1);
 }
 
+bool FakeSocket::WasNpnNegotiated() const {
+  return false;
+}
+
 net::NextProto FakeSocket::GetNegotiatedProtocol() const {
   return net::kProtoUnknown;
 }
 
+bool FakeSocket::GetSSLInfo(net::SSLInfo* ssl_info) {
+  return false;
+}
+
 void CreateRandomPacket(std::vector<char>* packet) {
   size_t size = kStunHeaderSize + rand() % 1000;
   packet->resize(size);