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

net/quic/test_tools/mock_quic_spdy_client_stream.h

Index: net/quic/test_tools/mock_quic_spdy_client_stream.h
diff --git a/net/quic/test_tools/mock_quic_spdy_client_stream.h b/net/quic/test_tools/mock_quic_spdy_client_stream.h
index 7164679eceea0d068ccf5d0ed5cc171fe71bf7da..d5bd14f15b9ce4f663718640f3bd1034dac2b6e9 100644
--- a/net/quic/test_tools/mock_quic_spdy_client_stream.h
+++ b/net/quic/test_tools/mock_quic_spdy_client_stream.h
@@ -21,10 +21,7 @@
 
   MOCK_METHOD1(OnStreamFrame, void(const QuicStreamFrame& frame));
   MOCK_METHOD2(OnInitialHeadersComplete, void(bool fin, size_t frame_len));
-  MOCK_METHOD3(OnTrailingHeadersComplete,
-               void(bool fin,
-                    size_t frame_len,
-                    const QuicHeaderList& header_list));
+  MOCK_METHOD2(OnTrailingHeadersComplete, void(bool fin, size_t frame_len));
   MOCK_METHOD1(OnPromiseHeaders, void(base::StringPiece headers_data));
   MOCK_METHOD2(OnPromiseHeadersComplete,
                void(QuicStreamId promised_stream_id, size_t frame_len));