Land Recent QUIC changes

net/quic/test_tools/quic_test_utils.cc

Index: net/quic/test_tools/quic_test_utils.cc
diff --git a/net/quic/test_tools/quic_test_utils.cc b/net/quic/test_tools/quic_test_utils.cc
index 07d1f20a7fc9bc887dbd3f297108c99d0b34cde2..cd8375680b863c1f3e2f06b5710e7169042d022d 100644
--- a/net/quic/test_tools/quic_test_utils.cc
+++ b/net/quic/test_tools/quic_test_utils.cc
@@ -5,6 +5,7 @@
 #include "net/quic/test_tools/quic_test_utils.h"
 
 #include "base/stl_util.h"
+#include "base/strings/string_piece.h"
 #include "net/quic/crypto/crypto_framer.h"
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/crypto/crypto_utils.h"
@@ -13,7 +14,9 @@
 #include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/quic_framer.h"
 #include "net/quic/quic_packet_creator.h"
+#include "net/spdy/spdy_frame_builder.h"
 
+using base::StringPiece;
 using std::max;
 using std::min;
 using std::string;
@@ -376,5 +379,10 @@ QuicPacketEntropyHash TestEntropyCalculator::ReceivedEntropyHash(
   return 1u;
 }
 
+bool TestDecompressorVisitor::OnDecompressedData(StringPiece data) {
+  data.AppendToString(&data_);
+  return true;
+}
+
 }  // namespace test
 }  // namespace net