Fixed bug where streams do not shutdown properly after the user callback deletes the stream.

Added a unit test.

TEST=net_unittests
BUG=46925

Merge branch 'trunk' of http://src.chromium.org/git/chromium into ukai_delegate_fix

Revert "Revert 50215 because of crashes - Refactor SpdyStream to get HTTP specific out of the interface and members."

This reverts commit 8f9bf3b9ba6663aeef7fbdab3edf16aeaa510f84.

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

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

2 files changed, 28 insertions, 12 deletions

diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index c2c7cbe..d65a892 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -463,10 +463,10 @@ int HttpNetworkTransaction::Read(IOBuffer* buf, int buf_len,
   // Are we using SPDY or HTTP?
   if (using_spdy_) {
     DCHECK(!http_stream_.get());
-    DCHECK(spdy_stream_->GetResponseInfo()->headers);
+    DCHECK(spdy_http_stream_->GetResponseInfo()->headers);
     next_state = STATE_SPDY_READ_BODY;
   } else {
-    DCHECK(!spdy_stream_.get());
+    DCHECK(!spdy_http_stream_.get());
     next_state = STATE_READ_BODY;
 
     if (!connection_->is_initialized())
@@ -549,8 +549,8 @@ HttpNetworkTransaction::~HttpNetworkTransaction() {
   if (pac_request_)
     session_->proxy_service()->CancelPacRequest(pac_request_);
 
-  if (spdy_stream_.get())
-    spdy_stream_->Cancel();
+  if (spdy_http_stream_.get())
+    spdy_http_stream_->Cancel();
 }
 
 void HttpNetworkTransaction::DoCallback(int rv) {
@@ -1470,7 +1470,7 @@ int HttpNetworkTransaction::DoDrainBodyForAuthRestartComplete(int result) {
 
 int HttpNetworkTransaction::DoSpdySendRequest() {
   next_state_ = STATE_SPDY_SEND_REQUEST_COMPLETE;
-  CHECK(!spdy_stream_.get());
+  CHECK(!spdy_http_stream_.get());
 
   // First we get a SPDY session.  Theoretically, we've just negotiated one, but
   // if one already exists, then screw it, use the existing one!  Otherwise,
@@ -1503,9 +1503,25 @@ int HttpNetworkTransaction::DoSpdySendRequest() {
       return error_code;
   }
   headers_valid_ = false;
-  spdy_stream_ = spdy_session->GetOrCreateStream(
-      *request_, upload_data, net_log_);
-  return spdy_stream_->SendRequest(upload_data, &response_, &io_callback_);
+  scoped_refptr<SpdyStream> spdy_stream;
+  if (request_->method == "GET")
+    spdy_stream = spdy_session->GetPushStream(request_->url, net_log_);
+  if (spdy_stream.get()) {
+    DCHECK(spdy_stream->pushed());
+    CHECK(spdy_stream->GetDelegate() == NULL);
+    spdy_http_stream_.reset(new SpdyHttpStream(spdy_stream));
+    spdy_http_stream_->InitializeRequest(*request_, base::Time::Now(), NULL);
+  } else {
+    spdy_stream = spdy_session->CreateStream(request_->url,
+                                             request_->priority,
+                                             net_log_);
+    DCHECK(!spdy_stream->pushed());
+    CHECK(spdy_stream->GetDelegate() == NULL);
+    spdy_http_stream_.reset(new SpdyHttpStream(spdy_stream));
+    spdy_http_stream_->InitializeRequest(
+        *request_, base::Time::Now(), upload_data);
+  }
+  return spdy_http_stream_->SendRequest(&response_, &io_callback_);
 }
 
 int HttpNetworkTransaction::DoSpdySendRequestComplete(int result) {
@@ -1518,7 +1534,7 @@ int HttpNetworkTransaction::DoSpdySendRequestComplete(int result) {
 
 int HttpNetworkTransaction::DoSpdyReadHeaders() {
   next_state_ = STATE_SPDY_READ_HEADERS_COMPLETE;
-  return spdy_stream_->ReadResponseHeaders(&io_callback_);
+  return spdy_http_stream_->ReadResponseHeaders(&io_callback_);
 }
 
 int HttpNetworkTransaction::DoSpdyReadHeadersComplete(int result) {
@@ -1534,7 +1550,7 @@ int HttpNetworkTransaction::DoSpdyReadHeadersComplete(int result) {
 int HttpNetworkTransaction::DoSpdyReadBody() {
   next_state_ = STATE_SPDY_READ_BODY_COMPLETE;
 
-  return spdy_stream_->ReadResponseBody(
+  return spdy_http_stream_->ReadResponseBody(
       read_buf_, read_buf_len_, &io_callback_);
 }
 
@@ -1543,7 +1559,7 @@ int HttpNetworkTransaction::DoSpdyReadBodyComplete(int result) {
   read_buf_len_ = 0;
 
   if (result <= 0)
-    spdy_stream_ = NULL;
+    spdy_http_stream_.reset() ;
 
   return result;
 }
diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h
index f02deb4..a59f908 100644
--- a/net/http/http_network_transaction.h
+++ b/net/http/http_network_transaction.h
@@ -279,7 +279,7 @@ class HttpNetworkTransaction : public HttpTransaction {
 
   scoped_ptr<ClientSocketHandle> connection_;
   scoped_ptr<HttpStream> http_stream_;
-  scoped_refptr<SpdyHttpStream> spdy_stream_;
+  scoped_ptr<SpdyHttpStream> spdy_http_stream_;
   bool reused_socket_;
 
   // True if we've validated the headers that the stream parser has returned.