Land Recent QUIC changes.

net/quic/test_tools/quic_test_utils.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Common utilities for Quic tests
 
 #ifndef NET_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_
 #define NET_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_
 
 #include <string>
@@ skipping 277 matching lines @@
                                            QuicStreamOffset offset,
                                            bool fin));
   MOCK_METHOD0(IsHandshakeComplete, bool());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSession);
 };
 
 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,
                ReliableQuicStream*(QuicStreamId id));
   MOCK_METHOD0(CreateOutgoingReliableStream, ReliableQuicStream*());
 
   void SetCryptoStream(QuicCryptoStream* stream);
 
   virtual QuicCryptoStream* GetCryptoStream();
 
@@ skipping 35 matching lines @@
   virtual ~TestEntropyCalculator() { }
 
   virtual QuicPacketEntropyHash ReceivedEntropyHash(
       QuicPacketSequenceNumber sequence_number) const OVERRIDE;
 };
 
 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
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_