[FileAPI] Add file open ID and close callback

content/renderer/pepper/pepper_plugin_delegate_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 "content/renderer/pepper/pepper_plugin_delegate_impl.h"
 
 #include <cmath>
 #include <cstddef>
 #include <map>
 #include <queue>
@@ skipping 237 matching lines @@
   virtual bool HandleMouseLockedInputEvent(
       const WebKit::WebMouseEvent &event) OVERRIDE {
     plugin_->HandleMouseLockedInputEvent(event);
     return true;
   }
 
  private:
   webkit::ppapi::PluginInstance* plugin_;
 };
 
+void DoNotifyCloseFile(int file_open_id, base::PlatformFileError /* unused */) {
+  ChildThread::current()->file_system_dispatcher()->NotifyCloseFile(
+      file_open_id);
+}
+
 class AsyncOpenFileSystemURLCallbackTranslator
     : public fileapi::FileSystemCallbackDispatcher {
  public:
   AsyncOpenFileSystemURLCallbackTranslator(
       const webkit::ppapi::PluginDelegate::AsyncOpenFileSystemURLCallback&
-          callback,
-      const webkit::ppapi::PluginDelegate::NotifyCloseFileCallback&
-          close_file_callback)
-    : callback_(callback),
-      close_file_callback_(close_file_callback) {
+          callback)
+    : callback_(callback) {
   }
 
   virtual ~AsyncOpenFileSystemURLCallbackTranslator() {}
 
   virtual void DidSucceed() OVERRIDE {
     NOTREACHED();
   }
   virtual void DidReadMetadata(
       const base::PlatformFileInfo& file_info,
       const base::FilePath& platform_path) OVERRIDE {
@@ skipping 20 matching lines @@
                   base::PassPlatformFile(&invalid_file),
                   quota::kQuotaLimitTypeUnknown,
                   webkit::ppapi::PluginDelegate::NotifyCloseFileCallback());
   }
 
   virtual void DidWrite(int64 bytes, bool complete) OVERRIDE {
     NOTREACHED();
   }
 
   virtual void DidOpenFile(base::PlatformFile file,
+                           int file_open_id,
                            quota::QuotaLimitType quota_policy) OVERRIDE {
     callback_.Run(base::PLATFORM_FILE_OK,
                   base::PassPlatformFile(&file),
                   quota_policy,
-                  close_file_callback_);
+                  base::Bind(&DoNotifyCloseFile, file_open_id));
     // Make sure we won't leak file handle if the requester has died.
     if (file != base::kInvalidPlatformFileValue) {
       base::FileUtilProxy::Close(
           RenderThreadImpl::current()->GetFileThreadMessageLoopProxy(), file,
-          close_file_callback_);
+          base::Bind(&DoNotifyCloseFile, file_open_id));
     }
   }
 
  private:
   webkit::ppapi::PluginDelegate::AsyncOpenFileSystemURLCallback callback_;
-  webkit::ppapi::PluginDelegate::NotifyCloseFileCallback close_file_callback_;
 };
 
-void DoNotifyCloseFile(const GURL& path, base::PlatformFileError /* unused */) {
-  ChildThread::current()->file_system_dispatcher()->NotifyCloseFile(path);
-}
-
 void CreateHostForInProcessModule(RenderViewImpl* render_view,
                                   webkit::ppapi::PluginModule* module,
                                   const webkit::WebPluginInfo& webplugin_info) {
   // First time an in-process plugin was used, make a host for it.
   const PepperPluginInfo* info =
       PepperPluginRegistry::GetInstance()->GetInfoForPlugin(webplugin_info);
   DCHECK(!info->is_out_of_process);
 
   ppapi::PpapiPermissions perms(
       PepperPluginRegistry::GetInstance()->GetInfoForPlugin(
@@ skipping 792 matching lines @@
 
 bool PepperPluginDelegateImpl::AsyncOpenFileSystemURL(
     const GURL& path,
     int flags,
     const AsyncOpenFileSystemURLCallback& callback) {
 
   FileSystemDispatcher* file_system_dispatcher =
       ChildThread::current()->file_system_dispatcher();
   return file_system_dispatcher->OpenFile(path, flags,
       new AsyncOpenFileSystemURLCallbackTranslator(
-          callback,
-          base::Bind(&DoNotifyCloseFile, path)));
+          callback));
 }
 
 void PepperPluginDelegateImpl::SyncGetFileSystemPlatformPath(
     const GURL& url, base::FilePath* platform_path) {
   RenderThreadImpl::current()->Send(new FileSystemHostMsg_SyncGetPlatformPath(
       url, platform_path));
 }
 
 scoped_refptr<base::MessageLoopProxy>
 PepperPluginDelegateImpl::GetFileThreadMessageLoopProxy() {
@@ skipping 489 matching lines @@
       should_close_source);
 }
 
 bool PepperPluginDelegateImpl::IsRunningInProcess(PP_Instance instance) const {
   RendererPpapiHostImpl* host =
       RendererPpapiHostImpl::GetForPPInstance(instance);
   return host && host->IsRunningInProcess();
 }
 
 }  // namespace content