Land Recent QUIC changes.

net/quic/test_tools/quic_test_utils.h

Index: net/quic/test_tools/quic_test_utils.h
diff --git a/net/quic/test_tools/quic_test_utils.h b/net/quic/test_tools/quic_test_utils.h
index 5ea2a787146a7139550428eef0f36acbb6ffdc4f..8fbf05445d86c603287525b4c683ffbed338536e 100644
--- a/net/quic/test_tools/quic_test_utils.h
+++ b/net/quic/test_tools/quic_test_utils.h
@@ -295,7 +295,9 @@ class MockSession : public QuicSession {
 
 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,
@@ -351,11 +353,14 @@ class TestDecompressorVisitor : public QuicSpdyDecompressor::Visitor {
  public:
   virtual ~TestDecompressorVisitor() {}
   virtual bool OnDecompressedData(base::StringPiece data) OVERRIDE;
+  virtual void OnDecompressionError() OVERRIDE;
 
   string data() { return data_; }
+  bool error() { return error_; }
 
  private:
   string data_;
+  bool error_;
 };
 
 }  // namespace test