Cleanup FileSystemOperation for preparing for adding FSO-factory method

webkit/fileapi/file_system_test_helper.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 "webkit/fileapi/file_system_test_helper.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "googleurl/src/gurl.h"
+#include "webkit/fileapi/file_system_callback_dispatcher.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/mock_file_system_options.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 
 namespace fileapi {
@@ skipping 22 matching lines @@
   DCHECK(file_system_context->sandbox_provider());
 
   file_util_ = file_util;
   file_system_context_ = file_system_context;
   if (!file_util_)
     file_util_ = file_system_context->sandbox_provider()->GetFileUtil();
   DCHECK(file_util_);
 
   // Prepare the origin's root directory.
   file_system_context_->GetMountPointProvider(type_)->
-      ValidateFileSystemRootAndGetPathOnFileThread(
+      GetFileSystemRootPathOnFileThread(
           origin_, type_, FilePath(), true /* create */);
 
   // Initialize the usage cache file.
   FilePath usage_cache_path = file_system_context_->
       sandbox_provider()->GetUsageCachePathForOriginAndType(origin_, type_);
   FileSystemUsageCache::UpdateUsage(usage_cache_path, 0);
 }
 
 void FileSystemTestOriginHelper::SetUp(
     const FilePath& base_dir,
@@ skipping 10 matching lines @@
       base::MessageLoopProxy::current(),
       special_storage_policy,
       quota_manager_proxy,
       base_dir,
       CreateAllowFileAccessOptions());
 
   DCHECK(file_system_context_->sandbox_provider());
 
   // Prepare the origin's root directory.
   file_system_context_->GetMountPointProvider(type_)->
-      ValidateFileSystemRootAndGetPathOnFileThread(
+      GetFileSystemRootPathOnFileThread(
           origin_, type_, FilePath(), true /* create */);
 
   // Initialize the usage cache file.  This code assumes that we're either using
   // OFSFU or we've mocked it out in the sandbox provider.
   FilePath usage_cache_path = file_system_context_->
       sandbox_provider()->GetUsageCachePathForOriginAndType(origin_, type_);
   FileSystemUsageCache::UpdateUsage(usage_cache_path, 0);
 }
 
 void FileSystemTestOriginHelper::TearDown() {
   file_system_context_ = NULL;
   MessageLoop::current()->RunAllPending();
 }
 
 FilePath FileSystemTestOriginHelper::GetOriginRootPath() const {
   return file_system_context_->GetMountPointProvider(type_)->
-      ValidateFileSystemRootAndGetPathOnFileThread(
+      GetFileSystemRootPathOnFileThread(
           origin_, type_, FilePath(), false);
 }
 
 FilePath FileSystemTestOriginHelper::GetLocalPath(const FilePath& path) {
   DCHECK(file_util_);
   FilePath local_path;
   scoped_ptr<FileSystemOperationContext> context(NewOperationContext());
   file_util_->GetLocalFilePath(context.get(), path, &local_path);
   return local_path;
 }
@@ skipping 26 matching lines @@
   if (file_util::PathExists(GetUsageCachePath()))
     size -= FileSystemUsageCache::kUsageFileSize;
   return size;
 }
 
 FileSystemOperation* FileSystemTestOriginHelper::NewOperation(
     FileSystemCallbackDispatcher* callback_dispatcher) {
   DCHECK(file_system_context_.get());
   DCHECK(file_util_);
   FileSystemOperation* operation =
-    new FileSystemOperation(callback_dispatcher,
+    new FileSystemOperation(scoped_ptr<FileSystemCallbackDispatcher>(
+                                callback_dispatcher),
                             base::MessageLoopProxy::current(),
                             file_system_context_.get());
   operation->set_override_file_util(file_util_);
   InitializeOperationContext(operation->file_system_operation_context());
   return operation;
 }
 
 FileSystemOperationContext* FileSystemTestOriginHelper::NewOperationContext() {
   DCHECK(file_system_context_.get());
   DCHECK(file_util_);
   FileSystemOperationContext* context =
     new FileSystemOperationContext(file_system_context_.get(), file_util_);
   InitializeOperationContext(context);
   return context;
 }
 
 void FileSystemTestOriginHelper::InitializeOperationContext(
     FileSystemOperationContext* context) {
   DCHECK(context);
   context->set_src_origin_url(origin_);
   context->set_src_type(type_);
   context->set_dest_origin_url(origin_);
   context->set_dest_type(type_);
 }
 
 }  // namespace fileapi