[FileAPI] Drop unused expected size parameter from OpenFileSystem IPC

 * Rename FileSystemHostMsg_Open to FileSystemHostMsg_OpenFileSystem.
 * Drop |create| flag and |size| parameter.

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

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

8 files changed, 31 insertions, 26 deletions

diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc
index c8ae424..b642d84 100644
--- a/content/browser/fileapi/fileapi_message_filter.cc
+++ b/content/browser/fileapi/fileapi_message_filter.cc
@@ -166,7 +166,7 @@ bool FileAPIMessageFilter::OnMessageReceived(
   *message_was_ok = true;
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(FileAPIMessageFilter, message, *message_was_ok)
-    IPC_MESSAGE_HANDLER(FileSystemHostMsg_Open, OnOpen)
+    IPC_MESSAGE_HANDLER(FileSystemHostMsg_OpenFileSystem, OnOpenFileSystem)
     IPC_MESSAGE_HANDLER(FileSystemHostMsg_ResolveURL, OnResolveURL)
     IPC_MESSAGE_HANDLER(FileSystemHostMsg_DeleteFileSystem, OnDeleteFileSystem)
     IPC_MESSAGE_HANDLER(FileSystemHostMsg_Move, OnMove)
@@ -233,19 +233,17 @@ void FileAPIMessageFilter::BadMessageReceived() {
   BrowserMessageFilter::BadMessageReceived();
 }
 
-void FileAPIMessageFilter::OnOpen(
-    int request_id, const GURL& origin_url, fileapi::FileSystemType type,
-    int64 requested_size, bool create) {
+void FileAPIMessageFilter::OnOpenFileSystem(int request_id,
+                                            const GURL& origin_url,
+                                            fileapi::FileSystemType type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (type == fileapi::kFileSystemTypeTemporary) {
     RecordAction(UserMetricsAction("OpenFileSystemTemporary"));
   } else if (type == fileapi::kFileSystemTypePersistent) {
     RecordAction(UserMetricsAction("OpenFileSystemPersistent"));
   }
-  // TODO(kinuko): Use this mode for IPC too.
   fileapi::OpenFileSystemMode mode =
-      create ? fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT
-             : fileapi::OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT;
+      fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT;
   context_->OpenFileSystem(origin_url, type, mode, base::Bind(
       &FileAPIMessageFilter::DidOpenFileSystem, this, request_id));
 }
diff --git a/content/browser/fileapi/fileapi_message_filter.h b/content/browser/fileapi/fileapi_message_filter.h
index 59eef06..91899b5 100644
--- a/content/browser/fileapi/fileapi_message_filter.h
+++ b/content/browser/fileapi/fileapi_message_filter.h
@@ -89,11 +89,9 @@ class CONTENT_EXPORT FileAPIMessageFilter : public BrowserMessageFilter {
  private:
   typedef fileapi::FileSystemOperationRunner::OperationID OperationID;
 
-  void OnOpen(int request_id,
-              const GURL& origin_url,
-              fileapi::FileSystemType type,
-              int64 requested_size,
-              bool create);
+  void OnOpenFileSystem(int request_id,
+                        const GURL& origin_url,
+                        fileapi::FileSystemType type);
   void OnResolveURL(int request_id,
                     const GURL& filesystem_url);
   void OnDeleteFileSystem(int request_id,
diff --git a/content/child/fileapi/file_system_dispatcher.cc b/content/child/fileapi/file_system_dispatcher.cc
index 9bd39f9..f982247 100644
--- a/content/child/fileapi/file_system_dispatcher.cc
+++ b/content/child/fileapi/file_system_dispatcher.cc
@@ -181,14 +181,14 @@ bool FileSystemDispatcher::OnMessageReceived(const IPC::Message& msg) {
 }
 
 void FileSystemDispatcher::OpenFileSystem(
-    const GURL& origin_url, fileapi::FileSystemType type,
-    long long size, bool create,
+    const GURL& origin_url,
+    fileapi::FileSystemType type,
     const OpenFileSystemCallback& success_callback,
     const StatusCallback& error_callback) {
   int request_id = dispatchers_.Add(
       CallbackDispatcher::Create(success_callback, error_callback));
-  ChildThread::current()->Send(new FileSystemHostMsg_Open(
-          request_id, origin_url, type, size, create));
+  ChildThread::current()->Send(new FileSystemHostMsg_OpenFileSystem(
+      request_id, origin_url, type));
 }
 
 void FileSystemDispatcher::ResolveURL(
diff --git a/content/child/fileapi/file_system_dispatcher.h b/content/child/fileapi/file_system_dispatcher.h
index 72ecee6..9cdeb75 100644
--- a/content/child/fileapi/file_system_dispatcher.h
+++ b/content/child/fileapi/file_system_dispatcher.h
@@ -69,8 +69,6 @@ class FileSystemDispatcher : public IPC::Listener {
 
   void OpenFileSystem(const GURL& origin_url,
                       fileapi::FileSystemType type,
-                      long long size,
-                      bool create,
                       const OpenFileSystemCallback& success_callback,
                       const StatusCallback& error_callback);
   void ResolveURL(const GURL& filesystem_url,
diff --git a/content/child/fileapi/webfilesystem_impl.cc b/content/child/fileapi/webfilesystem_impl.cc
index ae3be406..3d77df9 100644
--- a/content/child/fileapi/webfilesystem_impl.cc
+++ b/content/child/fileapi/webfilesystem_impl.cc
@@ -327,7 +327,6 @@ void WebFileSystemImpl::OnWorkerRunLoopStopped() {
 void WebFileSystemImpl::openFileSystem(
     const WebKit::WebURL& storage_partition,
     WebKit::WebFileSystemType type,
-    bool create,
     WebFileSystemCallbacks callbacks) {
   int callbacks_id = RegisterCallbacks(callbacks);
   WaitableCallbackResults* waitable_results =
@@ -337,7 +336,6 @@ void WebFileSystemImpl::openFileSystem(
       &FileSystemDispatcher::OpenFileSystem,
       MakeTuple(GURL(storage_partition),
                 static_cast<fileapi::FileSystemType>(type),
-                0 /* size (not used) */, create,
                 base::Bind(&OpenFileSystemCallbackAdapter,
                            CurrentWorkerId(), callbacks_id,
                            base::Unretained(waitable_results)),
@@ -347,6 +345,14 @@ void WebFileSystemImpl::openFileSystem(
       make_scoped_ptr(waitable_results));
 }
 
+void WebFileSystemImpl::openFileSystem(
+    const WebKit::WebURL& storage_partition,
+    WebKit::WebFileSystemType type,
+    bool create_unused,
+    WebFileSystemCallbacks callbacks) {
+  openFileSystem(storage_partition, type, callbacks);
+}
+
 void WebFileSystemImpl::resolveURL(
     const WebKit::WebURL& filesystem_url,
     WebFileSystemCallbacks callbacks) {
diff --git a/content/child/fileapi/webfilesystem_impl.h b/content/child/fileapi/webfilesystem_impl.h
index 8f390ff..f16333b 100644
--- a/content/child/fileapi/webfilesystem_impl.h
+++ b/content/child/fileapi/webfilesystem_impl.h
@@ -52,8 +52,15 @@ class WebFileSystemImpl
   virtual void openFileSystem(
       const WebKit::WebURL& storage_partition,
       const WebKit::WebFileSystemType type,
-      bool create,
       WebKit::WebFileSystemCallbacks);
+
+  // TODO(tzik): Clean up this version after the interface is changed in Blink.
+  virtual void openFileSystem(
+      const WebKit::WebURL& storage_partition,
+      const WebKit::WebFileSystemType type,
+      bool create_unused,
+      WebKit::WebFileSystemCallbacks);
+
   virtual void resolveURL(
       const WebKit::WebURL& filesystem_url,
       WebKit::WebFileSystemCallbacks) OVERRIDE;
diff --git a/content/common/fileapi/file_system_messages.h b/content/common/fileapi/file_system_messages.h
index 364f943..e0af3a0 100644
--- a/content/common/fileapi/file_system_messages.h
+++ b/content/common/fileapi/file_system_messages.h
@@ -74,12 +74,10 @@ IPC_MESSAGE_CONTROL2(FileSystemMsg_DidFail,
 // File system messages sent from the child process to the browser.
 
 // WebFrameClient::openFileSystem() message.
-IPC_MESSAGE_CONTROL5(FileSystemHostMsg_Open,
+IPC_MESSAGE_CONTROL3(FileSystemHostMsg_OpenFileSystem,
                      int /* request_id */,
                      GURL /* origin_url */,
-                     fileapi::FileSystemType /* type */,
-                     int64 /* requested_size */,
-                     bool /* create */)
+                     fileapi::FileSystemType /* type */)
 
 // WevFrameClient::resolveURL() message.
 IPC_MESSAGE_CONTROL2(FileSystemHostMsg_ResolveURL,
diff --git a/content/renderer/pepper/pepper_file_system_host.cc b/content/renderer/pepper/pepper_file_system_host.cc
index 982e102..9d3638d 100644
--- a/content/renderer/pepper/pepper_file_system_host.cc
+++ b/content/renderer/pepper/pepper_file_system_host.cc
@@ -128,7 +128,7 @@ int32_t PepperFileSystemHost::OnHostMsgOpen(
   file_system_dispatcher->OpenFileSystem(
       GURL(plugin_instance->GetContainer()->element().document().url()).
           GetOrigin(),
-      file_system_type, expected_size, true /* create */,
+      file_system_type,
       base::Bind(&PepperFileSystemHost::DidOpenFileSystem,
                  weak_factory_.GetWeakPtr()),
       base::Bind(&PepperFileSystemHost::DidFailOpenFileSystem,