Revert of Avoids the "re-encode HPACK as SPDY3" step.

net/quic/quic_spdy_stream.cc

Index: net/quic/quic_spdy_stream.cc
diff --git a/net/quic/quic_spdy_stream.cc b/net/quic/quic_spdy_stream.cc
index fcd206e6fb793190610add1241c0162ad40f0be4..b6adeecdc6e3202b2277a1bf955ad748c51d076b 100644
--- a/net/quic/quic_spdy_stream.cc
+++ b/net/quic/quic_spdy_stream.cc
@@ -30,7 +30,6 @@
       headers_decompressed_(false),
       priority_(kDefaultPriority),
       trailers_decompressed_(false),
-      trailers_delivered_(false),
       avoid_empty_nonfin_writes_(FLAGS_quic_avoid_empty_nonfin_writes) {
   DCHECK_NE(kCryptoStreamId, id);
   // Don't receive any callbacks from the sequencer until headers
@@ -162,10 +161,6 @@
   decompressed_trailers_.erase(0, bytes_consumed);
 }
 
-void QuicSpdyStream::MarkTrailersDelivered() {
-  trailers_delivered_ = true;
-}
-
 void QuicSpdyStream::ConsumeHeaderList() {
   header_list_.Clear();
   if (FinishedReadingHeaders()) {
@@ -382,13 +377,8 @@
 bool QuicSpdyStream::FinishedReadingTrailers() const {
   // If no further trailing headers are expected, and the decompressed trailers
   // (if any) have been consumed, then reading of trailers is finished.
-  if (!fin_received()) {
-    return false;
-  } else if (!trailers_decompressed_) {
-    return true;
-  } else {
-    return trailers_delivered_ && decompressed_trailers_.empty();
-  }
+  bool no_more_trailers = fin_received() || trailers_decompressed_;
+  return no_more_trailers && decompressed_trailers_.empty();
 }
 
 SpdyPriority QuicSpdyStream::priority() const {