base::Bind: Convert net/proxy.

content/browser/resolve_proxy_msg_helper.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 "content/browser/resolve_proxy_msg_helper.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "content/common/view_messages.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 ResolveProxyMsgHelper::ResolveProxyMsgHelper(
     net::URLRequestContextGetter* getter)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-          this, &ResolveProxyMsgHelper::OnResolveProxyCompleted)),
-      context_getter_(getter),
+    : context_getter_(getter),
       proxy_service_(NULL) {
 }
 
 ResolveProxyMsgHelper::ResolveProxyMsgHelper(net::ProxyService* proxy_service)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-          this, &ResolveProxyMsgHelper::OnResolveProxyCompleted)),
-      proxy_service_(proxy_service) {
+    : proxy_service_(proxy_service) {
 }
 
 bool ResolveProxyMsgHelper::OnMessageReceived(const IPC::Message& message,
                                               bool* message_was_ok) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(ResolveProxyMsgHelper, message, *message_was_ok)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_ResolveProxy, OnResolveProxy)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ skipping 31 matching lines @@
   // Verify the request wasn't started yet.
   DCHECK(NULL == req.pac_req);
 
   if (context_getter_.get()) {
     proxy_service_ = context_getter_->GetURLRequestContext()->proxy_service();
     context_getter_ = NULL;
   }
 
   // Start the request.
   int result = proxy_service_->ResolveProxy(
-      req.url, &proxy_info_, &callback_, &req.pac_req, net::BoundNetLog());
+      req.url, &proxy_info_,
+      base::Bind(&ResolveProxyMsgHelper::OnResolveProxyCompleted,
+                 base::Unretained(this)),
+      &req.pac_req, net::BoundNetLog());
 
   // Completed synchronously.
   if (result != net::ERR_IO_PENDING)
     OnResolveProxyCompleted(result);
 }
 
 ResolveProxyMsgHelper::~ResolveProxyMsgHelper() {
   // Clear all pending requests if the ProxyService is still alive (if we have a
   // default request context or override).
   if (!pending_requests_.empty()) {
     PendingRequest req = pending_requests_.front();
     proxy_service_->CancelPacRequest(req.pac_req);
   }
 
   for (PendingRequestList::iterator it = pending_requests_.begin();
        it != pending_requests_.end();
        ++it) {
     delete it->reply_msg;
   }
 
   pending_requests_.clear();
 }