Cleanup FileSystemOperation for preparing for adding FSO-factory method

chrome/browser/extensions/extension_file_browser_private_api.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 "chrome/browser/extensions/extension_file_browser_private_api.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
@@ skipping 27 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/platform_locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
-#include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_util.h"
 
 using content::BrowserThread;
 using content::WebContents;
 
 namespace {
 
 // Error messages.
@@ skipping 242 matching lines @@
 
     return mount_info;
 }
 #endif
 
 }  // namespace
 
 class RequestLocalFileSystemFunction::LocalFileSystemCallbackDispatcher
     : public fileapi::FileSystemCallbackDispatcher {
  public:
-  explicit LocalFileSystemCallbackDispatcher(
+  static scoped_ptr<FileSystemCallbackDispatcher> Create(
       RequestLocalFileSystemFunction* function,
       Profile* profile,
       int child_id,
-      scoped_refptr<const Extension> extension)
-      : function_(function),
-        profile_(profile),
-        child_id_(child_id),
-        extension_(extension)  {
-    DCHECK(function_);
+      scoped_refptr<const Extension> extension) {
+    return scoped_ptr<fileapi::FileSystemCallbackDispatcher>(
+        new LocalFileSystemCallbackDispatcher(
+            function, profile, child_id, extension));
   }
 
   // fileapi::FileSystemCallbackDispatcher overrides.
   virtual void DidSucceed() OVERRIDE {
     NOTREACHED();
   }
 
   virtual void DidReadMetadata(const base::PlatformFileInfo& info,
                                const FilePath& unused) OVERRIDE {
     NOTREACHED();
@@ skipping 30 matching lines @@
   virtual void DidFail(base::PlatformFileError error_code) OVERRIDE {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(
             &RequestLocalFileSystemFunction::RespondFailedOnUIThread,
             function_,
             error_code));
   }
 
  private:
+  LocalFileSystemCallbackDispatcher(
+      RequestLocalFileSystemFunction* function,
+      Profile* profile,
+      int child_id,
+      scoped_refptr<const Extension> extension)
+      : function_(function),
+        profile_(profile),
+        child_id_(child_id),
+        extension_(extension)  {
+    DCHECK(function_);
+  }
 
   // Grants file system access permissions to file browser component.
   bool SetupFileSystemAccessPermissions() {
     if (!extension_.get())
       return false;
 
     // Make sure that only component extension can access the entire
     // local file system.
     if (extension_->location() != Extension::COMPONENT) {
       NOTREACHED() << "Private method access by non-component extension "
@@ skipping 25 matching lines @@
   Profile* profile_;
   // Renderer process id.
   int child_id_;
   // Extension source URL.
   scoped_refptr<const Extension> extension_;
   DISALLOW_COPY_AND_ASSIGN(LocalFileSystemCallbackDispatcher);
 };
 
 void RequestLocalFileSystemFunction::RequestOnFileThread(
     const GURL& source_url, int child_id) {
-  fileapi::FileSystemOperation* operation =
-      new fileapi::FileSystemOperation(
-          new LocalFileSystemCallbackDispatcher(
-              this,
-              profile(),
-              child_id,
-              GetExtension()),
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
-          profile()->GetFileSystemContext());
   GURL origin_url = source_url.GetOrigin();
-  operation->OpenFileSystem(origin_url, fileapi::kFileSystemTypeExternal,
-                            false);     // create
+  profile()->GetFileSystemContext()->OpenFileSystem(
+      origin_url, fileapi::kFileSystemTypeExternal, false, // create
+      LocalFileSystemCallbackDispatcher::Create(
+          this,
+          profile(),
+          child_id,
+          GetExtension()));
 }
 
 bool RequestLocalFileSystemFunction::RunImpl() {
   if (!dispatcher() || !render_view_host() || !render_view_host()->process())
     return false;
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(
           &RequestLocalFileSystemFunction::RequestOnFileThread,
@@ skipping 27 matching lines @@
   GURL file_origin_url;
   fileapi::FileSystemType type;
   if (!CrackFileSystemURL(file_url, &file_origin_url, &type,
                           virtual_path)) {
     return false;
   }
   if (type != fileapi::kFileSystemTypeExternal)
     return false;
 
   FilePath root_path = profile_->GetFileSystemContext()->external_provider()->
-      ValidateFileSystemRootAndGetPathOnFileThread(
+      GetFileSystemRootPathOnFileThread(
           file_origin_url,
           fileapi::kFileSystemTypeExternal,
           *virtual_path,
           false);
   if (root_path == FilePath())
     return false;
 
   *local_path = root_path.Append(*virtual_path);
   return true;
 }
@@ skipping 124 matching lines @@
 
   // TODO(zelidrag, serya): Add intent content tasks to result_list once we
   // implement that API.
   SendResponse(true);
   return true;
 }
 
 class ExecuteTasksFileBrowserFunction::ExecuteTasksFileSystemCallbackDispatcher
     : public fileapi::FileSystemCallbackDispatcher {
  public:
-  explicit ExecuteTasksFileSystemCallbackDispatcher(
+  static scoped_ptr<fileapi::FileSystemCallbackDispatcher> Create(
       ExecuteTasksFileBrowserFunction* function,
       Profile* profile,
       int child_id,
       const GURL& source_url,
       scoped_refptr<const Extension> extension,
       const std::string task_id,
-      const std::vector<GURL>& file_urls)
-      : function_(function),
-        target_process_id_(0),
-        profile_(profile),
-        source_url_(source_url),
-        extension_(extension),
-        task_id_(task_id),
-        origin_file_urls_(file_urls) {
-    DCHECK(function_);
-    ExtractTargetExtensionAndProcessID();
+      const std::vector<GURL>& file_urls) {
+    return scoped_ptr<fileapi::FileSystemCallbackDispatcher>(
+        new ExecuteTasksFileSystemCallbackDispatcher(
+            function, profile, child_id, source_url, extension,
+            task_id, file_urls));
   }
 
   // fileapi::FileSystemCallbackDispatcher overrides.
   virtual void DidSucceed() OVERRIDE {
     NOTREACHED();
   }
 
   virtual void DidReadMetadata(const base::PlatformFileInfo& info,
                                const FilePath& unused) OVERRIDE {
     NOTREACHED();
@@ skipping 46 matching lines @@
 
   virtual void DidFail(base::PlatformFileError error_code) OVERRIDE {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(
             &ExecuteTasksFileBrowserFunction::ExecuteFailedOnUIThread,
             function_));
   }
 
  private:
+  ExecuteTasksFileSystemCallbackDispatcher(
+      ExecuteTasksFileBrowserFunction* function,
+      Profile* profile,
+      int child_id,
+      const GURL& source_url,
+      scoped_refptr<const Extension> extension,

[tzik, 2012/01/10 08:31:13]

can be const&?

[kinuko, 2012/01/10 09:48:53]

Done.

+      const std::string task_id,
+      const std::vector<GURL>& file_urls)
+      : function_(function),
+        target_process_id_(0),
+        profile_(profile),
+        source_url_(source_url),
+        extension_(extension),
+        task_id_(task_id),
+        origin_file_urls_(file_urls) {
+    DCHECK(function_);
+    ExtractTargetExtensionAndProcessID();
+  }
+
   // Extracts target extension's id and process from the tasks's id.
   void ExtractTargetExtensionAndProcessID() {
     // Get task details.
     std::string action_id;
     if (!CrackTaskIdentifier(task_id_, &target_extension_id_, &action_id))
       return;
 
     GURL extension_url =
         Extension::GetBaseURLFromExtensionId(target_extension_id_);
     ExtensionProcessManager* manager = profile_->GetExtensionProcessManager();
@@ skipping 38 matching lines @@
       return false;
     }
 
     // Make sure this url really being used by the right caller extension.
     if (source_url_.GetOrigin() != file_origin_url) {
       DidFail(base::PLATFORM_FILE_ERROR_SECURITY);
       return false;
     }
 
     FilePath root_path =
-        external_provider->ValidateFileSystemRootAndGetPathOnFileThread(
+        external_provider->GetFileSystemRootPathOnFileThread(
           file_origin_url,
           fileapi::kFileSystemTypeExternal,
           virtual_path,
           false);     // create
     FilePath final_file_path = root_path.Append(virtual_path);
 
     // Check if this file system entry exists first.
     base::PlatformFileInfo file_info;
 
     if (!file_util::PathExists(final_file_path) ||
@@ skipping 88 matching lines @@
           task_id,
           file_urls));
   result_.reset(new base::FundamentalValue(true));
   return true;
 }
 
 void ExecuteTasksFileBrowserFunction::RequestFileEntryOnFileThread(
     const GURL& source_url, const std::string& task_id,
     const std::vector<GURL>& file_urls) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  fileapi::FileSystemOperation* operation =
-      new fileapi::FileSystemOperation(
-          new ExecuteTasksFileSystemCallbackDispatcher(
-              this,
-              profile(),
-              render_view_host()->process()->GetID(),
-              source_url,
-              GetExtension(),
-              task_id,
-              file_urls),
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
-          profile()->GetFileSystemContext());
   GURL origin_url = source_url.GetOrigin();
-  operation->OpenFileSystem(origin_url, fileapi::kFileSystemTypeExternal,
-                            false);     // create
+  profile()->GetFileSystemContext()->OpenFileSystem(
+      origin_url, fileapi::kFileSystemTypeExternal, false, // create
+      ExecuteTasksFileSystemCallbackDispatcher::Create(
+          this,
+          profile(),
+          render_view_host()->process()->GetID(),
+          source_url,
+          GetExtension(),
+          task_id,
+          file_urls));
 }
 
 void ExecuteTasksFileBrowserFunction::ExecuteFailedOnUIThread() {
   SendResponse(false);
 }
 
 
 void ExecuteTasksFileBrowserFunction::ExecuteFileActionsOnUIThread(
     const std::string& task_id,
     const std::string& file_system_name,
@@ skipping 128 matching lines @@
     FilePath virtual_path;
     fileapi::FileSystemType type;
     if (!CrackFileSystemURL(file_url, &file_origin_url, &type,
                             &virtual_path)) {
       continue;
     }
     if (type != fileapi::kFileSystemTypeExternal) {
       NOTREACHED();
       continue;
     }
-    FilePath root = provider->ValidateFileSystemRootAndGetPathOnFileThread(
+    FilePath root = provider->GetFileSystemRootPathOnFileThread(
         origin_url,
         fileapi::kFileSystemTypeExternal,
         FilePath(virtual_path),
         false);
     if (!root.empty()) {
       selected_files.push_back(root.Append(virtual_path));
     } else {
       LOG(WARNING) << "GetLocalPathsOnFileThread failed "
                    << file_url.spec();
     }
@@ skipping 629 matching lines @@
   SET_STRING(IDS_FILE_BROWSER, ENQUEUE);
 #undef SET_STRING
 
   ChromeURLDataManager::DataSource::SetFontAndTextDirection(dict);
 
   dict->SetString("PLAY_MEDIA",
       l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_PLAY));
 
   return true;
 }