| Index: net/quic/quic_http_stream.cc
|
| diff --git a/net/quic/quic_http_stream.cc b/net/quic/quic_http_stream.cc
|
| index 398c96e05086a8aa6f9bf1550a2e3e8b383f3aeb..11cbf280669225cc76420cb1a7ad79990441060a 100644
|
| --- a/net/quic/quic_http_stream.cc
|
| +++ b/net/quic/quic_http_stream.cc
|
| @@ -697,21 +697,7 @@ int QuicHttpStream::ProcessResponseHeaders(const SpdyHeaderBlock& headers) {
|
| }
|
|
|
| int QuicHttpStream::ReadAvailableData(IOBuffer* buf, int buf_len) {
|
| - // TODO(rtenneti): Temporary until crbug.com/585591 is solved.
|
| - CHECK(!read_in_progress_);
|
| - read_in_progress_ = true;
|
| - stream_->CrashIfInvalid();
|
| - stream_->set_read_in_progress(read_in_progress_);
|
| -
|
| int rv = stream_->Read(buf, buf_len);
|
| - // TODO(rtenneti): Temporary until crbug.com/585591 is solved.
|
| - CHECK(read_in_progress_);
|
| - read_in_progress_ = false;
|
| - stream_->set_read_in_progress(read_in_progress_);
|
| - // CrashIfInvalid() may not be necessary. See if |stream_| became a nullptr
|
| - // due to memory corruptions.
|
| - stream_->CrashIfInvalid();
|
| -
|
| if (stream_->IsDoneReading()) {
|
| stream_->SetDelegate(nullptr);
|
| stream_->OnFinRead();
|
| @@ -721,11 +707,6 @@ int QuicHttpStream::ReadAvailableData(IOBuffer* buf, int buf_len) {
|
| }
|
|
|
| void QuicHttpStream::ResetStream() {
|
| - // TODO(rtenneti): Temporary until crbug.com/585591 is solved.
|
| - if (read_in_progress_) {
|
| - // |stream_| is going away when Read is called. Should never happen??
|
| - CHECK(false);
|
| - }
|
| if (push_handle_) {
|
| push_handle_->Cancel();
|
| push_handle_ = nullptr;
|
|
|