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

net/spdy/mock_spdy_framer_visitor.h

 // Copyright 2014 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.
 
 #ifndef NET_SPDY_MOCK_SPDY_FRAMER_VISITOR_H_
 #define NET_SPDY_MOCK_SPDY_FRAMER_VISITOR_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/strings/string_piece.h"
 #include "net/spdy/spdy_framer.h"
-#include "net/spdy/spdy_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace net {
 
 namespace test {
 
 class MockSpdyFramerVisitor : public SpdyFramerVisitorInterface {
  public:
   MockSpdyFramerVisitor();
   virtual ~MockSpdyFramerVisitor();
@@ skipping 45 matching lines @@
                void(SpdyStreamId stream_id,
                     base::StringPiece origin,
                     const SpdyAltSvcWireFormat::AlternativeServiceVector&
                         altsvc_vector));
   MOCK_METHOD4(OnPriority,
                void(SpdyStreamId stream_id,
                     SpdyStreamId parent_stream_id,
                     uint8_t weight,
                     bool exclusive));
   MOCK_METHOD2(OnUnknownFrame, bool(SpdyStreamId stream_id, int frame_type));
-
-  void DelegateNewHeaderHandling() {
-    ON_CALL(*this, OnHeaderFrameStart(testing::_))
-        .WillByDefault(testing::Invoke(
-            this, &MockSpdyFramerVisitor::ReturnTestHeadersHandler));
-    ON_CALL(*this, OnHeaderFrameEnd(testing::_, testing::_))
-        .WillByDefault(testing::Invoke(
-            this, &MockSpdyFramerVisitor::ResetTestHeadersHandler));
-  }
-
-  SpdyHeadersHandlerInterface* ReturnTestHeadersHandler(
-      SpdyStreamId /* stream_id */) {
-    if (headers_handler_ == nullptr) {
-      headers_handler_.reset(new TestHeadersHandler);
-    }
-    return headers_handler_.get();
-  }
-
-  void ResetTestHeadersHandler(SpdyStreamId /* stream_id */, bool end) {
-    if (end) {
-      headers_handler_.reset();
-    }
-  }
-
-  std::unique_ptr<SpdyHeadersHandlerInterface> headers_handler_;
 };
 
 }  // namespace test
 
 }  // namespace net
 
 #endif  // NET_SPDY_MOCK_SPDY_FRAMER_VISITOR_H_