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

webkit/plugins/ppapi/ppb_file_io_impl.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/ppb_file_io_impl.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/file_util_proxy.h"
@@ skipping 33 matching lines @@
 PPB_FileIO_Impl::CallbackEntry::CallbackEntry(const CallbackEntry& entry)
     : callback(entry.callback),
       read_buffer(entry.read_buffer) {
 }
 
 PPB_FileIO_Impl::CallbackEntry::~CallbackEntry() {
 }
 
 PPB_FileIO_Impl::PPB_FileIO_Impl(PP_Instance instance)
     : Resource(instance),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
       file_(base::kInvalidPlatformFileValue),
       file_system_type_(PP_FILESYSTEMTYPE_INVALID),
       pending_op_(OPERATION_NONE),
       info_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
 }
 
 PPB_FileIO_Impl::~PPB_FileIO_Impl() {
   Close();
 }
 
 PPB_FileIO_API* PPB_FileIO_Impl::AsPPB_FileIO_API() {
   return this;
 }
 
@@ skipping 21 matching lines @@
   if (file_system_type_ != PP_FILESYSTEMTYPE_LOCALPERSISTENT &&
       file_system_type_ != PP_FILESYSTEMTYPE_LOCALTEMPORARY &&
       file_system_type_ != PP_FILESYSTEMTYPE_EXTERNAL)
     return PP_ERROR_FAILED;
 
   if (file_ref->HasValidFileSystem()) {
     file_system_url_ = file_ref->GetFileSystemURL();
     if (!plugin_delegate->AsyncOpenFileSystemURL(
             file_system_url_, flags,
             base::Bind(&PPB_FileIO_Impl::AsyncOpenFileCallback,
-                       weak_ptr_factory_.GetWeakPtr())))
+                       weak_factory_.GetWeakPtr())))
       return PP_ERROR_FAILED;
   } else {
     if (file_system_type_ != PP_FILESYSTEMTYPE_EXTERNAL)
       return PP_ERROR_FAILED;
     if (!plugin_delegate->AsyncOpenFile(
             file_ref->GetSystemPath(), flags,
             base::Bind(&PPB_FileIO_Impl::AsyncOpenFileCallback,
-                       weak_ptr_factory_.GetWeakPtr())))
+                       weak_factory_.GetWeakPtr())))
       return PP_ERROR_FAILED;
   }
 
   RegisterCallback(OPERATION_EXCLUSIVE, callback, NULL);
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_FileIO_Impl::Query(PP_FileInfo* info,
                                PP_CompletionCallback callback) {
   int32_t rv = CommonCallValidation(true, OPERATION_EXCLUSIVE, callback);
@@ skipping 361 matching lines @@
   if (error_code != base::PLATFORM_FILE_OK) {
     RunAndRemoveFirstPendingCallback(
         PlatformFileErrorToPepperError(error_code));
   } else {
     RunAndRemoveFirstPendingCallback(bytes_written);
   }
 }
 
 }  // namespace ppapi
 }  // namespace webkit