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 fd69a1d1ac7495066c965a6142eebed8779ea2c9..68f4de4be72366c60e5eb6ea578411293c61a2d7 100644
--- a/net/tools/quic/test_tools/quic_test_utils.h
+++ b/net/tools/quic/test_tools/quic_test_utils.h
@@ -75,16 +75,21 @@ class TestDecompressorVisitor : public QuicSpdyDecompressor::Visitor {
  public:
   virtual ~TestDecompressorVisitor() {}
   virtual bool OnDecompressedData(base::StringPiece data) OVERRIDE;
+  virtual void OnDecompressionError() OVERRIDE;
 
   std::string data() { return data_; }
+  bool error() { return error_; }
 
  private:
   std::string data_;
+  bool error_;
 };
 
 class TestSession : public QuicSession {
  public:
-  TestSession(QuicConnection* connection, bool is_server);
+  TestSession(QuicConnection* connection,
+              const QuicConfig& config,
+              bool is_server);
   virtual ~TestSession();
 
   MOCK_METHOD1(CreateIncomingReliableStream,