Use base::Callback in Quota related code.

webkit/fileapi/file_system_operation.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_operation.h"
 
+#include "base/bind.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request_context.h"
 #include "webkit/fileapi/file_system_callback_dispatcher.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util_proxy.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_path_manager.h"
 #include "webkit/fileapi/file_system_quota_util.h"
@@ skipping 40 matching lines @@
 }
 
 FileSystemOperation::FileSystemOperation(
     FileSystemCallbackDispatcher* dispatcher,
     scoped_refptr<base::MessageLoopProxy> proxy,
     FileSystemContext* file_system_context,
     FileSystemFileUtil* file_util)
     : proxy_(proxy),
       dispatcher_(dispatcher),
       file_system_operation_context_(file_system_context, file_util),
+      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   DCHECK(dispatcher);
 #ifndef NDEBUG
   pending_operation_ = kOperationNone;
 #endif
 }
 
 FileSystemOperation::~FileSystemOperation() {
   if (file_writer_delegate_.get())
     FileSystemFileUtilProxy::Close(
@@ skipping 36 matching lines @@
       &type, &src_virtual_path_, &file_util)) {
     delete this;
     return;
   }
   file_system_operation_context_.set_src_origin_url(origin_url);
   file_system_operation_context_.set_src_type(type);
   if (!file_system_operation_context_.src_file_util())
     file_system_operation_context_.set_src_file_util(file_util);
   exclusive_ = exclusive;
 
-  GetUsageAndQuotaThenCallback(origin_url, callback_factory_.NewCallback(
-      &FileSystemOperation::DelayedCreateFileForQuota));
+  GetUsageAndQuotaThenCallback(
+      origin_url,
+      base::Bind(&FileSystemOperation::DelayedCreateFileForQuota,
+                 weak_factory_.GetWeakPtr()));
 }
 
 void FileSystemOperation::DelayedCreateFileForQuota(
     quota::QuotaStatusCode status, int64 usage, int64 quota) {
   file_system_operation_context_.set_allowed_bytes_growth(quota - usage);
 
   quota_util_helper_.reset(new ScopedQuotaUtilHelper(
       file_system_context(),
       file_system_operation_context_.src_origin_url(),
       file_system_operation_context_.src_type()));
@@ skipping 23 matching lines @@
     delete this;
     return;
   }
   file_system_operation_context_.set_src_origin_url(origin_url);
   file_system_operation_context_.set_src_type(type);
   if (!file_system_operation_context_.src_file_util())
     file_system_operation_context_.set_src_file_util(file_util);
   exclusive_ = exclusive;
   recursive_ = recursive;
 
-  GetUsageAndQuotaThenCallback(origin_url, callback_factory_.NewCallback(
-      &FileSystemOperation::DelayedCreateDirectoryForQuota));
+  GetUsageAndQuotaThenCallback(
+      origin_url,
+      base::Bind(&FileSystemOperation::DelayedCreateDirectoryForQuota,
+                 weak_factory_.GetWeakPtr()));
 }
 
 void FileSystemOperation::DelayedCreateDirectoryForQuota(
     quota::QuotaStatusCode status, int64 usage, int64 quota) {
   file_system_operation_context_.set_allowed_bytes_growth(quota - usage);
 
   quota_util_helper_.reset(new ScopedQuotaUtilHelper(
       file_system_context(),
       file_system_operation_context_.src_origin_url(),
       file_system_operation_context_.src_type()));
@@ skipping 30 matching lines @@
   }
   file_system_operation_context_.set_src_origin_url(src_origin_url);
   file_system_operation_context_.set_dest_origin_url(dest_origin_url);
   file_system_operation_context_.set_src_type(src_type);
   file_system_operation_context_.set_dest_type(dest_type);
   if (!file_system_operation_context_.src_file_util())
     file_system_operation_context_.set_src_file_util(src_file_util);
   if (!file_system_operation_context_.dest_file_util())
     file_system_operation_context_.set_dest_file_util(dest_file_util);
 
-  GetUsageAndQuotaThenCallback(dest_origin_url, callback_factory_.NewCallback(
-      &FileSystemOperation::DelayedCopyForQuota));
+  GetUsageAndQuotaThenCallback(
+      dest_origin_url,
+      base::Bind(&FileSystemOperation::DelayedCopyForQuota,
+                 weak_factory_.GetWeakPtr()));
 }
 
 void FileSystemOperation::DelayedCopyForQuota(quota::QuotaStatusCode status,
                                               int64 usage, int64 quota) {
   file_system_operation_context_.set_allowed_bytes_growth(quota - usage);
 
   quota_util_helper_.reset(new ScopedQuotaUtilHelper(
       file_system_context(),
       file_system_operation_context_.dest_origin_url(),
       file_system_operation_context_.dest_type()));
@@ skipping 29 matching lines @@
   }
   file_system_operation_context_.set_src_origin_url(src_origin_url);
   file_system_operation_context_.set_dest_origin_url(dest_origin_url);
   file_system_operation_context_.set_src_type(src_type);
   file_system_operation_context_.set_dest_type(dest_type);
   if (!file_system_operation_context_.src_file_util())
     file_system_operation_context_.set_src_file_util(src_file_util);
   if (!file_system_operation_context_.dest_file_util())
     file_system_operation_context_.set_dest_file_util(dest_file_util);
 
