Revert of QUIC - instrumentation for testing null QuicSpdyStream.

net/quic/quic_http_stream.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_http_stream.h"
 
 #include "base/callback_helpers.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
@@ skipping 679 matching lines @@
   response_info_->was_npn_negotiated = true;
   response_info_->npn_negotiated_protocol = "quic/1+spdy/3";
   response_info_->response_time = base::Time::Now();
   response_info_->request_time = request_time_;
   response_headers_received_ = true;
 
   return OK;
 }
 
 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();
     ResetStream();
   }
   return rv;
 }
 
 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;
   }
   if (!stream_)
     return;
   closed_stream_received_bytes_ = stream_->stream_bytes_read();
   closed_stream_sent_bytes_ = stream_->stream_bytes_written();
   stream_ = nullptr;
 
   // If |request_body_stream_| is non-NULL, Reset it, to abort any in progress
   // read.
   if (request_body_stream_)
     request_body_stream_->Reset();
 }
 
 }  // namespace net