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

net/quic/quic_spdy_stream.h

Index: net/quic/quic_spdy_stream.h
diff --git a/net/quic/quic_spdy_stream.h b/net/quic/quic_spdy_stream.h
index 39451304201e050a18bcb03079f4bd13487b1e2a..d8cf3964cc218ad4a890ebe97e5db8b62fe651b6 100644
--- a/net/quic/quic_spdy_stream.h
+++ b/net/quic/quic_spdy_stream.h
@@ -139,9 +139,6 @@
 
   // Marks |bytes_consumed| of the trailers data as consumed.
   void MarkTrailersConsumed(size_t bytes_consumed);
-
-  // Marks the trailers as consumed.
-  void MarkTrailersDelivered();
 
   // Clears |header_list_|.
   void ConsumeHeaderList();
@@ -236,8 +233,6 @@
 
   // True if the trailers have been completely decompressed.
   bool trailers_decompressed_;
-  // True if the trailers have been consumed.
-  bool trailers_delivered_;
   // Contains a copy of the decompressed trailers until they are consumed
   // via ProcessData or Readv.
   std::string decompressed_trailers_;