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

net/quic/quic_chromium_client_stream.cc

Index: net/quic/quic_chromium_client_stream.cc
diff --git a/net/quic/quic_chromium_client_stream.cc b/net/quic/quic_chromium_client_stream.cc
index 2b72c95174b7d595a344f1a07231cf12f757fb22..0f21d51127ae865b6908af42c7f84e9c14d14e42 100644
--- a/net/quic/quic_chromium_client_stream.cc
+++ b/net/quic/quic_chromium_client_stream.cc
@@ -60,36 +60,6 @@
   }
 }
 
-void QuicChromiumClientStream::OnInitialHeadersComplete(
-    bool fin,
-    size_t frame_len,
-    const QuicHeaderList& header_list) {
-  QuicSpdyStream::OnInitialHeadersComplete(fin, frame_len, header_list);
-
-  SpdyHeaderBlock header_block;
-  int64_t length = -1;
-  if (!SpdyUtils::CopyAndValidateHeaders(header_list, &length, &header_block)) {
-    DLOG(ERROR) << "Failed to parse header list: " << header_list.DebugString();
-    ConsumeHeaderList();
-    Reset(QUIC_BAD_APPLICATION_PAYLOAD);
-    return;
-  }
-
-  ConsumeHeaderList();
-  session_->OnInitialHeadersComplete(id(), header_block);
-
-  // The delegate will read the headers via a posted task.
-  NotifyDelegateOfHeadersCompleteLater(header_block, frame_len);
-}
-
-void QuicChromiumClientStream::OnTrailingHeadersComplete(
-    bool fin,
-    size_t frame_len,
-    const QuicHeaderList& header_list) {
-  QuicSpdyStream::OnTrailingHeadersComplete(fin, frame_len, header_list);
-  NotifyDelegateOfHeadersCompleteLater(received_trailers(), frame_len);
-}
-
 void QuicChromiumClientStream::OnPromiseHeadersComplete(
     QuicStreamId promised_id,
     size_t frame_len) {
@@ -252,7 +222,6 @@
   // Only mark trailers consumed when we are about to notify delegate.
   if (headers_delivered_) {
     MarkTrailersConsumed(decompressed_trailers().length());
-    MarkTrailersDelivered();
     net_log_.AddEvent(
         NetLog::TYPE_QUIC_CHROMIUM_CLIENT_STREAM_READ_RESPONSE_TRAILERS,
         base::Bind(&SpdyHeaderBlockNetLogCallback, &headers));