diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-20 00:43:22 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-20 00:43:22 +0000 |
| commit | 5fe524efcaf51b401067d936b5ff331249dc99df (patch) | |
| tree | 6682f9e38cdce9d6d5f2f8a341d57642d6befe2c /net/http | |
| parent | a04aef09a3b4264a86f52f055c8593d8a8979798 (diff) | |
| download | chromium_src-5fe524efcaf51b401067d936b5ff331249dc99df.zip chromium_src-5fe524efcaf51b401067d936b5ff331249dc99df.tar.gz chromium_src-5fe524efcaf51b401067d936b5ff331249dc99df.tar.bz2 | |
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
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_network_transaction.cc | 5 |
1 files changed, 4 insertions, 1 deletions
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()); } |