Revert 121620 - Refactor FileSystemOperation to take callback for each 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 112 matching lines @@
   return file_util::Delete(GetUsageCachePath(), false);
 }
 
 int64 FileSystemTestOriginHelper::ComputeCurrentOriginUsage() const {
   int64 size = file_util::ComputeDirectorySize(GetOriginRootPath());
   if (file_util::PathExists(GetUsageCachePath()))
     size -= FileSystemUsageCache::kUsageFileSize;
   return size;
 }
 
-FileSystemOperation* FileSystemTestOriginHelper::NewOperation() {
+FileSystemOperation* FileSystemTestOriginHelper::NewOperation(
+    FileSystemCallbackDispatcher* callback_dispatcher) {
   DCHECK(file_system_context_.get());
   DCHECK(file_util_);
   FileSystemOperation* operation =
-    new FileSystemOperation(base::MessageLoopProxy::current(),
+    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