[FileAPI] Add file open ID and close callback

content/browser/fileapi/fileapi_message_filter.h

Index: content/browser/fileapi/fileapi_message_filter.h
diff --git a/content/browser/fileapi/fileapi_message_filter.h b/content/browser/fileapi/fileapi_message_filter.h
index a3eea1eba182dbd9bc791d10f1dc1ebb8ccd2833..1792ca4aaecd81d3e807ab6dc5e42f15c32b9e71 100644
--- a/content/browser/fileapi/fileapi_message_filter.h
+++ b/content/browser/fileapi/fileapi_message_filter.h
@@ -110,7 +110,7 @@ class FileAPIMessageFilter : public BrowserMessageFilter {
                    const base::Time& last_modified_time);
   void OnCancel(int request_id, int request_to_cancel);
   void OnOpenFile(int request_id, const GURL& path, int file_flags);
-  void OnNotifyCloseFile(const GURL& path);
+  void OnNotifyCloseFile(int file_open_id);
   void OnWillUpdate(const GURL& path);
   void OnDidUpdate(const GURL& path, int64 delta);
   void OnSyncGetPlatformPath(const GURL& path,
@@ -143,6 +143,7 @@ class FileAPIMessageFilter : public BrowserMessageFilter {
                    const GURL& path,
                    base::PlatformFileError result,
                    base::PlatformFile file,
+                   const base::Closure& close_callback,
                    base::ProcessHandle peer_handle);
   void DidWrite(int request_id,
                 base::PlatformFileError result,
@@ -196,9 +197,12 @@ class FileAPIMessageFilter : public BrowserMessageFilter {
   std::map<int, scoped_refptr<webkit_blob::ShareableFileReference> >
       in_transit_snapshot_files_;
 
-  // Keep track of file system file URLs opened by OpenFile() in this process.
+  // Keep track of file system file opened by OpenFile() in this process.
   // Need to close all of them when the renderer process dies.
-  std::multiset<GURL> open_filesystem_urls_;
+  std::map<int, base::Closure> close_file_callbacks_;

[kinuko, 2013/04/25 05:55:52]

If we don't have strong reason not to do so can we use base::IDMap?

[tzik, 2013/04/25 06:43:46]

Done.

+
+  // Sequence number to track opened file.
+  int next_file_open_id_;
 
   DISALLOW_COPY_AND_ASSIGN(FileAPIMessageFilter);
 };