Land Recent QUIC changes

net/tools/quic/test_tools/quic_test_utils.h

Index: net/tools/quic/test_tools/quic_test_utils.h
diff --git a/net/tools/quic/test_tools/quic_test_utils.h b/net/tools/quic/test_tools/quic_test_utils.h
index 8af1f4545abdd050a27b0aa7224ea452ef17370a..e4069c5878d8e4f2e7bb6e691a4ed4b501196028 100644
--- a/net/tools/quic/test_tools/quic_test_utils.h
+++ b/net/tools/quic/test_tools/quic_test_utils.h
@@ -2,12 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/quic/quic_connection.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_
 
+#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"
+
 namespace net {
 
 class EpollServer;
@@ -16,6 +21,8 @@ class IPEndPoint;
 namespace tools {
 namespace test {
 
+std::string SerializeUncompressedHeaders(const SpdyHeaderBlock& headers);
+
 class MockConnection : public QuicConnection {
  public:
   // Uses a QuicConnectionHelper created with fd and eps.
@@ -65,6 +72,17 @@ class MockConnection : public QuicConnection {
   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