Remaining cleanup (base::Bind): Replacing FileUtilProxy calls with new callback

webkit/plugins/ppapi/quota_file_io.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/plugins/ppapi/quota_file_io.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/message_loop_proxy.h"
 #include "base/task.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
 #include "webkit/plugins/ppapi/resource_tracker.h"
 
+using base::FileUtilProxy;
 using base::PlatformFile;
 using base::PlatformFileError;
 using quota::StorageType;
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
 StorageType PPFileSystemTypeToQuotaStorageType(PP_FileSystemType type) {
   switch (type) {
@@ skipping 29 matching lines @@
   const bool is_will_operation_;
 };
 
 class QuotaFileIO::WriteOperation : public PendingOperationBase {
  public:
   WriteOperation(QuotaFileIO* quota_io,
                  bool is_will_operation,
                  int64_t offset,
                  const char* buffer,
                  int32_t bytes_to_write,
-                 WriteCallback* callback)
+                 const WriteCallback& callback)
       : PendingOperationBase(quota_io, is_will_operation),
         offset_(offset),
         bytes_to_write_(bytes_to_write),
         callback_(callback),
         finished_(false),
         status_(base::PLATFORM_FILE_OK),
         bytes_written_(0),
-        callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
-        runnable_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+        weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
     if (!is_will_operation) {
       // TODO(kinuko): check the API convention if we really need to keep a
       // copy of the buffer during the async write operations.
       buffer_.reset(new char[bytes_to_write]);
       memcpy(buffer_.get(), buffer, bytes_to_write);
     }
   }
   virtual ~WriteOperation() {}
   virtual void Run() OVERRIDE {
     DCHECK(quota_io_);
     if (quota_io_->CheckIfExceedsQuota(offset_ + bytes_to_write_)) {
       DidFail(base::PLATFORM_FILE_ERROR_NO_SPACE);
       return;
     }
     if (is_will_operation_) {
       // Assuming the write will succeed.
       DidFinish(base::PLATFORM_FILE_OK, bytes_to_write_);
       return;
     }
     DCHECK(buffer_.get());
 
     PluginDelegate* plugin_delegate = quota_io_->GetPluginDelegate();
     if (!plugin_delegate) {
       DidFail(base::PLATFORM_FILE_ERROR_FAILED);
       return;
     }
 
-    if (!base::FileUtilProxy::Write(
+    if (!FileUtilProxy::Write(
             plugin_delegate->GetFileThreadMessageLoopProxy(),
             quota_io_->file_, offset_, buffer_.get(), bytes_to_write_,
-            callback_factory_.NewCallback(&WriteOperation::DidFinish))) {
+            base::Bind(&WriteOperation::DidFinish,
+                       weak_ptr_factory_.GetWeakPtr()))) {
       DidFail(base::PLATFORM_FILE_ERROR_FAILED);
       return;
     }
   }
 
   virtual void DidFail(PlatformFileError error) OVERRIDE {
     DidFinish(error, 0);
   }
 
   bool finished() const { return finished_; }
 
   virtual void WillRunCallback() {
     base::MessageLoopProxy::current()->PostTask(
-        FROM_HERE, runnable_factory_.NewRunnableMethod(
-            &WriteOperation::RunCallback));
+        FROM_HERE,
+        base::Bind(&WriteOperation::RunCallback,
+                   weak_ptr_factory_.GetWeakPtr()));
   }
 
  private:
   void DidFinish(PlatformFileError status, int bytes_written) {
     finished_ = true;
     status_ = status;
     bytes_written_ = bytes_written;
     int64_t max_offset =
         (status != base::PLATFORM_FILE_OK) ? 0 : offset_ + bytes_written;
     // This may delete itself by calling RunCallback.
     quota_io_->DidWrite(this, max_offset);
   }
 
   virtual void RunCallback() {
-    DCHECK(callback_.get());
-    callback_->Run(status_, bytes_written_);
-    callback_.reset();
-    delete this;
+    DCHECK(!callback_.is_null());
+    callback_.Run(status_, bytes_written_);
   }
 
   const int64_t offset_;
   scoped_array<char> buffer_;
   const int32_t bytes_to_write_;
