SPDY: Fix DeleteStream() being called twice and CloseStream() reporting a wrong stream number.

net/spdy/spdy_stream.cc

 // Copyright (c) 2010 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_stream.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/singleton.h"
 #include "net/spdy/spdy_session.h"
@@ skipping 14 matching lines @@
       response_complete_(false),
       io_state_(STATE_NONE),
       response_status_(OK),
       cancelled_(false),
       send_bytes_(0),
       recv_bytes_(0),
       histograms_recorded_(false) {}
 
 SpdyStream::~SpdyStream() {
   DLOG(INFO) << "Deleting SpdyStream for stream " << stream_id_;
-
-  // When the stream_id_ is 0, we expect that it is because
-  // we've cancelled or closed the stream and set the stream_id to 0.
-  if (!stream_id_)
-    DCHECK(response_complete_);
 }
 
 void SpdyStream::SetDelegate(Delegate* delegate) {
   CHECK(delegate);
   delegate_ = delegate;
 
   if (!response_->empty()) {
     // The stream already got response.
     delegate_->OnResponseReceived(*response_, response_time_, OK);
   }
 
   std::vector<scoped_refptr<IOBufferWithSize> > buffers;
   buffers.swap(pending_buffers_);
   for (size_t i = 0; i < buffers.size(); ++i) {
     if (delegate_)
       delegate_->OnDataReceived(buffers[i]->data(), buffers[i]->size());
   }
 }
 
 void SpdyStream::DetachDelegate() {
   delegate_ = NULL;
-  if (!cancelled())
+  if (!response_complete_ && !cancelled())
     Cancel();
 }
 
 const linked_ptr<spdy::SpdyHeaderBlock>& SpdyStream::spdy_headers() const {
   return request_;
 }
 
 void SpdyStream::set_spdy_headers(
     const linked_ptr<spdy::SpdyHeaderBlock>& headers) {
   request_ = headers;
@@ skipping 135 matching lines @@
 
   if (status > 0)
     send_bytes_ += status;
 
   DoLoop(status);
 }
 
 void SpdyStream::OnClose(int status) {
   response_complete_ = true;
   response_status_ = status;
-  stream_id_ = 0;
   Delegate* delegate = delegate_;
   delegate_ = NULL;
   if (delegate)
     delegate->OnClose(status);
 }
 
 void SpdyStream::Cancel() {
   cancelled_ = true;
   session_->CloseStream(stream_id_, ERR_ABORTED);
 }
@@ skipping 220 matching lines @@
   UMA_HISTOGRAM_TIMES("Net.SpdyStreamDownloadTime",
       recv_last_byte_time_ - recv_first_byte_time_);
   UMA_HISTOGRAM_TIMES("Net.SpdyStreamTime",
       recv_last_byte_time_ - send_time_);
 
   UMA_HISTOGRAM_COUNTS("Net.SpdySendBytes", send_bytes_);
   UMA_HISTOGRAM_COUNTS("Net.SpdyRecvBytes", recv_bytes_);
 }
 
 }  // namespace net