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

webkit/fileapi/sandbox_mount_point_provider_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 "webkit/fileapi/sandbox_mount_point_provider.h"
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 162 matching lines @@
   }
 
   FileSystemPathManager* path_manager() {
     return path_manager_;
   }
 
   SandboxMountPointProvider* sandbox_provider() {
     return path_manager()->sandbox_provider();
   }
 
-  FileSystemFileUtil* file_util() {
-    return sandbox_provider()->GetFileSystemFileUtil();
+  FileApiFileUtil* file_util() {
+    return sandbox_provider()->GetFileUtil();
   }
 
   void OnGetRootPath(bool success, const FilePath& unused,
                      const std::string& unused_also) {
     EXPECT_FALSE(success);  // We told it not to create.
   }
 
   FileSystemPathManager::GetRootPathCallback* GetRootPathCallback() {
     return callback_factory_.NewCallback(
         &SandboxMountPointProviderMigrationTest::OnGetRootPath);
@@ skipping 221 matching lines @@
 
 TEST_F(SandboxMountPointProviderMigrationTest, TestMigrateViaMethod8) {
   RunMigrationTest(8);
 }
 
 TEST_F(SandboxMountPointProviderMigrationTest, TestMigrateViaMethod9) {
   RunMigrationTest(9);
 }
 
 }  // namespace fileapi