base::Bind: Final cleanups in webkit/quota.

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/memory/scoped_callback_factory.h"
@@ skipping 55 matching lines @@
                  const char* buffer,
                  int32_t bytes_to_write,
                  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),
-        ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
-        ALLOW_THIS_IN_INITIALIZER_LIST(runnable_factory_(this)) {
+        ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(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.
+      // 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;
@@ skipping 22 matching lines @@
   }
 
   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_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_EQ(false, callback_.is_null());
     callback_.Run(status_, bytes_written_);
     delete this;
   }
 
   const int64_t offset_;
   scoped_array<char> buffer_;
   const int32_t bytes_to_write_;
   WriteCallback callback_;
   bool finished_;
   PlatformFileError status_;
   int64_t bytes_written_;
   base::WeakPtrFactory<WriteOperation> weak_factory_;
-  ScopedRunnableMethodFactory<WriteOperation> runnable_factory_;
 };
 
 class QuotaFileIO::SetLengthOperation : public PendingOperationBase {
  public:
   SetLengthOperation(QuotaFileIO* quota_io,
                      bool is_will_operation,
                      int64_t length,
                      const StatusCallback& callback)
       : PendingOperationBase(quota_io, is_will_operation),
         length_(length),
@@ skipping 235 matching lines @@
 
 
   PluginDelegate* plugin_delegate = GetPluginDelegate();
   if (plugin_delegate)
     plugin_delegate->DidUpdateFile(file_url_, delta);
   inflight_operations_ = 0;
 }
 
 }  // namespace ppapi
 }  // namespace webkit