Landing Recent QUIC changes until Sat Oct 29 14:59:35.

net/tools/quic/test_tools/quic_test_client.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.
 
 #ifndef NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_
 #define NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 123 matching lines @@
   std::string SendSynchronousRequest(const std::string& uri);
   void Connect();
   void ResetConnection();
   void Disconnect();
   IPEndPoint local_address() const;
   void ClearPerRequestState();
   bool WaitUntil(int timeout_ms, std::function<bool()> trigger);
   ssize_t Send(const void* buffer, size_t size);
   bool response_complete() const;
   bool response_headers_complete() const;
-  const BalsaHeaders* response_headers() const;
+  const SpdyHeaderBlock* response_headers() const;
   int64_t response_size() const;
-  int response_header_size() const;
   int64_t response_body_size() const;
   size_t bytes_read() const;
   size_t bytes_written() const;
   bool buffer_body() const;
   void set_buffer_body(bool buffer_body);
   const std::string& response_body();
   bool connected() const;
 
   // Returns once a complete response or a connection close has been received
   // from the server.
@@ skipping 134 matching lines @@
   bool HaveActiveStream();
 
   EpollServer epoll_server_;
   std::unique_ptr<MockableQuicClient> client_;  // The actual client
   QuicSpdyClientStream* stream_;
 
   QuicRstStreamErrorCode stream_error_;
 
   bool response_complete_;
   bool response_headers_complete_;
-  mutable BalsaHeaders response_headers_;
+  mutable SpdyHeaderBlock response_headers_;
 
   // Parsed response trailers (if present), copied from the stream in OnClose.
   SpdyHeaderBlock response_trailers_;
 
   SpdyPriority priority_;
   std::string response_;
   // bytes_read_ and bytes_written_ are updated only when stream_ is released;
   // prefer bytes_read() and bytes_written() member functions.
   uint64_t bytes_read_;
   uint64_t bytes_written_;
-  // The number of uncompressed HTTP header bytes received.
-  int response_header_size_;
   // The number of HTTP body bytes received.
   int64_t response_body_size_;
   // True if we tried to connect already since the last call to Disconnect().
   bool connect_attempted_;
   // The client will auto-connect exactly once before sending data.  If
   // something causes a connection reset, it will not automatically reconnect
   // unless auto_reconnect_ is true.
   bool auto_reconnect_;
   // Should we buffer the response body? Defaults to true.
   bool buffer_body_;
@@ skipping 13 matching lines @@
   std::string override_sni_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicTestClient);
 };
 
 }  // namespace test
 
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_