-  scoped_ptr<WriteCallback> callback_;
+  WriteCallback callback_;
   bool finished_;
   PlatformFileError status_;
   int64_t bytes_written_;
-  base::ScopedCallbackFactory<WriteOperation> callback_factory_;
-  ScopedRunnableMethodFactory<WriteOperation> runnable_factory_;
+  base::WeakPtrFactory<WriteOperation> weak_ptr_factory_;
 };
 
 class QuotaFileIO::SetLengthOperation : public PendingOperationBase {
  public:
   SetLengthOperation(QuotaFileIO* quota_io,
                      bool is_will_operation,
                      int64_t length,
-                     StatusCallback* callback)
+                     const StatusCallback& callback)
       : PendingOperationBase(quota_io, is_will_operation),
         length_(length),
         callback_(callback),
-        callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
+        weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
 
   virtual ~SetLengthOperation() {}
 
   virtual void Run() OVERRIDE {
     DCHECK(quota_io_);
     if (quota_io_->CheckIfExceedsQuota(length_)) {
       DidFail(base::PLATFORM_FILE_ERROR_NO_SPACE);
       return;
     }
     if (is_will_operation_) {
       DidFinish(base::PLATFORM_FILE_OK);
       return;
     }
 
     PluginDelegate* plugin_delegate = quota_io_->GetPluginDelegate();
     if (!plugin_delegate) {
       DidFail(base::PLATFORM_FILE_ERROR_FAILED);
       return;
     }
 
-    if (!base::FileUtilProxy::Truncate(
+    if (!FileUtilProxy::PostFileTaskAndReplyStatus<bool, PlatformFileError>(
             plugin_delegate->GetFileThreadMessageLoopProxy(),
-            quota_io_->file_, length_,
-            callback_factory_.NewCallback(&SetLengthOperation::DidFinish))) {
+            FROM_HERE,
+            base::Bind(&base::TruncatePlatformFile,
+                       quota_io_->file_, length_),
+            base::Bind(&SetLengthOperation::DidFinish,
+                       weak_ptr_factory_.GetWeakPtr()))) {
       DidFail(base::PLATFORM_FILE_ERROR_FAILED);
       return;
     }
   }
 
   virtual void DidFail(PlatformFileError error) OVERRIDE {
     DidFinish(error);
   }
 
  private:
   void DidFinish(PlatformFileError status) {
     quota_io_->DidSetLength(status, length_);
-    DCHECK(callback_.get());
-    callback_->Run(status);
-    callback_.reset();
-    delete this;
+    DCHECK(!callback_.is_null());
+    callback_.Run(status);
   }
 
   int64_t length_;
-  scoped_ptr<StatusCallback> callback_;
-  base::ScopedCallbackFactory<SetLengthOperation> callback_factory_;
+  StatusCallback callback_;
+  base::WeakPtrFactory<SetLengthOperation> weak_ptr_factory_;
 };
 
 // QuotaFileIO --------------------------------------------------------------
 
 QuotaFileIO::QuotaFileIO(
     PP_Instance instance,
     PlatformFile file,
     const GURL& file_url,
     PP_FileSystemType type)
     : pp_instance_(instance),
       file_(file),
       file_url_(file_url),
       storage_type_(PPFileSystemTypeToQuotaStorageType(type)),
       cached_file_size_(0),
       cached_available_space_(0),
       outstanding_quota_queries_(0),
       outstanding_errors_(0),
       max_written_offset_(0),
       inflight_operations_(0),
