Land Recent QUIC Changes

net/tools/quic/quic_spdy_server_stream.h

Index: net/tools/quic/quic_spdy_server_stream.h
diff --git a/net/tools/quic/quic_spdy_server_stream.h b/net/tools/quic/quic_spdy_server_stream.h
index 6fa1114342a08b2e3aa73cfcd95b3f742b010b90..71ffb7d3ea1ce88214461c2bc095423f47b2a600 100644
--- a/net/tools/quic/quic_spdy_server_stream.h
+++ b/net/tools/quic/quic_spdy_server_stream.h
@@ -8,10 +8,9 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "net/base/io_buffer.h"
 #include "net/quic/quic_data_stream.h"
 #include "net/quic/quic_protocol.h"
-#include "net/tools/balsa/balsa_headers.h"
+#include "net/spdy/spdy_framer.h"
 
 namespace net {
 
@@ -35,11 +34,13 @@ class QuicSpdyServerStream : public QuicDataStream {
   uint32 ProcessData(const char* data, uint32 data_len) override;
   void OnFinRead() override;
 
-  void ParseRequestHeaders();
-
  private:
   friend class test::QuicSpdyServerStreamPeer;
 
+  // Parses the request headers from |data| to |request_headers_|.
+  // Returns false if there was an error parsing the headers.
+  bool ParseRequestHeaders(const char* data, uint32 data_len);
+
   // Sends a basic 200 response using SendHeaders for the headers and WriteData
   // for the body.
   void SendResponse();
@@ -48,16 +49,14 @@ class QuicSpdyServerStream : public QuicDataStream {
   // for the body
   void SendErrorResponse();
 
-  void SendHeadersAndBody(const BalsaHeaders& response_headers,
+  void SendHeadersAndBody(const SpdyHeaderBlock& response_headers,
                           base::StringPiece body);
 
-  BalsaHeaders headers_;
+  // The parsed headers received from the client.
+  SpdyHeaderBlock request_headers_;
+  int content_length_;
   std::string body_;
 
-  // Buffer into which response header data is read.
-  scoped_refptr<GrowableIOBuffer> read_buf_;
-  bool request_headers_received_;
-
   DISALLOW_COPY_AND_ASSIGN(QuicSpdyServerStream);
 };