[Refactor] to rename and re-layer the file_util stack layers.

webkit/fileapi/file_system_test_helper.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 "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"
@@ skipping 20 matching lines @@
 
 FileSystemTestOriginHelper::~FileSystemTestOriginHelper() {
 }
 
 void FileSystemTestOriginHelper::SetUp(
     const FilePath& base_dir, FileSystemFileUtil* file_util) {
   SetUp(base_dir, false, false, NULL, file_util);
 }
 
 void FileSystemTestOriginHelper::SetUp(
-    FileSystemContext* file_system_context,
-    FileSystemFileUtil* file_util) {
+    FileSystemContext* file_system_context, FileSystemFileUtil* file_util) {
   DCHECK(file_system_context->path_manager());
   DCHECK(file_system_context->path_manager()->sandbox_provider());
 
   file_util_ = file_util;
   file_system_context_ = file_system_context;
   if (!file_util_)
     file_util_ = file_system_context->path_manager()->sandbox_provider()->
-        GetFileSystemFileUtil();
+        GetFileUtil();
   DCHECK(file_util_);
 
   // Prepare the origin's root directory.
   file_system_context_->path_manager()->
       ValidateFileSystemRootAndGetPathOnFileThread(
           origin_, type_, FilePath(), true /* create */);
 
   // Initialize the usage cache file.
   FilePath usage_cache_path = file_system_context_->path_manager()
       ->sandbox_provider()->GetUsageCachePathForOriginAndType(origin_, type_);
@@ skipping 111 matching lines @@
 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