From 5fe524efcaf51b401067d936b5ff331249dc99df Mon Sep 17 00:00:00 2001 From: "wtc@chromium.org" Date: Sat, 20 Feb 2010 00:43:22 +0000 Subject: Make explicit the assumption that SpdySession::InitializeWithSocket takes an SSLClientSocket by renaming the methods and adding a DCHECK. R=willchan BUG=none TEST=No compilation errors. Review URL: http://codereview.chromium.org/650085 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39528 0039d316-1c4b-4281-b951-d872f2087c98 --- net/http/http_network_transaction.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'net/http') diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index 89325e0..ba8f3c9 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -1136,7 +1136,10 @@ int HttpNetworkTransaction::DoSpdySendRequest() { if (spdy_pool->HasSession(req_info)) { spdy_session = spdy_pool->Get(req_info, session_); } else { - spdy_session = spdy_pool->GetSpdySessionFromSocket( + // SPDY is negotiated using the TLS next protocol negotiation (NPN) + // extension, so |connection_| must contain an SSLClientSocket. + DCHECK(using_ssl_); + spdy_session = spdy_pool->GetSpdySessionFromSSLSocket( req_info, session_, connection_.release()); } -- cgit v1.1