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

webkit/fileapi/file_system_quota_client_unittest.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 "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/platform_file.h"
@@ skipping 113 matching lines @@
   FilePath GetOriginBasePath(const std::string& origin_url,
                              quota::StorageType type) {
     // Note: this test assumes sandbox_provider impl is used for
     // temporary and persistent filesystem.
     return file_system_context_->path_manager()->sandbox_provider()->
         GetBaseDirectoryForOriginAndType(
             GURL(origin_url), QuotaStorageTypeToFileSystemType(type), true);
   }
 
   FileSystemOperationContext* CreateFileSystemOperationContext(
-      FileSystemFileUtil* file_util,
+      FileUtil* file_util,
       const FilePath& virtual_path,
       const std::string& origin_url,
       quota::StorageType type) {
     FileSystemOperationContext* context =
         new FileSystemOperationContext(file_system_context_, file_util);
     context->set_src_origin_url(GURL(origin_url));
     context->set_src_virtual_path(virtual_path);
     context->set_src_type(QuotaStorageTypeToFileSystemType(type));
     context->set_allowed_bytes_growth(100000000);
     return context;
   }
 
   bool CreateFileSystemDirectory(const FilePath& path,
                                  const std::string& origin_url,
                                  quota::StorageType type) {
-    FileSystemFileUtil* file_util =
-        file_system_context_->path_manager()->GetFileSystemFileUtil(
-            QuotaStorageTypeToFileSystemType(type));
+    FileUtil* file_util = file_system_context_->path_manager()->GetFileUtil(
+        QuotaStorageTypeToFileSystemType(type));
 
     scoped_ptr<FileSystemOperationContext> context(
         CreateFileSystemOperationContext(file_util, path, origin_url, type));
 
     base::PlatformFileError result =
         file_util->CreateDirectory(context.get(), path, false, false);
     if (result != base::PLATFORM_FILE_OK)
       return false;
     return true;
   }
 
   bool CreateFileSystemFile(const FilePath& path,
                             int64 file_size,
                             const std::string& origin_url,
                             quota::StorageType type) {
     if (path.empty())
       return false;
 
-    FileSystemFileUtil* file_util = file_system_context_->path_manager()->
-        sandbox_provider()->GetFileSystemFileUtil();
+    FileUtil* file_util = file_system_context_->path_manager()->
+        sandbox_provider()->GetFileUtil();
 
     scoped_ptr<FileSystemOperationContext> context(
         CreateFileSystemOperationContext(file_util, path, origin_url, type));
 
     bool created = false;
     if (base::PLATFORM_FILE_OK !=
         file_util->EnsureFileExists(context.get(), path, &created))
       return false;
     EXPECT_TRUE(created);
     if (base::PLATFORM_FILE_OK !=
@@ skipping 405 matching lines @@
             GetOriginUsage(quota_client.get(),
                            "https://bar.com/",
                            kPersistent));
   EXPECT_EQ(64 + file_paths_cost_temporary_bar_https,
             GetOriginUsage(quota_client.get(),
                            "https://bar.com/",
                            kTemporary));
 }
 
 }  // namespace fileapi