Refactor SpdyHttpStream to implement HttpStream. Required adding a new...

net/spdy/spdy_network_transaction.cc

 // Copyright (c) 2009 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.
 
 #include "net/spdy/spdy_network_transaction.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/stats_counters.h"
@@ skipping 236 matching lines @@
 int SpdyNetworkTransaction::DoGetStream() {
   next_state_ = STATE_GET_STREAM_COMPLETE;
 
   // It is possible that the spdy session was shut down while it was
   // asynchronously waiting to connect.
   if (spdy_->IsClosed())
     return ERR_CONNECTION_CLOSED;
 
   CHECK(!stream_.get());
 
-  stream_.reset(new SpdyHttpStream());
-  return stream_->InitializeStream(spdy_, *request_,
-                                   net_log_, &io_callback_);
+  stream_.reset(new SpdyHttpStream(spdy_));
+  return stream_->InitializeStream(request_, net_log_, &io_callback_);
 }
 
 int SpdyNetworkTransaction::DoGetStreamComplete(int result) {
   if (result < 0) {
     return result;
   }
 
   next_state_ = STATE_SEND_REQUEST;
   return OK;
 }
 
 int SpdyNetworkTransaction::DoSendRequest() {
   next_state_ = STATE_SEND_REQUEST_COMPLETE;
 
   UploadDataStream* upload_data_stream = NULL;
   if (request_->upload_data) {
     int error_code;
     upload_data_stream = UploadDataStream::Create(request_->upload_data,
                                                   &error_code);
     if (!upload_data_stream)
       return error_code;
   }
-  stream_->InitializeRequest(base::Time::Now(), upload_data_stream);
   spdy_ = NULL;
 
-  return stream_->SendRequest(&response_, &io_callback_);
+  return stream_->SendRequest("",
+                              upload_data_stream,
+                              &response_,
+                              &io_callback_);
 }
 
 int SpdyNetworkTransaction::DoSendRequestComplete(int result) {
   if (result < 0) {
     stream_.reset();
     return result;
   }
 
   next_state_ = STATE_READ_HEADERS;
   return OK;
@@ skipping 20 matching lines @@
   user_buffer_ = NULL;
   user_buffer_len_ = 0;
 
   if (result <= 0)
     stream_.reset();
 
   return result;
 }
 
 }  // namespace net