-      callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   DCHECK_NE(base::kInvalidPlatformFileValue, file_);
   DCHECK_NE(quota::kStorageTypeUnknown, storage_type_);
 }
 
 QuotaFileIO::~QuotaFileIO() {
   // Note that this doesn't dispatch pending callbacks.
   STLDeleteContainerPointers(pending_operations_.begin(),
                              pending_operations_.end());
   STLDeleteContainerPointers(pending_callbacks_.begin(),
                              pending_callbacks_.end());
 }
 
 bool QuotaFileIO::Write(
     int64_t offset, const char* buffer, int32_t bytes_to_write,
-    WriteCallback* callback) {
+    const WriteCallback& callback) {
   if (bytes_to_write <= 0) {
-    delete callback;
     return false;
   }
   WriteOperation* op = new WriteOperation(
       this, false, offset, buffer, bytes_to_write, callback);
   return RegisterOperationForQuotaChecks(op);
 }
 
-bool QuotaFileIO::SetLength(int64_t length, StatusCallback* callback) {
+bool QuotaFileIO::SetLength(int64_t length, const StatusCallback& callback) {
   DCHECK(pending_operations_.empty());
   SetLengthOperation* op = new SetLengthOperation(
       this, false, length, callback);
   return RegisterOperationForQuotaChecks(op);
 }
 
 bool QuotaFileIO::WillWrite(
-    int64_t offset, int32_t bytes_to_write, WriteCallback* callback) {
+    int64_t offset, int32_t bytes_to_write, const WriteCallback& callback) {
   WriteOperation* op = new WriteOperation(
       this, true, offset, NULL, bytes_to_write, callback);
   return RegisterOperationForQuotaChecks(op);
 }
 
-bool QuotaFileIO::WillSetLength(int64_t length, StatusCallback* callback) {
+bool QuotaFileIO::WillSetLength(
+    int64_t length, const StatusCallback& callback) {
   DCHECK(pending_operations_.empty());
   SetLengthOperation* op = new SetLengthOperation(this, true, length, callback);
   return RegisterOperationForQuotaChecks(op);
 }
 
 PluginDelegate* QuotaFileIO::GetPluginDelegate() const {
   PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance_);
   if (instance)
     return instance->delegate();
   return NULL;
 }
 
 bool QuotaFileIO::RegisterOperationForQuotaChecks(
     PendingOperationBase* op_ptr) {
   scoped_ptr<PendingOperationBase> op(op_ptr);
   if (pending_operations_.empty()) {
     // This is the first pending quota check. Run querying the file size
     // and available space.
     outstanding_quota_queries_ = 0;
     outstanding_errors_ = 0;
 
     PluginDelegate* plugin_delegate = GetPluginDelegate();
     if (!plugin_delegate)
       return false;
 
     // Query the file size.
     ++outstanding_quota_queries_;
-    if (!base::FileUtilProxy::GetFileInfoFromPlatformFile(
+    if (!FileUtilProxy::GetFileInfoFromPlatformFile(
             plugin_delegate->GetFileThreadMessageLoopProxy(), file_,
-            callback_factory_.NewCallback(
-                &QuotaFileIO::DidQueryInfoForQuota))) {
+            base::Bind(&QuotaFileIO::DidQueryInfoForQuota,
+                       weak_ptr_factory_.GetWeakPtr()))) {
       // This makes the call fail synchronously; we do not fire the callback
       // here but just delete the operation and return false.
       return false;
     }
 
     // Query the current available space.
     ++outstanding_quota_queries_;
     plugin_delegate->QueryAvailableSpace(
         GURL(file_url_.path()).GetOrigin(), storage_type_,
         base::Bind(&QuotaFileIO::DidQueryAvailableSpace,
@@ skipping 88 matching lines @@
 
 
   PluginDelegate* plugin_delegate = GetPluginDelegate();
   if (plugin_delegate)
     plugin_delegate->DidUpdateFile(file_url_, delta);
   inflight_operations_ = 0;
 }
 
 }  // namespace ppapi
 }  // namespace webkit