base::Bind: Convert StreamSocket::Connect.

jingle/notifier/base/proxy_resolving_client_socket.cc

 // Copyright (c) 2011 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 "jingle/notifier/base/proxy_resolving_client_socket.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 19 matching lines @@
                             &ProxyResolvingClientSocket::ProcessConnectDone),
           ssl_config_(ssl_config),
           pac_request_(NULL),
           dest_host_port_pair_(dest_host_port_pair),
           tried_direct_connect_fallback_(false),
           bound_net_log_(
               net::BoundNetLog::Make(
                   request_context_getter->GetURLRequestContext()->net_log(),
                   net::NetLog::SOURCE_SOCKET)),
           ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
-          user_connect_callback_(NULL) {
+          old_user_connect_callback_(NULL) {
   DCHECK(request_context_getter);
   net::URLRequestContext* request_context =
       request_context_getter->GetURLRequestContext();
   DCHECK(request_context);
   net::HttpNetworkSession::Params session_params;
   session_params.client_socket_factory = socket_factory;
   session_params.host_resolver = request_context->host_resolver();
   session_params.cert_verifier = request_context->cert_verifier();
   // TODO(rkn): This is NULL because OriginBoundCertService is not thread safe.
   session_params.origin_bound_cert_service = NULL;
@@ skipping 39 matching lines @@
 }
 
 bool ProxyResolvingClientSocket::SetSendBufferSize(int32 size) {
   if (transport_.get() && transport_->socket())
     return transport_->socket()->SetSendBufferSize(size);
   NOTREACHED();
   return false;
 }
 
 int ProxyResolvingClientSocket::Connect(net::OldCompletionCallback* callback) {
-  DCHECK(!user_connect_callback_);
+  DCHECK(!old_user_connect_callback_);

[csilv, 2011/12/06 21:03:18]

Perhaps this DCHECK should be the same as the one on line 128?

[James Hawkins, 2011/12/06 22:19:30]

Done.

 
   tried_direct_connect_fallback_ = false;
 
+  // First we try and resolve the proxy.
+  GURL url("http://" + dest_host_port_pair_.ToString());
+  int status = network_session_->proxy_service()->ResolveProxy(
+      url,
+      &proxy_info_,
+      &proxy_resolve_callback_,
+      &pac_request_,
+      bound_net_log_);
+  if (status != net::ERR_IO_PENDING) {
+    // We defer execution of ProcessProxyResolveDone instead of calling it
+    // directly here for simplicity. From the caller's point of view,
+    // the connect always happens asynchronously.
+    MessageLoop* message_loop = MessageLoop::current();
+    CHECK(message_loop);
+    message_loop->PostTask(
+        FROM_HERE,
+        base::Bind(&ProxyResolvingClientSocket::ProcessProxyResolveDone,
+                   weak_factory_.GetWeakPtr(), status));
+  }
+  old_user_connect_callback_ = callback;
+  return net::ERR_IO_PENDING;
+}
+int ProxyResolvingClientSocket::Connect(
+    const net::CompletionCallback& callback) {
+  DCHECK(!old_user_connect_callback_ && user_connect_callback_.is_null());
+
+  tried_direct_connect_fallback_ = false;
+
   // First we try and resolve the proxy.
   GURL url("http://" + dest_host_port_pair_.ToString());
   int status = network_session_->proxy_service()->ResolveProxy(
       url,
       &proxy_info_,
       &proxy_resolve_callback_,
       &pac_request_,
       bound_net_log_);
   if (status != net::ERR_IO_PENDING) {
     // We defer execution of ProcessProxyResolveDone instead of calling it
     // directly here for simplicity. From the caller's point of view,
     // the connect always happens asynchronously.
     MessageLoop* message_loop = MessageLoop::current();
     CHECK(message_loop);
     message_loop->PostTask(
         FROM_HERE,
         base::Bind(&ProxyResolvingClientSocket::ProcessProxyResolveDone,
                    weak_factory_.GetWeakPtr(), status));
   }
   user_connect_callback_ = callback;
   return net::ERR_IO_PENDING;
 }
 
 void ProxyResolvingClientSocket::RunUserConnectCallback(int status) {
   DCHECK_LE(status, net::OK);
-  net::OldCompletionCallback* user_connect_callback = user_connect_callback_;
-  user_connect_callback_ = NULL;
-  user_connect_callback->Run(status);
+  if (old_user_connect_callback_) {
+    net::OldCompletionCallback* user_connect_callback =
+        old_user_connect_callback_;
+    old_user_connect_callback_ = NULL;
+    user_connect_callback->Run(status);
+  } else {
+    net::CompletionCallback user_connect_callback = user_connect_callback_;
+    user_connect_callback_.Reset();
+    user_connect_callback.Run(status);
+  }
 }
 
 // Always runs asynchronously.
 void ProxyResolvingClientSocket::ProcessProxyResolveDone(int status) {
   pac_request_ = NULL;
 
   DCHECK_NE(status, net::ERR_IO_PENDING);
   if (status == net::OK) {
     // Remove unsupported proxies from the list.
     proxy_info_.RemoveProxiesWithoutScheme(
@@ skipping 138 matching lines @@
 }
 
 void ProxyResolvingClientSocket::ReportSuccessfulProxyConnection() {
   network_session_->proxy_service()->ReportSuccess(proxy_info_);
 }
 
 void ProxyResolvingClientSocket::Disconnect() {
   CloseTransportSocket();
   if (pac_request_)
     network_session_->proxy_service()->CancelPacRequest(pac_request_);
-  user_connect_callback_ = NULL;
+  old_user_connect_callback_ = NULL;
+  user_connect_callback_.Reset();
 }
 
 bool ProxyResolvingClientSocket::IsConnected() const {
   if (!transport_.get() || !transport_->socket())
     return false;
   return transport_->socket()->IsConnected();
 }
 
 bool ProxyResolvingClientSocket::IsConnectedAndIdle() const {
   if (!transport_.get() || !transport_->socket())
@@ skipping 66 matching lines @@
   return base::TimeDelta::FromMicroseconds(-1);
 }
 
 void ProxyResolvingClientSocket::CloseTransportSocket() {
   if (transport_.get() && transport_->socket())
     transport_->socket()->Disconnect();
   transport_.reset();
 }
 
 }  // namespace notifier