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

webkit/tools/test_shell/test_shell.gypi

 # 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.
 
 {
   'variables': {
     'test_shell_windows_resource_files': [
       'resources/test_shell.rc',
       '../../glue/resources/pan_east.cur',
       '../../glue/resources/pan_middle.cur',
@@ skipping 384 matching lines @@
         '../../fileapi/file_system_context_unittest.cc',
         '../../fileapi/file_system_directory_database_unittest.cc',
         '../../fileapi/file_system_file_util_unittest.cc',
         '../../fileapi/file_system_operation_unittest.cc',
         '../../fileapi/file_system_origin_database_unittest.cc',
         '../../fileapi/file_system_path_manager_unittest.cc',
         '../../fileapi/file_system_quota_client_unittest.cc',
         '../../fileapi/file_system_quota_unittest.cc',
         '../../fileapi/file_system_usage_cache_unittest.cc',
         '../../fileapi/file_system_util_unittest.cc',
-        '../../fileapi/local_file_system_file_util_unittest.cc',
-        '../../fileapi/obfuscated_file_system_file_util_unittest.cc',
+        '../../fileapi/local_file_util_unittest.cc',
+        '../../fileapi/obfuscated_file_util_unittest.cc',
         '../../fileapi/quota_file_util_unittest.cc',
         '../../fileapi/sandbox_mount_point_provider_unittest.cc',
         '../../fileapi/file_system_test_helper.cc',
         '../../fileapi/file_system_test_helper.h',
         '../../fileapi/webfilewriter_base_unittest.cc',
         '../../glue/bookmarklet_unittest.cc',
         '../../glue/context_menu_unittest.cc',
         '../../glue/cpp_bound_class_unittest.cc',
         '../../glue/cpp_variant_unittest.cc',
         '../../glue/dom_operations_unittest.cc',
@@ skipping 331 matching lines @@
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
             ],
           },
         },
       ],
     }],
   ],
 }