base::Bind: Convert AppCacheHelper::DeleteAppCacheGroup.

webkit/appcache/view_appcache_internals_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 <algorithm>
 #include <string>
 
 #include "webkit/appcache/view_appcache_internals_job.h"
 
 #include "base/base64.h"
+#include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/escape.h"
 #include "net/base/io_buffer.h"
@@ skipping 372 matching lines @@
   }
 };
 
 // Job that removes an appcache and then redirects back to the main page.
 class RemoveAppCacheJob : public RedirectToMainPageJob {
  public:
   RemoveAppCacheJob(
       net::URLRequest* request, AppCacheService* service,
       const GURL& manifest_url)
       : RedirectToMainPageJob(request, service),
-        manifest_url_(manifest_url) {}
+        manifest_url_(manifest_url),
+        ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+  }
 
   virtual void Start() {
     DCHECK(request_);
-    delete_appcache_callback_ =
-        new net::CancelableOldCompletionCallback<RemoveAppCacheJob>(
-            this, &RemoveAppCacheJob::OnDeleteAppCacheComplete);
+
     appcache_service_->DeleteAppCacheGroup(
-        manifest_url_, delete_appcache_callback_);
+        manifest_url_,base::Bind(&RemoveAppCacheJob::OnDeleteAppCacheComplete,
+                                 weak_factory_.GetWeakPtr()));
   }
 
  private:
-  virtual ~RemoveAppCacheJob() {
-    if (delete_appcache_callback_)
-      delete_appcache_callback_.release()->Cancel();
-  }
+  virtual ~RemoveAppCacheJob() {}
 
   void OnDeleteAppCacheComplete(int rv) {
-    delete_appcache_callback_ = NULL;
     StartAsync();  // Causes the base class to redirect.
   }
 
   GURL manifest_url_;
-  scoped_refptr<net::CancelableOldCompletionCallback<RemoveAppCacheJob> >
-      delete_appcache_callback_;
+  base::WeakPtrFactory<RemoveAppCacheJob> weak_factory_;
 };
 
 
 // Job shows the details of a particular manifest url.
 class ViewAppCacheJob : public BaseInternalsJob,
                         public AppCacheStorage::Delegate {
  public:
   ViewAppCacheJob(
       net::URLRequest* request, AppCacheService* service,
       const GURL manifest_url)
@@ skipping 179 matching lines @@
     return new ViewEntryJob(request, service,
                             DecodeBase64URL(tokens[0]),  // manifest url
                             DecodeBase64URL(tokens[1]),  // entry url
                             response_id, group_id);
   }
 
   return new RedirectToMainPageJob(request, service);
 }
 
 }  // namespace appcache