Use base::Callback in Quota related code.

chrome/browser/browsing_data_remover.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/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 471 matching lines @@
   // OnGotQuotaManagedOrigins().
   quota_managed_origins_to_delete_count_ = 0;
   quota_managed_storage_types_to_delete_count_ = 2;
 
   if (delete_begin_ == base::Time()) {
     // If we're deleting since the beginning of time, ask the QuotaManager for
     // all origins with persistent quota modified within the user-specified
     // timeframe, and deal with the resulting set in
     // OnGotPersistentQuotaManagedOrigins.
     profile_->GetQuotaManager()->GetOriginsModifiedSince(
-        quota::kStorageTypePersistent, delete_begin_, NewCallback(this,
-            &BrowsingDataRemover::OnGotQuotaManagedOrigins));
+        quota::kStorageTypePersistent, delete_begin_,
+        base::Bind(&BrowsingDataRemover::OnGotQuotaManagedOrigins,
+                   base::Unretained(this)));
   } else {
     // Otherwise, we don't need to deal with persistent storage.
     --quota_managed_storage_types_to_delete_count_;
   }
 
   // Do the same for temporary quota, regardless, passing the resulting set into
   // OnGotTemporaryQuotaManagedOrigins.
   profile_->GetQuotaManager()->GetOriginsModifiedSince(
-      quota::kStorageTypeTemporary, delete_begin_, NewCallback(this,
-          &BrowsingDataRemover::OnGotQuotaManagedOrigins));
+      quota::kStorageTypeTemporary, delete_begin_,
+      base::Bind(&BrowsingDataRemover::OnGotQuotaManagedOrigins,
+                 base::Unretained(this)));
 }
 
 void BrowsingDataRemover::OnGotQuotaManagedOrigins(
     const std::set<GURL>& origins, quota::StorageType type) {
   DCHECK_GT(quota_managed_storage_types_to_delete_count_, 0);
   // Walk through the origins passed in, delete quota of |type| from each that
   // isn't protected.
   std::set<GURL>::const_iterator origin;
   for (origin = origins.begin(); origin != origins.end(); ++origin) {
     if (special_storage_policy_->IsStorageProtected(origin->GetOrigin()))
       continue;
     ++quota_managed_origins_to_delete_count_;
-    quota_manager_->DeleteOriginData(origin->GetOrigin(),
-        type, NewCallback(this,
-                          &BrowsingDataRemover::OnQuotaManagedOriginDeletion));
+    quota_manager_->DeleteOriginData(
+        origin->GetOrigin(), type,
+        base::Bind(&BrowsingDataRemover::OnQuotaManagedOriginDeletion,
+                   base::Unretained(this)));
   }
 
   --quota_managed_storage_types_to_delete_count_;
   CheckQuotaManagedDataDeletionStatus();
 }
 
 void BrowsingDataRemover::OnQuotaManagedOriginDeletion(
     quota::QuotaStatusCode status) {
   DCHECK_GT(quota_managed_origins_to_delete_count_, 0);
   if (status != quota::kQuotaStatusOk) {
@@ skipping 51 matching lines @@
       GetURLRequestContext()->cookie_store()->GetCookieMonster();
   if (cookie_monster) {
       cookie_monster->DeleteAllCreatedBetweenAsync(
           delete_begin_, delete_end_,
           base::Bind(&BrowsingDataRemover::OnClearedCookies,
                      base::Unretained(this)));
   } else {
     OnClearedCookies(0);
   }
 }