fileapi: Remove FilePath parameter from FileSystemMsg_DidReadMetadata

The parameter is no longer used.

BUG=248480
TEST=none
R=aedla@chromium.org, cevans@chromium.org, kinuko@chromium.org

Review URL: https://codereview.chromium.org/17030005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206897 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 24 insertions, 25 deletions

diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc
index ff11e8c..2179a7a 100644
--- a/content/browser/fileapi/fileapi_message_filter.cc
+++ b/content/browser/fileapi/fileapi_message_filter.cc
@@ -597,9 +597,8 @@ void FileAPIMessageFilter::DidGetMetadata(
     int request_id,
     base::PlatformFileError result,
     const base::PlatformFileInfo& info) {
-  // TODO(satorux): Remove the third parameter. crbug.com/248480
   if (result == base::PLATFORM_FILE_OK)
-    Send(new FileSystemMsg_DidReadMetadata(request_id, info, base::FilePath()));
+    Send(new FileSystemMsg_DidReadMetadata(request_id, info));
   else
     Send(new FileSystemMsg_DidFail(request_id, result));
   operations_.erase(request_id);
diff --git a/content/child/fileapi/file_system_dispatcher.cc b/content/child/fileapi/file_system_dispatcher.cc
index 29ccc2a..31f14ec 100644
--- a/content/child/fileapi/file_system_dispatcher.cc
+++ b/content/child/fileapi/file_system_dispatcher.cc
@@ -35,6 +35,13 @@ class FileSystemDispatcher::CallbackDispatcher {
     dispatcher->error_callback_ = error_callback;
     return dispatcher;
   }
+  static CallbackDispatcher* Create(const CreateSnapshotFileCallback& callback,
+                                    const StatusCallback& error_callback) {
+    CallbackDispatcher* dispatcher = new CallbackDispatcher;
+    dispatcher->snapshot_callback_ = callback;
+    dispatcher->error_callback_ = error_callback;
+    return dispatcher;
+  }
   static CallbackDispatcher* Create(const ReadDirectoryCallback& callback,
                                     const StatusCallback& error_callback) {
     CallbackDispatcher* dispatcher = new CallbackDispatcher;
@@ -75,15 +82,14 @@ class FileSystemDispatcher::CallbackDispatcher {
   }
 
   void DidReadMetadata(
-      const base::PlatformFileInfo& file_info,
-      const base::FilePath& platform_path) {
-    metadata_callback_.Run(file_info, platform_path);
+      const base::PlatformFileInfo& file_info) {
+    metadata_callback_.Run(file_info);
   }
 
   void DidCreateSnapshotFile(
       const base::PlatformFileInfo& file_info,
       const base::FilePath& platform_path) {
-    metadata_callback_.Run(file_info, platform_path);
+    snapshot_callback_.Run(file_info, platform_path);
   }
 
   void DidReadDirectory(
@@ -112,6 +118,7 @@ class FileSystemDispatcher::CallbackDispatcher {
 
   StatusCallback status_callback_;
   MetadataCallback metadata_callback_;
+  CreateSnapshotFileCallback snapshot_callback_;
   ReadDirectoryCallback directory_callback_;
   OpenFileSystemCallback filesystem_callback_;
   WriteCallback write_callback_;
@@ -406,11 +413,10 @@ void FileSystemDispatcher::OnDidSucceed(int request_id) {
 }
 
 void FileSystemDispatcher::OnDidReadMetadata(
-    int request_id, const base::PlatformFileInfo& file_info,
-    const base::FilePath& platform_path) {
+    int request_id, const base::PlatformFileInfo& file_info) {
   CallbackDispatcher* dispatcher = dispatchers_.Lookup(request_id);
   DCHECK(dispatcher);
-  dispatcher->DidReadMetadata(file_info, platform_path);
+  dispatcher->DidReadMetadata(file_info);
   dispatchers_.Remove(request_id);
 }
 
diff --git a/content/child/fileapi/file_system_dispatcher.h b/content/child/fileapi/file_system_dispatcher.h
index 1f6d061..10e0438 100644
--- a/content/child/fileapi/file_system_dispatcher.h
+++ b/content/child/fileapi/file_system_dispatcher.h
@@ -37,9 +37,10 @@ class FileSystemDispatcher : public IPC::Listener {
  public:
   typedef base::Callback<void(base::PlatformFileError error)> StatusCallback;
   typedef base::Callback<void(
+      const base::PlatformFileInfo& file_info)> MetadataCallback;
+  typedef base::Callback<void(
       const base::PlatformFileInfo& file_info,
-      const base::FilePath& platform_path)> MetadataCallback;
-  typedef MetadataCallback CreateSnapshotFileCallback;
+      const base::FilePath& platform_path)> CreateSnapshotFileCallback;
   typedef base::Callback<void(
       const std::vector<fileapi::DirectoryEntry>& entries,
       bool has_more)> ReadDirectoryCallback;
@@ -132,8 +133,7 @@ class FileSystemDispatcher : public IPC::Listener {
                            const GURL& root);
   void OnDidSucceed(int request_id);
   void OnDidReadMetadata(int request_id,
-                         const base::PlatformFileInfo& file_info,
-                         const base::FilePath& platform_path);
+                         const base::PlatformFileInfo& file_info);
   void OnDidCreateSnapshotFile(int request_id,
                                const base::PlatformFileInfo& file_info,
                                const base::FilePath& platform_path);
diff --git a/content/child/fileapi/webfilesystem_callback_adapters.cc b/content/child/fileapi/webfilesystem_callback_adapters.cc
index b790dcc..5ea4b3c 100644
--- a/content/child/fileapi/webfilesystem_callback_adapters.cc
+++ b/content/child/fileapi/webfilesystem_callback_adapters.cc
@@ -38,11 +38,9 @@ void FileStatusCallbackAdapter(
 
 void ReadMetadataCallbackAdapter(
     WebKit::WebFileSystemCallbacks* callbacks,
-    const base::PlatformFileInfo& file_info,
-    const base::FilePath& platform_path) {
+    const base::PlatformFileInfo& file_info) {
   WebFileInfo web_file_info;
   webkit_glue::PlatformFileInfoToWebFileInfo(file_info, &web_file_info);
-  web_file_info.platformPath = webkit_base::FilePathToWebString(platform_path);
   callbacks->didReadMetadata(web_file_info);
 }
 
diff --git a/content/child/fileapi/webfilesystem_callback_adapters.h b/content/child/fileapi/webfilesystem_callback_adapters.h
index 408d71d..850159e 100644
--- a/content/child/fileapi/webfilesystem_callback_adapters.h
+++ b/content/child/fileapi/webfilesystem_callback_adapters.h
@@ -26,8 +26,7 @@ void FileStatusCallbackAdapter(
 
 void ReadMetadataCallbackAdapter(
     WebKit::WebFileSystemCallbacks* callbacks,
-    const base::PlatformFileInfo& file_info,
-    const base::FilePath& platform_path);
+    const base::PlatformFileInfo& file_info);
 
 void CreateSnapshotFileCallbackAdapter(
     WebKit::WebFileSystemCallbacks* callbacks,
diff --git a/content/common/fileapi/file_system_messages.h b/content/common/fileapi/file_system_messages.h
index 317d0b9..37badb0 100644
--- a/content/common/fileapi/file_system_messages.h
+++ b/content/common/fileapi/file_system_messages.h
@@ -33,10 +33,9 @@ IPC_MESSAGE_CONTROL3(FileSystemMsg_DidOpenFileSystem,
 // WebFileSystem response messages.
 IPC_MESSAGE_CONTROL1(FileSystemMsg_DidSucceed,
                      int /* request_id */)
-IPC_MESSAGE_CONTROL3(FileSystemMsg_DidReadMetadata,
+IPC_MESSAGE_CONTROL2(FileSystemMsg_DidReadMetadata,
                      int /* request_id */,
-                     base::PlatformFileInfo,
-                     base::FilePath /* true platform path, where possible */)
+                     base::PlatformFileInfo)
 IPC_MESSAGE_CONTROL3(FileSystemMsg_DidCreateSnapshotFile,
                      int /* request_id */,
                      base::PlatformFileInfo,
diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h
index acd7310..962c78b 100644
--- a/webkit/plugins/ppapi/plugin_delegate.h
+++ b/webkit/plugins/ppapi/plugin_delegate.h
@@ -505,8 +505,7 @@ class PluginDelegate {
       const std::vector<fileapi::DirectoryEntry>& entries,
       bool has_more)> ReadDirectoryCallback;
   typedef base::Callback<void(
-      const base::PlatformFileInfo& file_info,
-      const base::FilePath& platform_path)> MetadataCallback;
+      const base::PlatformFileInfo& file_info)> MetadataCallback;
 
   virtual bool MakeDirectory(
       const GURL& path,
diff --git a/webkit/plugins/ppapi/ppb_file_ref_impl.cc b/webkit/plugins/ppapi/ppb_file_ref_impl.cc
index fbdd960..540c1d2 100644
--- a/webkit/plugins/ppapi/ppb_file_ref_impl.cc
+++ b/webkit/plugins/ppapi/ppb_file_ref_impl.cc
@@ -155,8 +155,7 @@ void DidReadMetadata(
     scoped_refptr< ::ppapi::TrackedCallback> callback,
     linked_ptr<PP_FileInfo> info,
     PP_FileSystemType file_system_type,
-    const base::PlatformFileInfo& file_info,
-    const base::FilePath& unused) {
+    const base::PlatformFileInfo& file_info) {
   if (!TrackedCallback::IsPending(callback))
     return;