Use base::Callback in Quota related code.

webkit/appcache/appcache_storage_impl.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 "webkit/appcache/appcache_storage_impl.h"
 
+#include <algorithm>
+#include <functional>
 #include <set>
+#include <vector>
 
+#include "base/bind.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "net/base/cache_type.h"
 #include "net/base/net_errors.h"
 #include "sql/connection.h"
 #include "sql/transaction.h"
 #include "webkit/appcache/appcache.h"
@@ skipping 519 matching lines @@
   if (!quota_manager) {
     if (storage_->service()->special_storage_policy() &&
         storage_->service()->special_storage_policy()->IsStorageUnlimited(
             group_record_.origin))
       space_available_ = kint64max;
     Schedule();
     return;
   }
 
   // We have to ask the quota manager for the value.
   AddRef();  // balanced in the OnQuotaCallback

[michaeln, 2011/10/03 18:51:27]

Is the manual AddRef() and balancing Release() needed if base::Unretained is
removed from the 'this' parameter below?

[tzik, 2011/10/11 04:53:57]

TODO in another CL.

   storage_->pending_quota_queries_.insert(this);
   quota_manager->GetUsageAndQuota(
       group_record_.origin, quota::kStorageTypeTemporary,
-      NewCallback(this, &StoreGroupAndCacheTask::OnQuotaCallback));
+      base::Bind(&StoreGroupAndCacheTask::OnQuotaCallback,
+                 base::Unretained(this)));
 }
 
 void AppCacheStorageImpl::StoreGroupAndCacheTask::OnQuotaCallback(
     quota::QuotaStatusCode status, int64 usage, int64 quota) {
   if (storage_) {
     if (status == quota::kQuotaStatusOk)
       space_available_ = std::max(static_cast<int64>(0), quota - usage);
     else
       space_available_ = 0;
     storage_->pending_quota_queries_.erase(this);
@@ skipping 1084 matching lines @@
     Disable();
     if (!is_incognito_) {
       VLOG(1) << "Deleting existing appcache data and starting over.";
       db_thread_->PostTask(FROM_HERE,
           NewRunnableFunction(DeleteDirectory, cache_directory_));
     }
   }
 }
 
 }  // namespace appcache