Revert of QUIC - instrumentation for testing null QuicSpdyStream.

net/quic/quic_spdy_stream.cc

 // Copyright 2013 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_spdy_stream.h"
 
-// TODO(rtenneti): Temporary while investigating crbug.com/585591.
-#include "base/debug/alias.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/quic_bug_tracker.h"
 #include "net/quic/quic_spdy_session.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/quic_write_blocked_list.h"
 
 using base::StringPiece;
 using std::min;
 using net::SpdyPriority;
@@ skipping 13 matching lines @@
       trailers_decompressed_(false) {
   DCHECK_NE(kCryptoStreamId, id);
   // Don't receive any callbacks from the sequencer until headers
   // are complete.
   sequencer()->SetBlockedUntilFlush();
   spdy_session_->RegisterStreamPriority(id, priority_);
 }
 
 QuicSpdyStream::~QuicSpdyStream() {
   spdy_session_->UnregisterStreamPriority(id());
-  // TODO(rtenneti): Temporary until crbug.com/585591 is solved.
-  liveness_ = DEAD;
-  // Get callstack, if the object is going away and we are doing a Read().
-  bool read_in_progress = read_in_progress_;
-  base::debug::Alias(&read_in_progress);
-  CHECK(!read_in_progress);
-}
-
-// TODO(rtenneti): Temporary until crbug.com/585591 is solved.
-void QuicSpdyStream::CrashIfInvalid() const {
-  Liveness liveness = liveness_;
-  if (liveness == ALIVE)
-    return;
-  base::debug::Alias(&liveness);
-  CHECK_EQ(ALIVE, liveness);
 }
 
 void QuicSpdyStream::CloseWriteSide() {
   if (version() > QUIC_VERSION_28 && !fin_received() && !rst_received() &&
       sequencer()->ignore_read_data() && !rst_sent()) {
     DCHECK(fin_sent());
     // Tell the peer to stop sending further data.
     DVLOG(1) << ENDPOINT << "Send QUIC_STREAM_NO_ERROR on stream " << id();
     Reset(QUIC_STREAM_NO_ERROR);
   }
@@ skipping 205 matching lines @@
   // If no further trailing headers are expected, and the decompressed trailers
   // (if any) have been consumed, then reading of trailers is finished.
   bool no_more_trailers = fin_received() || trailers_decompressed_;
   return no_more_trailers && decompressed_trailers_.empty();
 }
 
 SpdyPriority QuicSpdyStream::priority() const {
   return priority_;
 }
 }  // namespace net