Support delegate deleting itself from OnError

net/socket_stream/socket_stream.cc

 // Copyright (c) 2012 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.
 //
 // TODO(ukai): code is similar with http_network_transaction.cc.  We should
 //   think about ways to share code, if possible.
 
 #include "net/socket_stream/socket_stream.h"
 
 #include <set>
@@ skipping 274 matching lines @@
 
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&SocketStream::DoRestartWithAuth, this));
 }
 
 void SocketStream::DetachDelegate() {
   if (!delegate_)
     return;
   delegate_ = NULL;
+  if (next_state_ == STATE_NONE)
+    return;

[tyoshino (SeeGerritForStatus), 2013/05/27 05:55:36]

what is this change for?

[Adam Rice, 2013/05/27 07:16:33]

Previously, Finish() would set delegate_ to NULL, which would prevent the code
in this function from being executed.

However, if Finish() sets delegate_ to NULL, then it is unable to tell whether
or not the pointer is still valid.

So I am trying to achieve the same effect by checking the value of next_state_,
which should not be STATE_NONE until Finish() is called.

[tyoshino (SeeGerritForStatus), 2013/05/27 08:09:13]

I see. Thanks

   net_log_.AddEvent(NetLog::TYPE_CANCELLED);
   // We don't need to send pending data when client detach the delegate.
   pending_write_bufs_.clear();
   Close();
 }
 
 const ProxyServer& SocketStream::proxy_server() const {
   return proxy_info_.proxy_server();
 }
 
@@ skipping 57 matching lines @@
       "The current MessageLoop must exist";
   DCHECK_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type()) <<
       "The current MessageLoop must be TYPE_IO";
   DCHECK_LE(result, OK);
   if (result == OK)
     result = ERR_CONNECTION_CLOSED;
   DCHECK_EQ(next_state_, STATE_NONE);
   DVLOG(1) << "Finish result=" << ErrorToString(result);
 
   metrics_->OnClose();
-  Delegate* delegate = delegate_;
+
+  if (result != ERR_CONNECTION_CLOSED && delegate_)
+    delegate_->OnError(this, result);
+  if (result != ERR_PROTOCOL_SWITCHED && delegate_)
+    delegate_->OnClose(this);
   delegate_ = NULL;
-  if (delegate) {
-    if (result != ERR_CONNECTION_CLOSED)
-      delegate->OnError(this, result);
-    if (result != ERR_PROTOCOL_SWITCHED)
-      delegate->OnClose(this);
-  }
+
   Release();
 }
 
 int SocketStream::DidEstablishConnection() {
   if (!socket_.get() || !socket_->IsConnected()) {
     next_state_ = STATE_CLOSE;
     return ERR_CONNECTION_FAILED;
   }
   next_state_ = STATE_READ_WRITE;
   metrics_->OnConnected();
@@ skipping 931 matching lines @@
 
 SSLConfigService* SocketStream::ssl_config_service() const {
   return context_->ssl_config_service();
 }
 
 ProxyService* SocketStream::proxy_service() const {
   return context_->proxy_service();
 }
 
 }  // namespace net