Files.app: Let the file browser private filesystem APIs use the auto-generated helper classes.

chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc

Index: chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
index f595038fad9b34d7c5b9a44d573975daab33ddf4..1f9b8e96c38672b1bbaa8ebbd88c495d50bee652 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
@@ -256,14 +256,6 @@ void CancelCopyOnIOThread(
 
 }  // namespace
 
-FileBrowserPrivateRequestFileSystemFunction::
-    FileBrowserPrivateRequestFileSystemFunction() {
-}
-
-FileBrowserPrivateRequestFileSystemFunction::
-    ~FileBrowserPrivateRequestFileSystemFunction() {
-}
-
 void FileBrowserPrivateRequestFileSystemFunction::DidOpenFileSystem(
     scoped_refptr<fileapi::FileSystemContext> file_system_context,
     base::PlatformFileError result,
@@ -382,12 +374,6 @@ bool FileBrowserPrivateRequestFileSystemFunction::RunImpl() {
   return true;
 }
 
-FileWatchFunctionBase::FileWatchFunctionBase() {
-}
-
-FileWatchFunctionBase::~FileWatchFunctionBase() {
-}
-
 void FileWatchFunctionBase::Respond(bool success) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ -422,14 +408,6 @@ bool FileWatchFunctionBase::RunImpl() {
   return true;
 }
 
-FileBrowserPrivateAddFileWatchFunction::
-    FileBrowserPrivateAddFileWatchFunction() {
-}
-
-FileBrowserPrivateAddFileWatchFunction::
-    ~FileBrowserPrivateAddFileWatchFunction() {
-}
-
 void FileBrowserPrivateAddFileWatchFunction::PerformFileWatchOperation(
     const base::FilePath& local_path,
     const base::FilePath& virtual_path,
@@ -445,14 +423,6 @@ void FileBrowserPrivateAddFileWatchFunction::PerformFileWatchOperation(
       base::Bind(&FileBrowserPrivateAddFileWatchFunction::Respond, this));
 }
 
-FileBrowserPrivateRemoveFileWatchFunction::
-    FileBrowserPrivateRemoveFileWatchFunction() {
-}
-
-FileBrowserPrivateRemoveFileWatchFunction::
-    ~FileBrowserPrivateRemoveFileWatchFunction() {
-}
-
 void FileBrowserPrivateRemoveFileWatchFunction::PerformFileWatchOperation(
     const base::FilePath& local_path,
     const base::FilePath& unused,
@@ -465,62 +435,33 @@ void FileBrowserPrivateRemoveFileWatchFunction::PerformFileWatchOperation(
   Respond(true);
 }
 
-FileBrowserPrivateSetLastModifiedFunction::
-    FileBrowserPrivateSetLastModifiedFunction() {
-}
-
-FileBrowserPrivateSetLastModifiedFunction::
-    ~FileBrowserPrivateSetLastModifiedFunction() {
-}
-
 bool FileBrowserPrivateSetLastModifiedFunction::RunImpl() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  if (args_->GetSize() != 2) {
-    return false;
-  }
-
-  std::string file_url;
-  if (!args_->GetString(0, &file_url))
-    return false;
-
-  std::string timestamp;
-  if (!args_->GetString(1, &timestamp))
-    return false;
+  using extensions::api::file_browser_private::SetLastModified::Params;
+  const scoped_ptr<Params> params(Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params);
 
   base::FilePath local_path = file_manager::util::GetLocalPathFromURL(
-      render_view_host(), profile(), GURL(file_url));
+      render_view_host(), profile(), GURL(params->file_url));
 
   base::PostTaskAndReplyWithResult(
       BrowserThread::GetBlockingPool(),
       FROM_HERE,
       base::Bind(&SetLastModifiedOnBlockingPool,
                  local_path,
-                 strtoul(timestamp.c_str(), NULL, 0)),
+                 strtoul(params->last_modified.c_str(), NULL, 0)),
       base::Bind(&FileBrowserPrivateSetLastModifiedFunction::SendResponse,
                  this));
   return true;
 }
 
-FileBrowserPrivateGetSizeStatsFunction::
-    FileBrowserPrivateGetSizeStatsFunction() {
-}
-
-FileBrowserPrivateGetSizeStatsFunction::
-    ~FileBrowserPrivateGetSizeStatsFunction() {
-}
-
 bool FileBrowserPrivateGetSizeStatsFunction::RunImpl() {
-  if (args_->GetSize() != 1) {
-    return false;
-  }
-
-  std::string mount_url;
-  if (!args_->GetString(0, &mount_url))
-    return false;
+  using extensions::api::file_browser_private::GetSizeStats::Params;
+  const scoped_ptr<Params> params(Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params);
 
   base::FilePath file_path = file_manager::util::GetLocalPathFromURL(
-      render_view_host(), profile(), GURL(mount_url));
+      render_view_host(), profile(), GURL(params->mount_path));

[kinaba, 2013/09/12 07:34:19]

This parameter should be URL.
Could you fix the .json file side?

[hirono, 2013/09/17 01:21:20]

It seems that the name of mountPath is used 6 times in the .json file.
I'd like to replace them in another CL at all once.

   if (file_path.empty())
     return false;
 
