Change {Obfuscated|Local}FileSystemFileUtil non-Singleton to take an underlying *FileUtil.

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/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 28 matching lines @@
 #include "grit/generated_resources.h"
 #include "webkit/fileapi/file_system_context.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_path_manager.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/local_file_system_file_util.h"
+#include "webkit/fileapi/quota_file_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #ifdef OS_CHROMEOS
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #endif
 
 // Error messages.
 const char kFileError[] = "File error %d";
 const char kInvalidFileUrl[] = "Invalid file URL";
 #ifdef OS_CHROMEOS
@@ skipping 476 matching lines @@
       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),
         profile_(profile),
         source_url_(source_url),
         extension_(extension),
         task_id_(task_id),
-        origin_file_urls_(file_urls) {
+        origin_file_urls_(file_urls),
+        local_file_util_(NULL) {
     DCHECK(function_);
   }
 
   // fileapi::FileSystemCallbackDispatcher overrides.
   virtual void DidSucceed() OVERRIDE {
     NOTREACHED();
   }
 
   virtual void DidReadMetadata(const base::PlatformFileInfo& info,
                                const FilePath& unused) OVERRIDE {
@@ skipping 89 matching lines @@
         path_manager->ValidateFileSystemRootAndGetPathOnFileThread(
           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;
     FilePath platform_path;
+    if (!local_file_util_.get())

[ericu, 2011/06/17 20:32:07]

Why use lazy initialization?  Can we just set this up at construction time?

Better yet, this should just use the same one as I proposed that the mount point
provider would hold.  We really only need one for the whole system, so creating
and deleting them on every operation is unnecessary.

[Dai Mikurube (NOT FULLTIME), 2011/06/23 08:13:32]

Agreed.  Changed to use external_provider's GetFileSystemFileUtil.

+      local_file_util_.reset(new fileapi::LocalFileSystemFileUtil(
+          fileapi::QuotaFileUtil::GetInstance()));
     fileapi::FileSystemOperationContext file_system_operation_context(
-        profile_->GetFileSystemContext(),
-        fileapi::LocalFileSystemFileUtil::GetInstance());
+        profile_->GetFileSystemContext(), local_file_util_.get());
     if (base::PLATFORM_FILE_OK !=
             fileapi::FileSystemFileUtil::GetInstance()->GetFileInfo(
                 &file_system_operation_context, final_file_path, &file_info,
                 &platform_path)) {
       return false;
     }
 
     fileapi::ExternalFileSystemMountPointProvider* external_provider =
         path_manager->external_provider();
     if (!external_provider)
@@ skipping 49 matching lines @@
     return true;
   }
 
   ExecuteTasksFileBrowserFunction* function_;
   Profile* profile_;
   // Extension source URL.
   GURL source_url_;
   scoped_refptr<const Extension> extension_;
   std::string task_id_;
   std::vector<GURL> origin_file_urls_;
+  scoped_ptr<fileapi::LocalFileSystemFileUtil> local_file_util_;
   DISALLOW_COPY_AND_ASSIGN(ExecuteTasksFileSystemCallbackDispatcher);
 };
 
 bool ExecuteTasksFileBrowserFunction::RunImpl() {
   // First param is task id that was to the extension with getFileTasks call.
   std::string task_id;
   if (!args_->GetString(0, &task_id) || !task_id.size())
     return false;
 
   // The second param is the list of files that need to be executed with this
@@ skipping 570 matching lines @@
 #undef SET_STRING
 
   // TODO(serya): Create a new string in .grd file for this one in M13.
   dict->SetString("PREVIEW_IMAGE",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_VIEW_CERT_BUTTON));
   dict->SetString("PLAY_MEDIA",
       l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_PLAY));
 
   return true;
 }