Use base::Callback in Quota related code.

chrome/browser/ui/webui/quota_internals_proxy.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 "chrome/browser/ui/webui/quota_internals_proxy.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
 #include "chrome/browser/ui/webui/quota_internals_handler.h"
 #include "chrome/browser/ui/webui/quota_internals_types.h"
 #include "net/base/net_util.h"
 
 namespace quota_internals {
 
 QuotaInternalsProxy::QuotaInternalsProxy(QuotaInternalsHandler* handler)
     : handler_(handler),
-      callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
 QuotaInternalsProxy::~QuotaInternalsProxy() {}
 
 #define RELAY_TO_HANDLER(func, arg_t) \
   void QuotaInternalsProxy::func(arg_t arg) {                 \
     if (!handler_)                                            \
       return;                                                 \
     if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {     \
       BrowserThread::PostTask(                                \
@@ skipping 18 matching lines @@
   DCHECK(quota_manager);
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&QuotaInternalsProxy::RequestInfo, this, quota_manager));
     return;
   }
 
   quota_manager_ = quota_manager;
   quota_manager_->GetAvailableSpace(
-      callback_factory_.NewCallback(
-          &QuotaInternalsProxy::DidGetAvailableSpace));
+      base::Bind(&QuotaInternalsProxy::DidGetAvailableSpace,
+                 weak_factory_.GetWeakPtr()));
 
   quota_manager_->GetTemporaryGlobalQuota(
-      callback_factory_.NewCallback(
-          &QuotaInternalsProxy::DidGetGlobalQuota));
+      base::Bind(&QuotaInternalsProxy::DidGetGlobalQuota,
+                 weak_factory_.GetWeakPtr()));
 
   quota_manager_->GetGlobalUsage(
       quota::kStorageTypeTemporary,
-      callback_factory_.NewCallback(
-          &QuotaInternalsProxy::DidGetGlobalUsage));
+      base::Bind(&QuotaInternalsProxy::DidGetGlobalUsage,
+                 weak_factory_.GetWeakPtr()));
 
   quota_manager_->GetGlobalUsage(
       quota::kStorageTypePersistent,
-      callback_factory_.NewCallback(
-          &QuotaInternalsProxy::DidGetGlobalUsage));
+      base::Bind(&QuotaInternalsProxy::DidGetGlobalUsage,
+                 weak_factory_.GetWeakPtr()));
 
   quota_manager_->DumpQuotaTable(
-      callback_factory_.NewCallback(
-          &QuotaInternalsProxy::DidDumpQuotaTable));
+      base::Bind(&QuotaInternalsProxy::DidDumpQuotaTable,
+                 weak_factory_.GetWeakPtr()));
 
   quota_manager_->DumpOriginInfoTable(
-      callback_factory_.NewCallback(
-          &QuotaInternalsProxy::DidDumpOriginInfoTable));
+      base::Bind(&QuotaInternalsProxy::DidDumpOriginInfoTable,
+                 weak_factory_.GetWeakPtr()));
 
   std::map<std::string, std::string> stats;
   quota_manager_->GetStatistics(&stats);
   ReportStatistics(stats);
 }
 
 void QuotaInternalsProxy::DidGetAvailableSpace(quota::QuotaStatusCode status,
                                                int64 space) {
   if (status == quota::kQuotaStatusOk)
     ReportAvailableSpace(space);
@@ skipping 81 matching lines @@
       GetHostUsage(host, type);
     }
   }
 }
 
 void QuotaInternalsProxy::GetHostUsage(const std::string& host,
                                        quota::StorageType type) {
   DCHECK(quota_manager_);
   quota_manager_->GetHostUsage(
       host, type,
-      callback_factory_.NewCallback(
-          &QuotaInternalsProxy::DidGetHostUsage));
+      base::Bind(&QuotaInternalsProxy::DidGetHostUsage,
+                 weak_factory_.GetWeakPtr()));
 }
 
 void QuotaInternalsProxy::RequestPerOriginInfo(quota::StorageType type) {
   DCHECK(quota_manager_);
 
   std::set<GURL> origins;
   quota_manager_->GetCachedOrigins(type, &origins);
 
   std::vector<PerOriginStorageInfo> origin_info;
   origin_info.reserve(origins.size());
@@ skipping 12 matching lines @@
       PerHostStorageInfo info(host, type);
       host_info.push_back(info);
       VisitHost(host, type);
     }
   }
   ReportPerOriginInfo(origin_info);
   ReportPerHostInfo(host_info);
 }
 
 }  // namespace quota_internals