base::Bind: Convert FileUtilProxy::GetFileInfoCallback.

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"
+#include "base/message_loop_proxy.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::PlatformFile;
 using base::PlatformFileError;
 using quota::StorageType;
 
 namespace webkit {
@@ skipping 195 matching lines @@
     : 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)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(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());
@@ skipping 48 matching lines @@
     outstanding_errors_ = 0;
 
     PluginDelegate* plugin_delegate = GetPluginDelegate();
     if (!plugin_delegate)
       return false;
 
     // Query the file size.
     ++outstanding_quota_queries_;
     if (!base::FileUtilProxy::GetFileInfoFromPlatformFile(
             plugin_delegate->GetFileThreadMessageLoopProxy(), file_,
-            callback_factory_.NewCallback(
-                &QuotaFileIO::DidQueryInfoForQuota))) {
+            base::Bind(&QuotaFileIO::DidQueryInfoForQuota,
+                       weak_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,
-                   weak_ptr_factory_.GetWeakPtr()));
+                   weak_factory_.GetWeakPtr()));
   }
   pending_operations_.push_back(op.release());
   return true;
 }
 
 void QuotaFileIO::DidQueryInfoForQuota(
     base::PlatformFileError error_code,
     const base::PlatformFileInfo& file_info) {
   if (error_code != base::PLATFORM_FILE_OK)
     ++outstanding_errors_;
@@ skipping 77 matching lines @@
 
 
   PluginDelegate* plugin_delegate = GetPluginDelegate();
   if (plugin_delegate)
     plugin_delegate->DidUpdateFile(file_url_, delta);
   inflight_operations_ = 0;
 }
 
 }  // namespace ppapi
 }  // namespace webkit