diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-20 02:57:10 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-20 02:57:10 +0000 |
| commit | fc42b5f27403f5f9f68034baead802c572c0c722 (patch) | |
| tree | a626d85daa9ff2f03a2a8b4cc9e401eedae30ecb | |
| parent | ced90ae1159e8967837cd13b9155956467a811f9 (diff) | |
| download | chromium_src-fc42b5f27403f5f9f68034baead802c572c0c722.zip chromium_src-fc42b5f27403f5f9f68034baead802c572c0c722.tar.gz chromium_src-fc42b5f27403f5f9f68034baead802c572c0c722.tar.bz2 | |
Back out the change to HttpNetworkTransaction::Read in the
previous checkin. It needs more work.
TBR=willchan
BUG=35108
TEST=none
Review URL: http://codereview.chromium.org/650109
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39541 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/http/http_network_transaction.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index ba8f3c9..7f61b0e 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -333,12 +333,11 @@ int HttpNetworkTransaction::Read(IOBuffer* buf, int buf_len, State next_state = STATE_NONE; // Are we using SPDY or HTTP? - if (use_spdy_) { + if (spdy_stream_.get()) { DCHECK(!http_stream_.get()); DCHECK(spdy_stream_->GetResponseInfo()->headers); next_state = STATE_SPDY_READ_BODY; } else { - DCHECK(!spdy_stream_.get()); scoped_refptr<HttpResponseHeaders> headers = GetResponseHeaders(); DCHECK(headers.get()); next_state = STATE_READ_BODY; |