Remove net::BidirectionalStream::Cancel

net/quic/chromium/bidirectional_stream_quic_impl.cc

 // Copyright 2016 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/quic/chromium/bidirectional_stream_quic_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 24 matching lines @@
       has_sent_headers_(false),
       has_received_headers_(false),
       send_request_headers_automatically_(true),
       waiting_for_confirmation_(false),
       weak_factory_(this) {
   DCHECK(session_);
   session_->AddObserver(this);
 }
 
 BidirectionalStreamQuicImpl::~BidirectionalStreamQuicImpl() {
-  Cancel();
+  if (stream_) {
+    delegate_ = nullptr;
+    stream_->Reset(QUIC_STREAM_CANCELLED);
+  }
+
   if (session_)
     session_->RemoveObserver(this);
 }
 
 void BidirectionalStreamQuicImpl::Start(
     const BidirectionalStreamRequestInfo* request_info,
     const BoundNetLog& net_log,
     bool send_request_headers_automatically,
     BidirectionalStreamImpl::Delegate* delegate,
     std::unique_ptr<base::Timer> /* timer */) {
@@ skipping 132 matching lines @@
                  weak_factory_.GetWeakPtr()));
 
   DCHECK(rv == OK || rv == ERR_IO_PENDING);
   if (rv == OK) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(&BidirectionalStreamQuicImpl::OnSendDataComplete,
                               weak_factory_.GetWeakPtr(), OK));
   }
 }
 
-void BidirectionalStreamQuicImpl::Cancel() {
-  if (delegate_) {
-    delegate_ = nullptr;
-    // Cancel any pending callbacks.
-    weak_factory_.InvalidateWeakPtrs();
-  }
-  if (stream_) {
-    stream_->Reset(QUIC_STREAM_CANCELLED);
-    ResetStream();
-  }
-}
-
 NextProto BidirectionalStreamQuicImpl::GetProtocol() const {
   return negotiated_protocol_;
 }
 
 int64_t BidirectionalStreamQuicImpl::GetTotalReceivedBytes() const {
   if (stream_)
     return headers_bytes_received_ + stream_->stream_bytes_read();
   return headers_bytes_received_ + closed_stream_received_bytes_;
 }
 
@@ skipping 127 matching lines @@
 void BidirectionalStreamQuicImpl::ResetStream() {
   if (!stream_)
     return;
   closed_stream_received_bytes_ = stream_->stream_bytes_read();
   closed_stream_sent_bytes_ = stream_->stream_bytes_written();
   stream_->SetDelegate(nullptr);
   stream_ = nullptr;
 }
 
 }  // namespace net