I've refactored HttpStream, SpdyHttpStream and HttpBasicStream so that

SpdyHttpStream now implements (a slightly wider) HttpStream interface.

BUG=50268
TEST=none

Review URL: http://codereview.chromium.org/3079002


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54154 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 7 deletions

diff --git a/net/http/http_basic_stream.cc b/net/http/http_basic_stream.cc
index 8303357..5ffa829 100644
--- a/net/http/http_basic_stream.cc
+++ b/net/http/http_basic_stream.cc
@@ -6,19 +6,27 @@
 
 namespace net {
 
-HttpBasicStream::HttpBasicStream(ClientSocketHandle* handle,
-                                 const BoundNetLog& net_log)
+HttpBasicStream::HttpBasicStream(ClientSocketHandle* connection)
     : read_buf_(new GrowableIOBuffer()),
-      parser_(new HttpStreamParser(handle, read_buf_, net_log)) {
+      connection_(connection) {
 }
 
-int HttpBasicStream::SendRequest(const HttpRequestInfo* request,
-                                 const std::string& headers,
+int HttpBasicStream::InitializeStream(const HttpRequestInfo* request_info,
+                                      const BoundNetLog& net_log,
+                                      CompletionCallback* callback) {
+  parser_.reset(new HttpStreamParser(connection_, request_info,
+                                     read_buf_, net_log));
+  connection_ = NULL;
+  return OK;
+}
+
+
+int HttpBasicStream::SendRequest(const std::string& headers,
                                  UploadDataStream* request_body,
                                  HttpResponseInfo* response,
                                  CompletionCallback* callback) {
-  return parser_->SendRequest(
-      request, headers, request_body, response, callback);
+  DCHECK(parser_.get());
+  return parser_->SendRequest(headers, request_body, response, callback);
 }
 
 HttpBasicStream::~HttpBasicStream() {}