base::Bind: Convert net/proxy.

net/proxy/proxy_script_fetcher_impl.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 "net/proxy/proxy_script_fetcher_impl.h"
 
 #include "base/compiler_specific.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 55 matching lines @@
   // U+FFFD rather than failing.
   base::CodepageToUTF16(bytes, codepage,
                         base::OnStringConversionError::SUBSTITUTE,
                         utf16);
 }
 
 }  // namespace
 
 ProxyScriptFetcherImpl::ProxyScriptFetcherImpl(
     URLRequestContext* url_request_context)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)),
+    : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
       url_request_context_(url_request_context),
       buf_(new IOBuffer(kBufSize)),
       next_id_(0),
       cur_request_(NULL),
       cur_request_id_(0),
-      callback_(NULL),
       result_code_(OK),
       result_text_(NULL),
       max_response_bytes_(kDefaultMaxResponseBytes),
       max_duration_(base::TimeDelta::FromMilliseconds(kDefaultMaxDurationMs)) {
   DCHECK(url_request_context);
 }
 
 ProxyScriptFetcherImpl::~ProxyScriptFetcherImpl() {
   // The URLRequest's destructor will cancel the outstanding request, and
   // ensure that the delegate (this) is not called again.
@@ skipping 16 matching lines @@
   DCHECK_EQ(request, cur_request_.get());
 
   // Use |result_code_| as the request's error if we have already set it to
   // something specific.
   if (result_code_ == OK && !request->status().is_success())
     result_code_ = request->status().error();
 
   FetchCompleted();
 }
 
-int ProxyScriptFetcherImpl::Fetch(const GURL& url,
-                                  string16* text,
-                                  OldCompletionCallback* callback) {
+int ProxyScriptFetcherImpl::Fetch(
+    const GURL& url, string16* text, const CompletionCallback& callback) {
   // It is invalid to call Fetch() while a request is already in progress.
   DCHECK(!cur_request_.get());
-
-  DCHECK(callback);
+  DCHECK(!callback.is_null());
   DCHECK(text);
 
   // Handle base-64 encoded data-urls that contain custom PAC scripts.
   if (url.SchemeIs("data")) {
     std::string mime_type;
     std::string charset;
     std::string data;
     if (!DataURL::Parse(url, &mime_type, &charset, &data))
       return ERR_FAILED;
 
@@ skipping 18 matching lines @@
                                LOAD_DISABLE_CERT_REVOCATION_CHECKING);
 
   // Save the caller's info for notification on completion.
   callback_ = callback;
   result_text_ = text;
 
   bytes_read_so_far_.clear();
 
   // Post a task to timeout this request if it takes too long.
   cur_request_id_ = ++next_id_;
-  MessageLoop::current()->PostDelayedTask(FROM_HERE,
-      task_factory_.NewRunnableMethod(&ProxyScriptFetcherImpl::OnTimeout,
-                                      cur_request_id_),
+  MessageLoop::current()->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(&ProxyScriptFetcherImpl::OnTimeout, weak_factory_.GetWeakPtr(),
+                 cur_request_id_),
       static_cast<int>(max_duration_.InMilliseconds()));
 
   // Start the request.
   cur_request_->Start();
   return ERR_IO_PENDING;
 }
 
 void ProxyScriptFetcherImpl::Cancel() {
   // ResetCurRequestState will free the URLRequest, which will cause
   // cancellation.
@@ skipping 111 matching lines @@
     // The caller expects the response to be encoded as UTF16.
     std::string charset;
     cur_request_->GetCharset(&charset);
     ConvertResponseToUTF16(charset, bytes_read_so_far_, result_text_);
   } else {
     // On error, the caller expects empty string for bytes.
     result_text_->clear();
   }
 
   int result_code = result_code_;
-  OldCompletionCallback* callback = callback_;
+  CompletionCallback callback = callback_;
 
   // Hold a reference to the URLRequestContext to prevent re-entrancy from
   // ~URLRequestContext.
   scoped_refptr<const URLRequestContext> context(cur_request_->context());
   ResetCurRequestState();
 
-  callback->Run(result_code);
+  callback.Run(result_code);
 }
 
 void ProxyScriptFetcherImpl::ResetCurRequestState() {
   cur_request_.reset();
   cur_request_id_ = 0;
-  callback_ = NULL;
+  callback_.Reset();
   result_code_ = OK;
   result_text_ = NULL;
 }
 
 void ProxyScriptFetcherImpl::OnTimeout(int id) {
   // Timeout tasks may outlive the URLRequest they reference. Make sure it
   // is still applicable.
   if (cur_request_id_ != id)
     return;
 
   DCHECK(cur_request_.get());
   result_code_ = ERR_TIMED_OUT;
   cur_request_->Cancel();
 }
 
 }  // namespace net