@@ -584,28 +525,13 @@ void FileBrowserPrivateGetSizeStatsFunction::GetSizeStatsCallback(
   SendResponse(true);
 }
 
-FileBrowserPrivateGetVolumeMetadataFunction::
-    FileBrowserPrivateGetVolumeMetadataFunction() {
-}
-
-FileBrowserPrivateGetVolumeMetadataFunction::
-    ~FileBrowserPrivateGetVolumeMetadataFunction() {
-}
-
 bool FileBrowserPrivateGetVolumeMetadataFunction::RunImpl() {
-  if (args_->GetSize() != 1) {
-    error_ = "Invalid argument count";
-    return false;
-  }
-
-  std::string volume_mount_url;
-  if (!args_->GetString(0, &volume_mount_url)) {
-    NOTREACHED();
-    return false;
-  }
+  using extensions::api::file_browser_private::GetVolumeMetadata::Params;
+  const scoped_ptr<Params> params(Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params);
 
   base::FilePath file_path = file_manager::util::GetLocalPathFromURL(
-      render_view_host(), profile(), GURL(volume_mount_url));
+      render_view_host(), profile(), GURL(params->mount_url));
   if (file_path.empty()) {
     error_ = "Invalid mount path.";
     return false;
@@ -629,29 +555,17 @@ bool FileBrowserPrivateGetVolumeMetadataFunction::RunImpl() {
   return true;
 }
 
-FileBrowserPrivateValidatePathNameLengthFunction::
-    FileBrowserPrivateValidatePathNameLengthFunction() {
-}
-
-FileBrowserPrivateValidatePathNameLengthFunction::
-    ~FileBrowserPrivateValidatePathNameLengthFunction() {
-}
-
 bool FileBrowserPrivateValidatePathNameLengthFunction::RunImpl() {
-  std::string parent_url;
-  if (!args_->GetString(0, &parent_url))
-    return false;
-
-  std::string name;
-  if (!args_->GetString(1, &name))
-    return false;
+  using extensions::api::file_browser_private::ValidatePathNameLength::Params;
+  const scoped_ptr<Params> params(Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params);
 
   scoped_refptr<fileapi::FileSystemContext> file_system_context =
       file_manager::util::GetFileSystemContextForRenderViewHost(
           profile(), render_view_host());
 
   fileapi::FileSystemURL filesystem_url(
-      file_system_context->CrackURL(GURL(parent_url)));
+      file_system_context->CrackURL(GURL(params->parent_directory_url)));
   if (!chromeos::FileSystemBackend::CanHandleURL(filesystem_url))
     return false;
 
@@ -669,7 +583,7 @@ bool FileBrowserPrivateValidatePathNameLengthFunction::RunImpl() {
                  filesystem_url.path().AsUTF8Unsafe()),
       base::Bind(&FileBrowserPrivateValidatePathNameLengthFunction::
                      OnFilePathLimitRetrieved,
-                 this, name.size()));
+                 this, params->name.size()));
   return true;
 }
 
@@ -680,27 +594,13 @@ void FileBrowserPrivateValidatePathNameLengthFunction::OnFilePathLimitRetrieved(
   SendResponse(true);
 }
 
-FileBrowserPrivateFormatDeviceFunction::
-    FileBrowserPrivateFormatDeviceFunction() {
-}
-
-FileBrowserPrivateFormatDeviceFunction::
-    ~FileBrowserPrivateFormatDeviceFunction() {
-}
-
 bool FileBrowserPrivateFormatDeviceFunction::RunImpl() {
-  if (args_->GetSize() != 1) {
-    return false;
-  }
-
-  std::string volume_file_url;
-  if (!args_->GetString(0, &volume_file_url)) {
-    NOTREACHED();
-    return false;
-  }
+  using extensions::api::file_browser_private::FormatDevice::Params;
+  const scoped_ptr<Params> params(Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params);
 
   base::FilePath file_path = file_manager::util::GetLocalPathFromURL(
-      render_view_host(), profile(), GURL(volume_file_url));
+      render_view_host(), profile(), GURL(params->mount_path));

[kinaba, 2013/09/12 07:34:19]

ditto.

   if (file_path.empty())
     return false;
 
@@ -709,12 +609,6 @@ bool FileBrowserPrivateFormatDeviceFunction::RunImpl() {
   return true;
 }
 
-FileBrowserPrivateStartCopyFunction::FileBrowserPrivateStartCopyFunction() {
-}
-
-FileBrowserPrivateStartCopyFunction::~FileBrowserPrivateStartCopyFunction() {
-}
-
 bool FileBrowserPrivateStartCopyFunction::RunImpl() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ -761,12 +655,6 @@ void FileBrowserPrivateStartCopyFunction::RunAfterStartCopy(
   SendResponse(true);
 }
 
-FileBrowserPrivateCancelCopyFunction::FileBrowserPrivateCancelCopyFunction() {
-}
-
-FileBrowserPrivateCancelCopyFunction::~FileBrowserPrivateCancelCopyFunction() {
-}
-
 bool FileBrowserPrivateCancelCopyFunction::RunImpl() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));