Notify CloseFile from Pepper to FileSystem.

webkit/plugins/ppapi/ppb_file_io_impl.cc

 // Copyright (c) 2012 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/callback_helpers.h"
 #include "base/file_util.h"
 #include "base/file_util_proxy.h"
 #include "base/message_loop_proxy.h"
 #include "base/platform_file.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "ppapi/c/ppb_file_io.h"
 #include "ppapi/c/trusted/ppb_file_io_trusted.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
@@ skipping 38 matching lines @@
     return PP_ERROR_BADARGUMENT;
 
   PluginDelegate* plugin_delegate = GetPluginDelegate();
   if (!plugin_delegate)
     return PP_ERROR_BADARGUMENT;
 
   if (file_ref->HasValidFileSystem()) {
     file_system_url_ = file_ref->GetFileSystemURL();
     if (!plugin_delegate->AsyncOpenFileSystemURL(
             file_system_url_, flags,
-            base::Bind(&PPB_FileIO_Impl::ExecutePlatformOpenFileCallback,
-                       weak_factory_.GetWeakPtr())))
+            base::Bind(
+                &PPB_FileIO_Impl::ExecutePlatformOpenFileSystemURLCallback,
+                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::ExecutePlatformOpenFileCallback,
                        weak_factory_.GetWeakPtr())))
       return PP_ERROR_FAILED;
   }
@@ skipping 125 matching lines @@
     return PP_ERROR_FAILED;
 
   RegisterCallback(OPERATION_EXCLUSIVE, callback, NULL, NULL);
   return PP_OK_COMPLETIONPENDING;
 }
 
 void PPB_FileIO_Impl::Close() {
   PluginDelegate* plugin_delegate = GetPluginDelegate();
   if (file_ != base::kInvalidPlatformFileValue && plugin_delegate) {
     base::FileUtilProxy::Close(
-        plugin_delegate->GetFileThreadMessageLoopProxy(), file_,
-        base::FileUtilProxy::StatusCallback());
+        plugin_delegate->GetFileThreadMessageLoopProxy(),
+        file_,
+        base::ResetAndReturn(&notify_close_file_callback_));
     file_ = base::kInvalidPlatformFileValue;
     quota_file_io_.reset();
   }
 }
 
 int32_t PPB_FileIO_Impl::GetOSFileDescriptor() {
 #if defined(OS_POSIX)
   return file_;
 #elif defined(OS_WIN)
   return reinterpret_cast<uintptr_t>(file_);
@@ skipping 61 matching lines @@
   if (file_ != base::kInvalidPlatformFileValue &&
       (file_system_type_ == PP_FILESYSTEMTYPE_LOCALTEMPORARY ||
        file_system_type_ == PP_FILESYSTEMTYPE_LOCALPERSISTENT)) {
     quota_file_io_.reset(new QuotaFileIO(
         pp_instance(), file_, file_system_url_, file_system_type_));
   }
 
   ExecuteOpenFileCallback(::ppapi::PlatformFileErrorToPepperError(error_code));
 }
 
+void PPB_FileIO_Impl::ExecutePlatformOpenFileSystemURLCallback(
+    base::PlatformFileError error_code,
+    base::PassPlatformFile file,
+    const PluginDelegate::NotifyCloseFileCallback& callback) {
+  if (error_code == base::PLATFORM_FILE_OK)
+    notify_close_file_callback_ = callback;
+  ExecutePlatformOpenFileCallback(error_code, file);
+}
+
 void PPB_FileIO_Impl::ExecutePlatformQueryCallback(
     base::PlatformFileError error_code,
     const base::PlatformFileInfo& file_info) {
   PP_FileInfo pp_info;
   pp_info.size = file_info.size;
   pp_info.creation_time = TimeToPPTime(file_info.creation_time);
   pp_info.last_access_time = TimeToPPTime(file_info.last_accessed);
   pp_info.last_modified_time = TimeToPPTime(file_info.last_modified);
   pp_info.system_type = file_system_type_;
   if (file_info.is_directory)
@@ skipping 32 matching lines @@
   if (error_code != base::PLATFORM_FILE_OK) {
     RunAndRemoveFirstPendingCallback(
         ::ppapi::PlatformFileErrorToPepperError(error_code));
   } else {
     RunAndRemoveFirstPendingCallback(bytes_written);
   }
 }
 
 }  // namespace ppapi
 }  // namespace webkit