Revert of QUIC - instrumentation for testing null QuicSpdyStream.

net/quic/quic_spdy_stream.h

 // 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.
 //
 // The base class for streams which deliver data to/from an application.
 // In each direction, the data on such a stream first contains compressed
 // headers then body data.
 
 #ifndef NET_QUIC_QUIC_SPDY_STREAM_H_
 #define NET_QUIC_QUIC_SPDY_STREAM_H_
@@ skipping 129 matching lines @@
   const std::string& decompressed_trailers() const {
     return decompressed_trailers_;
   }
 
   virtual SpdyPriority priority() const;
 
   // Sets priority_ to priority.  This should only be called before bytes are
   // written to the server.
   void SetPriority(SpdyPriority priority);
 
-  // TODO(rtenneti): Temporary until crbug.com/585591 is solved.
-  void CrashIfInvalid() const;
-  void set_read_in_progress(bool value) { read_in_progress_ = value; }
-
  protected:
   // Called by OnStreamHeadersComplete depending on which type (initial or
   // trailing) headers are expected next.
   virtual void OnInitialHeadersComplete(bool fin, size_t frame_len);
   virtual void OnTrailingHeadersComplete(bool fin, size_t frame_len);
   QuicSpdySession* spdy_session() const { return spdy_session_; }
   Visitor* visitor() { return visitor_; }
 
   // Returns true if headers have been fully read and consumed.
   bool FinishedReadingHeaders() const;
 
  private:
   friend class test::QuicSpdyStreamPeer;
   friend class test::ReliableQuicStreamPeer;
   friend class QuicStreamUtils;
 
-  // TODO(rtenneti): Temporary until crbug.com/585591 is solved.
-  enum Liveness {
-    ALIVE = 0xCA11AB13,
-    DEAD = 0xDEADBEEF,
-  };
-
   // Returns true if trailers have been fully read and consumed.
   bool FinishedReadingTrailers() const;
 
   QuicSpdySession* spdy_session_;
 
   Visitor* visitor_;
   // True if the headers have been completely decompressed.
   bool headers_decompressed_;
   // The priority of the stream, once parsed.
   SpdyPriority priority_;
   // Contains a copy of the decompressed headers until they are consumed
   // via ProcessData or Readv.
   std::string decompressed_headers_;
 
   // True if the trailers have been completely decompressed.
   bool trailers_decompressed_;
   // Contains a copy of the decompressed trailers until they are consumed
   // via ProcessData or Readv.
   std::string decompressed_trailers_;
 
-  // TODO(rtenneti): Temporary until crbug.com/585591 is solved.
-  Liveness liveness_ = ALIVE;
-  bool read_in_progress_ = false;
-
   DISALLOW_COPY_AND_ASSIGN(QuicSpdyStream);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_SPDY_STREAM_H_