Use base::Callback in Quota related code.

webkit/fileapi/file_system_quota_client.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/fileapi/file_system_quota_client.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/file_path.h"
@@ skipping 120 matching lines @@
 };
 
 class FileSystemQuotaClient::DeleteOriginTask
     : public QuotaThreadTask {
  public:
   DeleteOriginTask(
       FileSystemQuotaClient* quota_client,
       scoped_refptr<MessageLoopProxy> file_message_loop,
       const GURL& origin,
       FileSystemType type,
-      DeletionCallback* callback)
+      const DeletionCallback& callback)
       : QuotaThreadTask(quota_client, file_message_loop),
         file_system_context_(quota_client->file_system_context_),
         origin_(origin),
         type_(type),
         status_(quota::kQuotaStatusUnknown),
         callback_(callback) {
   }
 
   virtual ~DeleteOriginTask() {}
 
   virtual void RunOnTargetThread() OVERRIDE {
     if (file_system_context_->DeleteDataForOriginAndTypeOnFileThread(
             origin_, type_))
       status_ = quota::kQuotaStatusOk;
     else
       status_ = quota::kQuotaErrorInvalidModification;
   }
 
   virtual void Completed() OVERRIDE {
-    callback_->Run(status_);
+    callback_.Run(status_);
   }
  private:
   FileSystemContext* file_system_context_;
   GURL origin_;
   FileSystemType type_;
   quota::QuotaStatusCode status_;
-  scoped_ptr<DeletionCallback> callback_;
+  DeletionCallback callback_;
 };
 
 FileSystemQuotaClient::FileSystemQuotaClient(
     scoped_refptr<base::MessageLoopProxy> file_message_loop,
     FileSystemContext* file_system_context,
     bool is_incognito)
     : file_message_loop_(file_message_loop),
       file_system_context_(file_system_context),
       is_incognito_(is_incognito) {
   DCHECK(file_message_loop);
 }
 
 FileSystemQuotaClient::~FileSystemQuotaClient() {
 }
 
 quota::QuotaClient::ID FileSystemQuotaClient::id() const {
   return quota::QuotaClient::kFileSystem;
 }
 
 void FileSystemQuotaClient::OnQuotaManagerDestroyed() {
   delete this;
 }
 
 void FileSystemQuotaClient::GetOriginUsage(
     const GURL& origin_url,
     StorageType storage_type,
-    GetUsageCallback* callback_ptr) {
-  DCHECK(callback_ptr);
-  scoped_ptr<GetUsageCallback> callback(callback_ptr);
+    const GetUsageCallback& callback) {
+  DCHECK(!callback.is_null());
 
   if (is_incognito_) {
     // We don't support FileSystem in incognito mode yet.
-    callback->Run(0);
+    callback.Run(0);
     return;
   }
 
   FileSystemType type = QuotaStorageTypeToFileSystemType(storage_type);
   DCHECK(type != kFileSystemTypeUnknown);
 
   if (pending_usage_callbacks_.Add(
-          std::make_pair(type, origin_url.spec()), callback.release())) {
+          std::make_pair(type, origin_url.spec()), callback)) {
     scoped_refptr<GetOriginUsageTask> task(
         new GetOriginUsageTask(this, file_message_loop_, origin_url, type));
     task->Start();
   }
 }
 
 void FileSystemQuotaClient::GetOriginsForType(
     StorageType storage_type,
-    GetOriginsCallback* callback_ptr) {
+    const GetOriginsCallback& callback) {
+  DCHECK(!callback.is_null());
+
   std::set<GURL> origins;
-  scoped_ptr<GetOriginsCallback> callback(callback_ptr);
   if (is_incognito_) {
     // We don't support FileSystem in incognito mode yet.
-    callback->Run(origins, storage_type);
+    callback.Run(origins, storage_type);
     return;
   }
 
   FileSystemType type = QuotaStorageTypeToFileSystemType(storage_type);
   DCHECK(type != kFileSystemTypeUnknown);
 
-  if (pending_origins_for_type_callbacks_.Add(type, callback.release())) {
+  if (pending_origins_for_type_callbacks_.Add(type, callback)) {
     scoped_refptr<GetOriginsForTypeTask> task(
         new GetOriginsForTypeTask(this, file_message_loop_, type));
     task->Start();
   }
 }
 
 void FileSystemQuotaClient::GetOriginsForHost(
     StorageType storage_type,
     const std::string& host,
-    GetOriginsCallback* callback_ptr) {
+    const GetOriginsCallback& callback) {
+  DCHECK(!callback.is_null());
+
   std::set<GURL> origins;
-  scoped_ptr<GetOriginsCallback> callback(callback_ptr);
   if (is_incognito_) {
     // We don't support FileSystem in incognito mode yet.
-    callback->Run(origins, storage_type);
+    callback.Run(origins, storage_type);
     return;
   }
 
   FileSystemType type = QuotaStorageTypeToFileSystemType(storage_type);
   DCHECK(type != kFileSystemTypeUnknown);
 
   if (pending_origins_for_host_callbacks_.Add(
-          std::make_pair(type, host), callback.release())) {
+          std::make_pair(type, host), callback)) {
     scoped_refptr<GetOriginsForHostTask> task(
         new GetOriginsForHostTask(this, file_message_loop_,
                                   type, host));
     task->Start();
   }
 }
 
 void FileSystemQuotaClient::DeleteOriginData(const GURL& origin,
                                              StorageType type,
-                                             DeletionCallback* callback) {
+                                             const DeletionCallback& callback) {
   FileSystemType fs_type = QuotaStorageTypeToFileSystemType(type);
   DCHECK(fs_type != kFileSystemTypeUnknown);
   scoped_refptr<DeleteOriginTask> task(
       new DeleteOriginTask(this, file_message_loop_,
                            origin, fs_type, callback));
   task->Start();
 }
 
 void FileSystemQuotaClient::DidGetOriginUsage(
     FileSystemType type, const GURL& origin_url, int64 usage) {
@@ skipping 11 matching lines @@
 }
 
 void FileSystemQuotaClient::DidGetOriginsForHost(
     const TypeAndHostOrOrigin& type_and_host, const std::set<GURL>& origins) {
   DCHECK(pending_origins_for_host_callbacks_.HasCallbacks(type_and_host));
   pending_origins_for_host_callbacks_.Run(type_and_host, origins,
       FileSystemTypeToQuotaStorageType(type_and_host.first));
 }
 
 }  // namespace fileapi