Index: net/tools/quic/quic_simple_client_stream.h |
diff --git a/net/tools/quic/quic_simple_client_stream.h b/net/tools/quic/quic_simple_client_stream.h |
index 466279a178a35095ed01c83ccdd476001ddfa9ec..b4669a8de74cae12fe0cc2a490b40403c0fad033 100644 |
--- a/net/tools/quic/quic_simple_client_stream.h |
+++ b/net/tools/quic/quic_simple_client_stream.h |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef NET_TOOLS_QUIC_QUIC_SPDY_CLIENT_STREAM_H_ |
-#define NET_TOOLS_QUIC_QUIC_SPDY_CLIENT_STREAM_H_ |
+#ifndef NET_TOOLS_QUIC_QUIC_SIMPLE_CLIENT_STREAM_H_ |
+#define NET_TOOLS_QUIC_QUIC_SIMPLE_CLIENT_STREAM_H_ |
#include <sys/types.h> |
#include <string> |
@@ -11,6 +11,8 @@ |
#include "base/basictypes.h" |
#include "base/strings/string_piece.h" |
#include "net/base/io_buffer.h" |
+#include "net/http/http_request_info.h" |
+#include "net/http/http_response_headers.h" |
#include "net/quic/quic_data_stream.h" |
#include "net/quic/quic_protocol.h" |
#include "net/tools/balsa/balsa_frame.h" |
@@ -20,14 +22,14 @@ namespace net { |
namespace tools { |
-class QuicClientSession; |
+class QuicSimpleClientSession; |
// All this does right now is send an SPDY request, and aggregate the |
// SPDY response. |
-class QuicSpdyClientStream : public QuicDataStream { |
+class QuicSimpleClientStream : public QuicDataStream { |
public: |
- QuicSpdyClientStream(QuicStreamId id, QuicClientSession* session); |
- ~QuicSpdyClientStream() override; |
+ QuicSimpleClientStream(QuicStreamId id, QuicSimpleClientSession* session); |
+ ~QuicSimpleClientStream() override; |
// Override the base class to close the write side as soon as we get a |
// response. |
@@ -45,9 +47,9 @@ class QuicSpdyClientStream : public QuicDataStream { |
// Serializes the headers and body, sends it to the server, and |
// returns the number of bytes sent. |
- ssize_t SendRequest(const BalsaHeaders& headers, |
- base::StringPiece body, |
- bool fin); |
+ size_t SendRequest(const HttpRequestInfo& headers, |
+ base::StringPiece body, |
+ bool fin); |
// Sends body data to the server, or buffers if it can't be sent immediately. |
void SendBody(const std::string& data, bool fin); |
@@ -60,7 +62,7 @@ class QuicSpdyClientStream : public QuicDataStream { |
const std::string& data() { return data_; } |
// Returns whatever headers have been received for this stream. |
- const BalsaHeaders& headers() { return headers_; } |
+ scoped_refptr<HttpResponseHeaders> headers() { return headers_; } |
size_t header_bytes_read() const { return header_bytes_read_; } |
@@ -73,7 +75,7 @@ class QuicSpdyClientStream : public QuicDataStream { |
private: |
int ParseResponseHeaders(); |
- BalsaHeaders headers_; |
+ scoped_refptr<HttpResponseHeaders> headers_; |
std::string data_; |
scoped_refptr<GrowableIOBuffer> read_buf_; |
@@ -81,10 +83,10 @@ class QuicSpdyClientStream : public QuicDataStream { |
size_t header_bytes_read_; |
size_t header_bytes_written_; |
- DISALLOW_COPY_AND_ASSIGN(QuicSpdyClientStream); |
+ DISALLOW_COPY_AND_ASSIGN(QuicSimpleClientStream); |
}; |
} // namespace tools |
} // namespace net |
-#endif // NET_TOOLS_QUIC_QUIC_SPDY_CLIENT_STREAM_H_ |
+#endif // NET_TOOLS_QUIC_QUIC_SIMPLE_CLIENT_STREAM_H_ |