Cleanup FileSystemOperation for preparing for adding FSO-factory method

chrome/browser/extensions/extension_file_browser_private_api.cc

 // Copyright (c) 2011 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 26 matching lines @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.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;
 
 namespace {
 
 // Error messages.
 const char kFileError[] = "File error %d";
@@ skipping 346 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
+      new LocalFileSystemCallbackDispatcher(
+          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 422 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
+      new ExecuteTasksFileSystemCallbackDispatcher(
+          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 778 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;
 }