base::Bind usage

webkit/appcache/appcache_url_request_job.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 <vector>
 
 #include "webkit/appcache/appcache_url_request_job.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
@@ skipping 12 matching lines @@
 
 AppCacheURLRequestJob::AppCacheURLRequestJob(
     net::URLRequest* request, AppCacheStorage* storage)
     : net::URLRequestJob(request), storage_(storage),
       has_been_started_(false), has_been_killed_(false),
       delivery_type_(AWAITING_DELIVERY_ORDERS),
       group_id_(0), cache_id_(kNoCacheId), is_fallback_(false),
       cache_entry_not_found_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(read_callback_(
           this, &AppCacheURLRequestJob::OnReadComplete)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   DCHECK(storage_);
 }
 
 AppCacheURLRequestJob::~AppCacheURLRequestJob() {
   if (storage_)
     storage_->CancelDelegateCallbacks(this);
 }
 
 void AppCacheURLRequestJob::DeliverAppCachedResponse(
     const GURL& manifest_url, int64 group_id, int64 cache_id,
@@ skipping 22 matching lines @@
   storage_ = NULL;  // not needed
   MaybeBeginDelivery();
 }
 
 void AppCacheURLRequestJob::MaybeBeginDelivery() {
   if (has_been_started() && has_delivery_orders()) {
     // Start asynchronously so that all error reporting and data
     // callbacks happen as they would for network requests.
     MessageLoop::current()->PostTask(
         FROM_HERE,
-        method_factory_.NewRunnableMethod(
-            &AppCacheURLRequestJob::BeginDelivery));
+        base::Bind(&AppCacheURLRequestJob::BeginDelivery,
+                   weak_factory_.GetWeakPtr()));
   }
 }
 
 void AppCacheURLRequestJob::BeginDelivery() {
   DCHECK(has_delivery_orders() && has_been_started());
 
   if (has_been_killed())
     return;
 
   switch (delivery_type_) {
@@ skipping 125 matching lines @@
 
 void AppCacheURLRequestJob::Kill() {
   if (!has_been_killed_) {
     has_been_killed_ = true;
     reader_.reset();
     if (storage_) {
       storage_->CancelDelegateCallbacks(this);
       storage_ = NULL;
     }
     net::URLRequestJob::Kill();
-    method_factory_.RevokeAll();
+    weak_factory_.InvalidateWeakPtrs();
   }
 }
 
 net::LoadState AppCacheURLRequestJob::GetLoadState() const {
   if (!has_been_started())
     return net::LOAD_STATE_IDLE;
   if (!has_delivery_orders())
     return net::LOAD_STATE_WAITING_FOR_CACHE;
   if (delivery_type_ != APPCACHED_DELIVERY)
     return net::LOAD_STATE_IDLE;
@@ skipping 48 matching lines @@
     return;
   }
 
   // If multiple ranges are requested, we play dumb and
   // return the entire response with 200 OK.
   if (ranges.size() == 1U)
     range_requested_ = ranges[0];
 }
 
 }  // namespace appcache