base::Bind: Convert AppCacheService::GetAllAppCacheInfo.

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/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"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_simple_job.h"
 #include "net/url_request/view_cache_helper.h"
@@ skipping 285 matching lines @@
   BaseInternalsJob(net::URLRequest* request, AppCacheService* service)
       : URLRequestSimpleJob(request), appcache_service_(service) {}
 
   AppCacheService* appcache_service_;
 };
 
 // Job that lists all appcaches in the system.
 class MainPageJob : public BaseInternalsJob {
  public:
   MainPageJob(net::URLRequest* request, AppCacheService* service)
-      : BaseInternalsJob(request, service) {}
+      : BaseInternalsJob(request, service),
+        ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+  }
 
   virtual void Start() {
     DCHECK(request_);
     info_collection_ = new AppCacheInfoCollection;
-    gotinfo_complete_callback_ =
-        new net::CancelableOldCompletionCallback<MainPageJob>(
-            this, &MainPageJob::OnGotInfoComplete);
     appcache_service_->GetAllAppCacheInfo(
-        info_collection_, gotinfo_complete_callback_);
+        info_collection_, base::Bind(&MainPageJob::OnGotInfoComplete,
+                                     weak_factory_.GetWeakPtr()));
   }
 
   // Produces a page containing the listing
   virtual bool GetData(std::string* mime_type,
                        std::string* charset,
                        std::string* out) const {
     mime_type->assign("text/html");
     charset->assign("UTF-8");
 
     out->clear();
@@ skipping 14 matching lines @@
       std::sort(appcaches.begin(), appcaches.end(), SortByManifestUrl);
 
       GURL base_url = ClearQuery(request_->url());
       EmitAppCacheInfoVector(base_url, appcache_service_, appcaches, out);
     }
     EmitPageEnd(out);
     return true;
   }
 
  private:
-  virtual ~MainPageJob() {
-    if (gotinfo_complete_callback_)
-      gotinfo_complete_callback_.release()->Cancel();
-  }
+  virtual ~MainPageJob() {}
 
   void OnGotInfoComplete(int rv) {
-    gotinfo_complete_callback_ = NULL;
     if (rv != net::OK)
       info_collection_ = NULL;
     StartAsync();
   }
 
-  scoped_refptr<net::CancelableOldCompletionCallback<MainPageJob> >
-      gotinfo_complete_callback_;
+  base::WeakPtrFactory<MainPageJob> weak_factory_;
   scoped_refptr<AppCacheInfoCollection> info_collection_;
   DISALLOW_COPY_AND_ASSIGN(MainPageJob);
 };
 
 // Job that redirects back to the main appcache internals page.
 class RedirectToMainPageJob : public BaseInternalsJob {
  public:
   RedirectToMainPageJob(net::URLRequest* request, AppCacheService* service)
       : BaseInternalsJob(request, service) {}
 
@@ skipping 234 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