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

webkit/fileapi/file_system_dir_url_request_job_unittest.cc

Index: webkit/fileapi/file_system_dir_url_request_job_unittest.cc
diff --git a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc
index a40c6a0845aae09571527d4a6d903622d01a014c..fa595a4f3d4f27e3ed19d92046271c0030a0268a 100644
--- a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc
+++ b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc
@@ -29,9 +29,9 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "unicode/regex.h"
 #include "webkit/fileapi/file_system_context.h"
-#include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_path_manager.h"
+#include "webkit/fileapi/fileapi_file_util.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 
 namespace fileapi {
@@ -215,9 +215,9 @@ class FileSystemDirURLRequestJobTest : public testing::Test {
     return temp;
   }
 
-  FileSystemFileUtil* file_util() {
+  FileUtil* file_util() {
     return file_system_context_->path_manager()->sandbox_provider()->
-        GetFileSystemFileUtil();
+        GetFileUtil();
   }
 
   // Put the message loop at the top, so that it's the last thing deleted.