-  GetUsageAndQuotaThenCallback(dest_origin_url, callback_factory_.NewCallback(
-      &FileSystemOperation::DelayedMoveForQuota));
+  GetUsageAndQuotaThenCallback(
+      dest_origin_url,
+      base::Bind(&FileSystemOperation::DelayedMoveForQuota,
+                 weak_factory_.GetWeakPtr()));
 }
 
 void FileSystemOperation::DelayedMoveForQuota(quota::QuotaStatusCode status,
                                               int64 usage, int64 quota) {
   file_system_operation_context_.set_allowed_bytes_growth(quota - usage);
 
   quota_util_helper_.reset(new ScopedQuotaUtilHelper(
       file_system_context(),
       file_system_operation_context_.dest_origin_url(),
       file_system_operation_context_.dest_type()));
@@ skipping 152 matching lines @@
   file_system_operation_context_.set_src_origin_url(origin_url);
   file_system_operation_context_.set_src_type(type);
   if (!file_system_operation_context_.src_file_util())
     file_system_operation_context_.set_src_file_util(file_util);
   DCHECK(blob_url.is_valid());
   file_writer_delegate_.reset(new FileWriterDelegate(this, offset, proxy_));
   blob_request_.reset(
       new net::URLRequest(blob_url, file_writer_delegate_.get()));
   blob_request_->set_context(url_request_context);
 
-  GetUsageAndQuotaThenCallback(origin_url, callback_factory_.NewCallback(
-      &FileSystemOperation::DelayedWriteForQuota));
+  GetUsageAndQuotaThenCallback(
+      origin_url,
+      base::Bind(&FileSystemOperation::DelayedWriteForQuota,
+                 weak_factory_.GetWeakPtr()));
 }
 
 void FileSystemOperation::DelayedWriteForQuota(quota::QuotaStatusCode status,
                                                int64 usage, int64 quota) {
   file_system_operation_context_.set_allowed_bytes_growth(quota - usage);
 
   quota_util_helper_.reset(new ScopedQuotaUtilHelper(
       file_system_context(),
       file_system_operation_context_.src_origin_url(),
       file_system_operation_context_.src_type()));
@@ skipping 20 matching lines @@
       &type, &src_virtual_path_, &file_util)) {
     delete this;
     return;
   }
   file_system_operation_context_.set_src_origin_url(origin_url);
   file_system_operation_context_.set_src_type(type);
   if (!file_system_operation_context_.src_file_util())
     file_system_operation_context_.set_src_file_util(file_util);
   length_ = length;
 
-  GetUsageAndQuotaThenCallback(origin_url, callback_factory_.NewCallback(
-      &FileSystemOperation::DelayedTruncateForQuota));
+  GetUsageAndQuotaThenCallback(
+      origin_url,
+      base::Bind(&FileSystemOperation::DelayedTruncateForQuota,
+                 weak_factory_.GetWeakPtr()));
 }
 
 void FileSystemOperation::DelayedTruncateForQuota(quota::QuotaStatusCode status,
                                                   int64 usage, int64 quota) {
   file_system_operation_context_.set_allowed_bytes_growth(quota - usage);
 
   quota_util_helper_.reset(new ScopedQuotaUtilHelper(
       file_system_context(),
       file_system_operation_context_.src_origin_url(),
       file_system_operation_context_.src_type()));
@@ skipping 68 matching lines @@
       delete this;
       return;
     }
   }
   file_system_operation_context_.set_src_origin_url(origin_url);
   file_system_operation_context_.set_src_type(type);
   if (!file_system_operation_context_.src_file_util())
     file_system_operation_context_.set_src_file_util(file_util);
   file_flags_ = file_flags;
 
-  GetUsageAndQuotaThenCallback(origin_url, callback_factory_.NewCallback(
-      &FileSystemOperation::DelayedOpenFileForQuota));
+  GetUsageAndQuotaThenCallback(
+      origin_url,
+      base::Bind(&FileSystemOperation::DelayedOpenFileForQuota,
+                 weak_factory_.GetWeakPtr()));
 }
 
 void FileSystemOperation::DelayedOpenFileForQuota(quota::QuotaStatusCode status,
                                                   int64 usage, int64 quota) {
   file_system_operation_context_.set_allowed_bytes_growth(quota - usage);
 
   quota_util_helper_.reset(new ScopedQuotaUtilHelper(
       file_system_context(),
       file_system_operation_context_.src_origin_url(),
       file_system_operation_context_.src_type()));
@@ skipping 35 matching lines @@
     // since it's been proxied to another thread.  We need to save the
     // cancel_operation so that when the truncate returns, it can see that it's
     // been cancelled, report it, and report that the cancel has succeeded.
     DCHECK(!cancel_operation_.get());
     cancel_operation_.swap(cancel_operation);
   }
 }
 
 void FileSystemOperation::GetUsageAndQuotaThenCallback(
     const GURL& origin_url,
-    quota::QuotaManager::GetUsageAndQuotaCallback* callback) {
+    quota::QuotaManager::GetUsageAndQuotaCallback callback) {
   quota::QuotaManagerProxy* quota_manager_proxy =
       file_system_context()->quota_manager_proxy();
   if (!quota_manager_proxy ||
       !file_system_context()->GetQuotaUtil(
           file_system_operation_context_.src_type())) {
     // If we don't have the quota manager or the requested filesystem type
     // does not support quota, we should be able to let it go.
-    callback->Run(quota::kQuotaStatusOk, 0, kint64max);
-    delete callback;
+    callback.Run(quota::kQuotaStatusOk, 0, kint64max);
     return;
   }
   DCHECK(quota_manager_proxy);
   DCHECK(quota_manager_proxy->quota_manager());
   quota_manager_proxy->quota_manager()->GetUsageAndQuota(
       file_system_operation_context_.src_origin_url(),
       FileSystemTypeToQuotaStorageType(
           file_system_operation_context_.src_type()),
       callback);
 }
@@ skipping 242 matching lines @@
     return false;
   }
   DCHECK(file_util);
   *file_util = file_system_context()->path_manager()->GetFileUtil(*type);
   DCHECK(*file_util);
 
   return true;
 }
 
 }  // namespace fileapi