diff options
39 files changed, 42 insertions, 42 deletions
diff --git a/base/base.gyp b/base/base.gyp index f963cc2..8bc6378 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -436,10 +436,10 @@ 'debug/trace_event_win_unittest.cc', 'environment_unittest.cc', 'file_path_unittest.cc', - 'file_util_proxy_unittest.cc', 'file_util_unittest.cc', 'file_version_info_unittest.cc', 'files/dir_reader_posix_unittest.cc', + 'files/file_util_proxy_unittest.cc', 'files/important_file_writer_unittest.cc', 'files/scoped_temp_dir_unittest.cc', 'gmock_unittest.cc', diff --git a/base/base.gypi b/base/base.gypi index b0d39a7..189e776 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -149,8 +149,6 @@ 'file_util_mac.mm', 'file_util_posix.cc', 'file_util_win.cc', - 'file_util_proxy.cc', - 'file_util_proxy.h', 'file_version_info.h', 'file_version_info_mac.h', 'file_version_info_mac.mm', @@ -165,6 +163,8 @@ 'files/file_path_watcher_linux.cc', 'files/file_path_watcher_stub.cc', 'files/file_path_watcher_win.cc', + 'files/file_util_proxy.cc', + 'files/file_util_proxy.h', 'files/important_file_writer.h', 'files/important_file_writer.cc', 'files/scoped_temp_dir.cc', diff --git a/base/file_util_proxy.cc b/base/files/file_util_proxy.cc index 1f1ab81..f18d52b 100644 --- a/base/file_util_proxy.cc +++ b/base/files/file_util_proxy.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/bind.h" #include "base/bind_helpers.h" diff --git a/base/file_util_proxy.h b/base/files/file_util_proxy.h index c3e60a3..8cbdfcb 100644 --- a/base/file_util_proxy.h +++ b/base/files/file_util_proxy.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_FILE_UTIL_PROXY_H_ -#define BASE_FILE_UTIL_PROXY_H_ +#ifndef BASE_FILES_FILE_UTIL_PROXY_H_ +#define BASE_FILES_FILE_UTIL_PROXY_H_ #include "base/base_export.h" #include "base/callback_forward.h" @@ -208,4 +208,4 @@ class BASE_EXPORT FileUtilProxy { } // namespace base -#endif // BASE_FILE_UTIL_PROXY_H_ +#endif // BASE_FILES_FILE_UTIL_PROXY_H_ diff --git a/base/file_util_proxy_unittest.cc b/base/files/file_util_proxy_unittest.cc index db215f0..447c43b 100644 --- a/base/file_util_proxy_unittest.cc +++ b/base/files/file_util_proxy_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include <map> diff --git a/chrome/browser/chromeos/extensions/zip_file_creator.cc b/chrome/browser/chromeos/extensions/zip_file_creator.cc index 3a3f5d08..94af158 100644 --- a/chrome/browser/chromeos/extensions/zip_file_creator.cc +++ b/chrome/browser/chromeos/extensions/zip_file_creator.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/file_util.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/memory/scoped_handle.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/extensions/sandboxed_unpacker.cc b/chrome/browser/extensions/sandboxed_unpacker.cc index f1d4c88..5f3fcc4 100644 --- a/chrome/browser/extensions/sandboxed_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_unpacker.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/file_util.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/json/json_string_value_serializer.h" #include "base/memory/scoped_handle.h" #include "base/message_loop.h" diff --git a/chrome/browser/nacl_host/nacl_browser.h b/chrome/browser/nacl_host/nacl_browser.h index fec6edd..de752b4 100644 --- a/chrome/browser/nacl_host/nacl_browser.h +++ b/chrome/browser/nacl_host/nacl_browser.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_NACL_HOST_NACL_BROWSER_H_ #include "base/bind.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h" #include "base/platform_file.h" diff --git a/chrome/browser/nacl_host/nacl_process_host.h b/chrome/browser/nacl_host/nacl_process_host.h index 217554b..8e0c892 100644 --- a/chrome/browser/nacl_host/nacl_process_host.h +++ b/chrome/browser/nacl_host/nacl_process_host.h @@ -8,7 +8,7 @@ #include "build/build_config.h" #include "base/file_path.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" diff --git a/chrome/browser/printing/print_dialog_gtk.cc b/chrome/browser/printing/print_dialog_gtk.cc index c15fbe8..70fe427 100644 --- a/chrome/browser/printing/print_dialog_gtk.cc +++ b/chrome/browser/printing/print_dialog_gtk.cc @@ -14,7 +14,7 @@ #include "base/bind.h" #include "base/file_util.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/logging.h" #include "base/message_loop_proxy.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc index c3da075..4823c82 100644 --- a/chrome/browser/ui/webui/help/help_handler.cc +++ b/chrome/browser/ui/webui/help/help_handler.cc @@ -38,7 +38,7 @@ #include "webkit/user_agent/user_agent_util.h" #if defined(OS_CHROMEOS) -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/i18n/time_formatting.h" #include "base/sys_info.h" #include "chrome/browser/chromeos/login/user_manager.h" diff --git a/content/browser/fileapi/fileapi_message_filter.h b/content/browser/fileapi/fileapi_message_filter.h index 99637b6..610fed1 100644 --- a/content/browser/fileapi/fileapi_message_filter.h +++ b/content/browser/fileapi/fileapi_message_filter.h @@ -9,7 +9,7 @@ #include <string> #include "base/callback.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/hash_tables.h" #include "base/id_map.h" #include "base/platform_file.h" diff --git a/content/browser/loader/redirect_to_file_resource_handler.cc b/content/browser/loader/redirect_to_file_resource_handler.cc index b738214..9b37784 100644 --- a/content/browser/loader/redirect_to_file_resource_handler.cc +++ b/content/browser/loader/redirect_to_file_resource_handler.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/file_util.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/logging.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" diff --git a/content/common/fileapi/file_system_dispatcher.h b/content/common/fileapi/file_system_dispatcher.h index c5a38df..99afa50 100644 --- a/content/common/fileapi/file_system_dispatcher.h +++ b/content/common/fileapi/file_system_dispatcher.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/id_map.h" #include "base/process.h" #include "ipc/ipc_listener.h" diff --git a/content/common/fileapi/file_system_messages.h b/content/common/fileapi/file_system_messages.h index 24d864c..5de1aac 100644 --- a/content/common/fileapi/file_system_messages.h +++ b/content/common/fileapi/file_system_messages.h @@ -5,7 +5,7 @@ // IPC messages for the file system. // Multiply-included message file, hence no include guard. -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_platform_file.h" diff --git a/content/common/fileapi/webfilesystem_callback_dispatcher.cc b/content/common/fileapi/webfilesystem_callback_dispatcher.cc index 60b9d55..95d9371 100644 --- a/content/common/fileapi/webfilesystem_callback_dispatcher.cc +++ b/content/common/fileapi/webfilesystem_callback_dispatcher.cc @@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" diff --git a/content/renderer/pepper/pepper_file_io_host.cc b/content/renderer/pepper/pepper_file_io_host.cc index 88c05c9..413c425a 100644 --- a/content/renderer/pepper/pepper_file_io_host.cc +++ b/content/renderer/pepper/pepper_file_io_host.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "ppapi/c/pp_errors.h" #include "ppapi/host/dispatch_host_message.h" #include "ppapi/host/ppapi_host.h" diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc index 69fc48e..8c6eb0d 100644 --- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc @@ -13,7 +13,7 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/file_path.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/logging.h" #include "base/string_split.h" #include "base/sync_socket.h" diff --git a/net/url_request/url_fetcher_core.cc b/net/url_request/url_fetcher_core.cc index 0578e16..2ade517 100644 --- a/net/url_request/url_fetcher_core.cc +++ b/net/url_request/url_fetcher_core.cc @@ -5,7 +5,7 @@ #include "net/url_request/url_fetcher_core.h" #include "base/bind.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/logging.h" #include "base/single_thread_task_runner.h" #include "base/metrics/histogram.h" diff --git a/webkit/blob/blob_url_request_job.cc b/webkit/blob/blob_url_request_job.cc index 68befac..ae3dd24 100644 --- a/webkit/blob/blob_url_request_job.cc +++ b/webkit/blob/blob_url_request_job.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/stl_util.h" diff --git a/webkit/blob/local_file_stream_reader.cc b/webkit/blob/local_file_stream_reader.cc index c7e96cd..aa077ef 100644 --- a/webkit/blob/local_file_stream_reader.cc +++ b/webkit/blob/local_file_stream_reader.cc @@ -5,7 +5,7 @@ #include "webkit/blob/local_file_stream_reader.h" #include "base/file_util.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/location.h" #include "base/logging.h" #include "base/platform_file.h" diff --git a/webkit/blob/shareable_file_reference.cc b/webkit/blob/shareable_file_reference.cc index 94da9d8..f85b97e 100644 --- a/webkit/blob/shareable_file_reference.cc +++ b/webkit/blob/shareable_file_reference.cc @@ -7,7 +7,7 @@ #include <map> #include "base/file_util.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/lazy_instance.h" #include "base/task_runner.h" #include "base/threading/thread_checker.h" diff --git a/webkit/chromeos/fileapi/file_util_async.h b/webkit/chromeos/fileapi/file_util_async.h index cdb96ff..3cec09d 100644 --- a/webkit/chromeos/fileapi/file_util_async.h +++ b/webkit/chromeos/fileapi/file_util_async.h @@ -6,7 +6,7 @@ #define WEBKIT_CHROMEOS_FILEAPI_FILE_SYSTEM_FILE_UTIL_ASYNC_H_ #include "base/callback.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/platform_file.h" #include "webkit/chromeos/fileapi/async_file_stream.h" diff --git a/webkit/fileapi/file_system_callback_dispatcher.h b/webkit/fileapi/file_system_callback_dispatcher.h index 9db2ef6..af0a757 100644 --- a/webkit/fileapi/file_system_callback_dispatcher.h +++ b/webkit/fileapi/file_system_callback_dispatcher.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/platform_file.h" #include "base/process.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/fileapi/file_system_dir_url_request_job.cc b/webkit/fileapi/file_system_dir_url_request_job.cc index ec6cf23..e1031df 100644 --- a/webkit/fileapi/file_system_dir_url_request_job.cc +++ b/webkit/fileapi/file_system_dir_url_request_job.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/message_loop.h" #include "base/platform_file.h" #include "base/sys_string_conversions.h" diff --git a/webkit/fileapi/file_system_dir_url_request_job.h b/webkit/fileapi/file_system_dir_url_request_job.h index 430d622..75539f8 100644 --- a/webkit/fileapi/file_system_dir_url_request_job.h +++ b/webkit/fileapi/file_system_dir_url_request_job.h @@ -9,7 +9,7 @@ #include <vector> #include "base/file_path.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" diff --git a/webkit/fileapi/file_system_file_stream_reader.cc b/webkit/fileapi/file_system_file_stream_reader.cc index ff61abc..cb5f5dd 100644 --- a/webkit/fileapi/file_system_file_stream_reader.cc +++ b/webkit/fileapi/file_system_file_stream_reader.cc @@ -4,7 +4,7 @@ #include "webkit/fileapi/file_system_file_stream_reader.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/platform_file.h" #include "base/single_thread_task_runner.h" #include "net/base/file_stream.h" diff --git a/webkit/fileapi/file_system_file_util_proxy.h b/webkit/fileapi/file_system_file_util_proxy.h index 654fbf9..903b821 100644 --- a/webkit/fileapi/file_system_file_util_proxy.h +++ b/webkit/fileapi/file_system_file_util_proxy.h @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/file_path.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/platform_file.h" #include "webkit/fileapi/file_system_file_util.h" #include "webkit/fileapi/file_system_operation.h" diff --git a/webkit/fileapi/file_system_operation.h b/webkit/fileapi/file_system_operation.h index 4e05bf4..5b23194 100644 --- a/webkit/fileapi/file_system_operation.h +++ b/webkit/fileapi/file_system_operation.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/platform_file.h" #include "base/process.h" diff --git a/webkit/fileapi/file_system_url_request_job.cc b/webkit/fileapi/file_system_url_request_job.cc index 51d3272..18bf738 100644 --- a/webkit/fileapi/file_system_url_request_job.cc +++ b/webkit/fileapi/file_system_url_request_job.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" #include "base/file_path.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" diff --git a/webkit/fileapi/file_util_helper.h b/webkit/fileapi/file_util_helper.h index 3a1e0ea..876324e 100644 --- a/webkit/fileapi/file_util_helper.h +++ b/webkit/fileapi/file_util_helper.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/platform_file.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/fileapi/file_writer_delegate.cc b/webkit/fileapi/file_writer_delegate.cc index df97a23..5fd20a9 100644 --- a/webkit/fileapi/file_writer_delegate.cc +++ b/webkit/fileapi/file_writer_delegate.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/sequenced_task_runner.h" diff --git a/webkit/fileapi/local_file_util.cc b/webkit/fileapi/local_file_util.cc index 2cae136..0cecdca 100644 --- a/webkit/fileapi/local_file_util.cc +++ b/webkit/fileapi/local_file_util.cc @@ -4,7 +4,7 @@ #include "webkit/fileapi/local_file_util.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "googleurl/src/gurl.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_mount_point_provider.h" diff --git a/webkit/fileapi/native_file_util.h b/webkit/fileapi/native_file_util.h index f0e1329..075d27b 100644 --- a/webkit/fileapi/native_file_util.h +++ b/webkit/fileapi/native_file_util.h @@ -6,7 +6,7 @@ #define WEBKIT_FILEAPI_NATIVE_FILE_UTIL_H_ #include "base/file_path.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" #include "webkit/fileapi/file_system_file_util.h" diff --git a/webkit/fileapi/obfuscated_file_util.h b/webkit/fileapi/obfuscated_file_util.h index 771f7ce..88fc441 100644 --- a/webkit/fileapi/obfuscated_file_util.h +++ b/webkit/fileapi/obfuscated_file_util.h @@ -9,7 +9,7 @@ #include <string> #include "base/file_path.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" #include "base/timer.h" diff --git a/webkit/fileapi/sandbox_file_stream_writer.cc b/webkit/fileapi/sandbox_file_stream_writer.cc index a00136e..036c4dd 100644 --- a/webkit/fileapi/sandbox_file_stream_writer.cc +++ b/webkit/fileapi/sandbox_file_stream_writer.cc @@ -4,7 +4,7 @@ #include "webkit/fileapi/sandbox_file_stream_writer.h" -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/platform_file.h" #include "base/sequenced_task_runner.h" #include "net/base/io_buffer.h" diff --git a/webkit/plugins/ppapi/ppb_directory_reader_impl.h b/webkit/plugins/ppapi/ppb_directory_reader_impl.h index 10d567a..9e563c5 100644 --- a/webkit/plugins/ppapi/ppb_directory_reader_impl.h +++ b/webkit/plugins/ppapi/ppb_directory_reader_impl.h @@ -8,7 +8,7 @@ #include <queue> #include <vector> -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "ppapi/shared_impl/resource.h" #include "ppapi/thunk/ppb_directory_reader_api.h" diff --git a/webkit/plugins/ppapi/quota_file_io.h b/webkit/plugins/ppapi/quota_file_io.h index 252ec11..282ed44 100644 --- a/webkit/plugins/ppapi/quota_file_io.h +++ b/webkit/plugins/ppapi/quota_file_io.h @@ -7,7 +7,7 @@ #include <deque> -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/memory/weak_ptr.h" #include "base/platform_file.h" #include "googleurl/src/gurl.h" diff --git a/webkit/tools/test_shell/simple_file_system.h b/webkit/tools/test_shell/simple_file_system.h index 963cbf2..7d55a9f 100644 --- a/webkit/tools/test_shell/simple_file_system.h +++ b/webkit/tools/test_shell/simple_file_system.h @@ -6,7 +6,7 @@ #define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_FILE_SYSTEM_H_ #include <vector> -#include "base/file_util_proxy.h" +#include "base/files/file_util_proxy.h" #include "base/files/scoped_temp_dir.h" #include "base/id_map.h" #include "base/memory/weak_ptr.h" |