Revert 198736 "Land Recent QUIC changes"

trunk/src/net/tools/quic/test_tools/quic_test_utils.h

Index: trunk/src/net/tools/quic/test_tools/quic_test_utils.h
===================================================================
--- trunk/src/net/tools/quic/test_tools/quic_test_utils.h	(revision 198763)
+++ trunk/src/net/tools/quic/test_tools/quic_test_utils.h	(working copy)
@@ -2,17 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_
-#define NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_
-
-#include <string>
-
-#include "base/strings/string_piece.h"
 #include "net/quic/quic_connection.h"
-#include "net/quic/quic_spdy_decompressor.h"
-#include "net/spdy/spdy_framer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
+#ifndef NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_
+#define NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_
+
 namespace net {
 
 class EpollServer;
@@ -21,8 +16,6 @@
 namespace tools {
 namespace test {
 
-std::string SerializeUncompressedHeaders(const SpdyHeaderBlock& headers);
-
 class MockConnection : public QuicConnection {
  public:
   // Uses a QuicConnectionHelper created with fd and eps.
@@ -72,17 +65,6 @@
   DISALLOW_COPY_AND_ASSIGN(MockConnection);
 };
 
-class TestDecompressorVisitor : public QuicSpdyDecompressor::Visitor {
- public:
-  virtual ~TestDecompressorVisitor() {}
-  virtual bool OnDecompressedData(base::StringPiece data) OVERRIDE;
-
-  std::string data() { return data_; }
-
- private:
-  std::string data_;
-};
-
 }  // namespace test
 }  // namespace tools
 }  // namespace net