summaryrefslogtreecommitdiffstats
path: root/net/socket/ssl_server_socket_unittest.cc
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-19 17:55:17 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-19 17:55:17 +0000
commit2d88e7d8b4c382e0ef178c52a87450c226150ef2 (patch)
treeb76d5921ed1ed5c2321570306779aab993f74568 /net/socket/ssl_server_socket_unittest.cc
parentf7b2b6a665c130d4ca6b08fdec87b2fad3198f3d (diff)
downloadchromium_src-2d88e7d8b4c382e0ef178c52a87450c226150ef2.zip
chromium_src-2d88e7d8b4c382e0ef178c52a87450c226150ef2.tar.gz
chromium_src-2d88e7d8b4c382e0ef178c52a87450c226150ef2.tar.bz2
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
Diffstat (limited to 'net/socket/ssl_server_socket_unittest.cc')
-rw-r--r--net/socket/ssl_server_socket_unittest.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc
index 03a6db0..f93d7c6 100644
--- a/net/socket/ssl_server_socket_unittest.cc
+++ b/net/socket/ssl_server_socket_unittest.cc
@@ -236,10 +236,18 @@ class FakeSocket : public StreamSocket {
return base::TimeDelta::FromMicroseconds(-1);
}
+ virtual bool WasNpnNegotiated() const {
+ return false;
+ }
+
virtual NextProto GetNegotiatedProtocol() const {
return kProtoUnknown;
}
+ virtual bool GetSSLInfo(SSLInfo* ssl_info) {
+ return false;
+ }
+
private:
net::BoundNetLog net_log_;
FakeDataChannel* incoming_;