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

net/quic/quic_spdy_stream_test.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"
 
 #include <memory>
 
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/quic_connection.h"
@@ skipping 829 matching lines @@
   string trailers = SpdyUtils::SerializeUncompressedHeaders(trailers_block);
   stream_->OnStreamHeaders(trailers);
   stream_->OnStreamHeadersComplete(/*fin=*/true, trailers.size());
 
   // The trailers should be decompressed, and readable from the stream.
   EXPECT_TRUE(stream_->trailers_decompressed());
   const string decompressed_trailers = stream_->decompressed_trailers();
   EXPECT_EQ(trailers, decompressed_trailers);
   // Consuming the trailers erases them from the stream.
   stream_->MarkTrailersConsumed(decompressed_trailers.size());
-  stream_->MarkTrailersDelivered();
   EXPECT_EQ("", stream_->decompressed_trailers());
 
   EXPECT_FALSE(stream_->IsDoneReading());
   // Receive and consume body.
   QuicStreamFrame frame(kClientDataStreamId1, /*fin=*/false, 0, body);
   stream_->OnStreamFrame(frame);
   EXPECT_EQ(body, stream_->data());
   EXPECT_TRUE(stream_->IsDoneReading());
 }
 
@@ skipping 131 matching lines @@
 
   // Writing Trailers should fail, as the FIN has already been sent.
   // populated with the number of body bytes written.
   EXPECT_DFATAL(stream_->WriteTrailers(SpdyHeaderBlock(), nullptr),
                 "Trailers cannot be sent after a FIN");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net