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

net/spdy/buffered_spdy_framer.h

Index: net/spdy/buffered_spdy_framer.h
diff --git a/net/spdy/buffered_spdy_framer.h b/net/spdy/buffered_spdy_framer.h
index 8cc7bce002aa1d4d4b5ce9ee1ca1048986ed6efc..87283b0f6f1abdbddbd4abb9dab6d224f8f5598b 100644
--- a/net/spdy/buffered_spdy_framer.h
+++ b/net/spdy/buffered_spdy_framer.h
@@ -14,7 +14,6 @@
 #include "base/macros.h"
 #include "net/base/net_export.h"
 #include "net/socket/next_proto.h"
-#include "net/spdy/header_coalescer.h"
 #include "net/spdy/spdy_framer.h"
 #include "net/spdy/spdy_header_block.h"
 #include "net/spdy/spdy_protocol.h"
@@ -81,6 +80,20 @@
   // |stream_id| The stream receiving data.
   // |len| The number of padding octets.
   virtual void OnStreamPadding(SpdyStreamId stream_id, size_t len) = 0;
+
+  // Called just before processing the payload of a frame containing header
+  // data. Should return an implementation of SpdyHeadersHandlerInterface that
+  // will receive headers for stream |stream_id|. The caller will not take
+  // ownership of the headers handler. The same instance should be returned
+  // for all header frames comprising a logical header block (i.e. until
+  // OnHeaderFrameEnd() is called with end_headers == true).
+  virtual SpdyHeadersHandlerInterface* OnHeaderFrameStart(
+      SpdyStreamId stream_id) = 0;
+
+  // Called after processing the payload of a frame containing header data.
+  // |end_headers| is true if there will not be any subsequent CONTINUATION
+  // frames.
+  virtual void OnHeaderFrameEnd(SpdyStreamId stream_id, bool end_headers) = 0;
 
   // Called when a SETTINGS frame is received.
   // |clear_persisted| True if the respective flag is set on the SETTINGS frame.
@@ -298,8 +311,6 @@
   };
   std::unique_ptr<GoAwayFields> goaway_fields_;
 
-  std::unique_ptr<HeaderCoalescer> coalescer_;
-
   DISALLOW_COPY_AND_ASSIGN(BufferedSpdyFramer);
 };