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

net/spdy/buffered_spdy_framer.cc

 // Copyright (c) 2012 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/spdy/buffered_spdy_framer.h"
 
 #include "base/logging.h"
-#include "base/strings/string_util.h"
 
 namespace net {
 
 namespace {
 
 // GOAWAY frame debug data is only buffered up to this many bytes.
 size_t kGoAwayDebugDataMaxSize = 1024;
 
 // Initial and maximum sizes for header block buffer.
 size_t kHeaderBufferInitialSize = 8 * 1024;
@@ skipping 185 matching lines @@
 void BufferedSpdyFramer::OnStreamEnd(SpdyStreamId stream_id) {
   visitor_->OnStreamEnd(stream_id);
 }
 
 void BufferedSpdyFramer::OnStreamPadding(SpdyStreamId stream_id, size_t len) {
   visitor_->OnStreamPadding(stream_id, len);
 }
 
 SpdyHeadersHandlerInterface* BufferedSpdyFramer::OnHeaderFrameStart(
     SpdyStreamId stream_id) {
-  coalescer_.reset(new HeaderCoalescer());
-  return coalescer_.get();
+  return visitor_->OnHeaderFrameStart(stream_id);
 }
 
 void BufferedSpdyFramer::OnHeaderFrameEnd(SpdyStreamId stream_id,
                                           bool end_headers) {
-  if (coalescer_->error_seen()) {
-    visitor_->OnStreamError(stream_id,
-                            "Could not parse Spdy Control Frame Header.");
-    return;
-  }
-  DCHECK(control_frame_fields_.get());
-  switch (control_frame_fields_->type) {
-    case SYN_STREAM:
-      visitor_->OnSynStream(
-          control_frame_fields_->stream_id,
-          control_frame_fields_->associated_stream_id,
-          control_frame_fields_->priority, control_frame_fields_->fin,
-          control_frame_fields_->unidirectional, coalescer_->headers());
-      break;
-    case SYN_REPLY:
-      visitor_->OnSynReply(control_frame_fields_->stream_id,
-                           control_frame_fields_->fin, coalescer_->headers());
-      break;
-    case HEADERS:
-      visitor_->OnHeaders(control_frame_fields_->stream_id,
-                          control_frame_fields_->has_priority,
-                          control_frame_fields_->priority,
-                          control_frame_fields_->parent_stream_id,
-                          control_frame_fields_->exclusive,
-                          control_frame_fields_->fin, coalescer_->headers());
-      break;
-    case PUSH_PROMISE:
-      DCHECK_LT(SPDY3, protocol_version());
-      visitor_->OnPushPromise(control_frame_fields_->stream_id,
-                              control_frame_fields_->promised_stream_id,
-                              coalescer_->headers());
-      break;
-    default:
-      DCHECK(false) << "Unexpect control frame type: "
-                    << control_frame_fields_->type;
-      break;
-  }
-  control_frame_fields_.reset(NULL);
+  visitor_->OnHeaderFrameEnd(stream_id, end_headers);
 }
 
 void BufferedSpdyFramer::OnSettings(bool clear_persisted) {
   visitor_->OnSettings(clear_persisted);
 }
 
 void BufferedSpdyFramer::OnSetting(SpdySettingsIds id,
                                    uint8_t flags,
                                    uint32_t value) {
   visitor_->OnSetting(id, flags, value);
@@ skipping 220 matching lines @@
 }
 
 void BufferedSpdyFramer::InitHeaderStreaming(SpdyStreamId stream_id) {
   header_buffer_.clear();
   header_buffer_valid_ = true;
   header_stream_id_ = stream_id;
   DCHECK_NE(header_stream_id_, SpdyFramer::kInvalidStream);
 }
 
 }  // namespace net