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

webkit/fileapi/file_system_dir_url_request_job_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.
 //
 // NOTE: These tests are run as part of "unit_tests" (in chrome/test/unit)
 // rather than as part of test_shell_tests because they rely on being able
 // to instantiate a MessageLoop of type TYPE_IO.  test_shell_tests uses
 // TYPE_UI, which URLRequest doesn't allow.
 //
 
@@ skipping 11 matching lines @@
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/http/http_request_headers.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #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 {
 namespace {
 
 // We always use the TEMPORARY FileSystem in this test.
 static const char kFileSystemURLPrefix[] =
     "filesystem:http://remote/temporary/";
 
 class TestSpecialStoragePolicy : public quota::SpecialStoragePolicy {
@@ skipping 163 matching lines @@
 
   static net::URLRequestJob* FileSystemDirURLRequestJobFactory(
       net::URLRequest* request,
       const std::string& scheme) {
     DCHECK(job_);
     net::URLRequestJob* temp = job_;
     job_ = NULL;
     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.
   MessageLoop message_loop_;
   // Delete all MessageLoopProxy objects before the MessageLoop, to help prevent
   // leaks caused by tasks posted during shutdown.
   scoped_refptr<base::MessageLoopProxy> file_thread_proxy_;
 
   ScopedTempDir temp_dir_;
   FilePath root_path_;
@@ skipping 79 matching lines @@
   MessageLoop::current()->PostTask(FROM_HERE, new QuitNowTask);
   MessageLoop::current()->Run();
 
   request_.reset();
   MessageLoop::current()->RunAllPending();
   // If we get here, success! we didn't crash!
 }
 
 }  // namespace (anonymous)
 }  // namespace fileapi