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

webkit/fileapi/file_system_test_helper.cc

Index: webkit/fileapi/file_system_test_helper.cc
diff --git a/webkit/fileapi/file_system_test_helper.cc b/webkit/fileapi/file_system_test_helper.cc
index b064e417d475cdf559f82de7eabfaa43022e4ebd..55e56c38e89161f37befc4dbfceb5c308474e371 100644
--- a/webkit/fileapi/file_system_test_helper.cc
+++ b/webkit/fileapi/file_system_test_helper.cc
@@ -38,8 +38,7 @@ void FileSystemTestOriginHelper::SetUp(
 }
 
 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());
 
@@ -47,7 +46,7 @@ void FileSystemTestOriginHelper::SetUp(
   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.