diff options
58 files changed, 59 insertions, 59 deletions
diff --git a/remoting/host/config_file_watcher.cc b/remoting/host/config_file_watcher.cc index 29c108c..f07b1ae 100644 --- a/remoting/host/config_file_watcher.cc +++ b/remoting/host/config_file_watcher.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_util.h" #include "base/files/file_path_watcher.h" +#include "base/files/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h" diff --git a/remoting/host/config_file_watcher_unittest.cc b/remoting/host/config_file_watcher_unittest.cc index 1a6217b..543f089 100644 --- a/remoting/host/config_file_watcher_unittest.cc +++ b/remoting/host/config_file_watcher_unittest.cc @@ -4,8 +4,8 @@ #include "remoting/host/config_file_watcher.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "remoting/base/auto_thread.h" diff --git a/remoting/host/daemon_process.cc b/remoting/host/daemon_process.cc index 360bb1a..c3c7fd9 100644 --- a/remoting/host/daemon_process.cc +++ b/remoting/host/daemon_process.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/location.h" #include "base/single_thread_task_runner.h" #include "net/base/net_util.h" diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc index 1f75d94..4a1f259 100644 --- a/remoting/host/desktop_session_agent.cc +++ b/remoting/host/desktop_session_agent.cc @@ -4,7 +4,7 @@ #include "remoting/host/desktop_session_agent.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/memory/shared_memory.h" #include "ipc/ipc_channel_proxy.h" @@ -25,8 +25,8 @@ #include "remoting/proto/event.pb.h" #include "remoting/protocol/clipboard_stub.h" #include "remoting/protocol/input_event_tracker.h" -#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" +#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" #include "third_party/webrtc/modules/desktop_capture/mouse_cursor.h" #include "third_party/webrtc/modules/desktop_capture/shared_memory.h" diff --git a/remoting/host/gnubby_auth_handler_posix.cc b/remoting/host/gnubby_auth_handler_posix.cc index 04afc74..7c8761d 100644 --- a/remoting/host/gnubby_auth_handler_posix.cc +++ b/remoting/host/gnubby_auth_handler_posix.cc @@ -8,7 +8,7 @@ #include <utility> #include "base/bind.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/lazy_instance.h" diff --git a/remoting/host/json_host_config.cc b/remoting/host/json_host_config.cc index 7cd35f4..58ea2ae 100644 --- a/remoting/host/json_host_config.cc +++ b/remoting/host/json_host_config.cc @@ -5,7 +5,7 @@ #include "remoting/host/json_host_config.h" #include "base/bind.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/important_file_writer.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" diff --git a/remoting/host/json_host_config_unittest.cc b/remoting/host/json_host_config_unittest.cc index a3fdf96..1a8747d 100644 --- a/remoting/host/json_host_config_unittest.cc +++ b/remoting/host/json_host_config_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.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" diff --git a/remoting/host/pairing_registry_delegate_linux.cc b/remoting/host/pairing_registry_delegate_linux.cc index 838edd2..755c910 100644 --- a/remoting/host/pairing_registry_delegate_linux.cc +++ b/remoting/host/pairing_registry_delegate_linux.cc @@ -5,8 +5,8 @@ #include "remoting/host/pairing_registry_delegate_linux.h" #include "base/bind.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" +#include "base/files/file_util.h" #include "base/files/important_file_writer.h" #include "base/json/json_file_value_serializer.h" #include "base/json/json_string_value_serializer.h" diff --git a/remoting/host/pairing_registry_delegate_linux_unittest.cc b/remoting/host/pairing_registry_delegate_linux_unittest.cc index 5ca9c94..5770503 100644 --- a/remoting/host/pairing_registry_delegate_linux_unittest.cc +++ b/remoting/host/pairing_registry_delegate_linux_unittest.cc @@ -4,7 +4,7 @@ #include "remoting/host/pairing_registry_delegate_linux.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/timer/timer.h" #include "base/values.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/remoting/host/policy_hack/policy_watcher_linux.cc b/remoting/host/policy_hack/policy_watcher_linux.cc index 62a3d17..293155a 100644 --- a/remoting/host/policy_hack/policy_watcher_linux.cc +++ b/remoting/host/policy_hack/policy_watcher_linux.cc @@ -16,10 +16,10 @@ #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" +#include "base/files/file_util.h" #include "base/json/json_file_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index fb1d8e0..a34a603 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -11,8 +11,8 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/debug/alias.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/single_thread_task_runner.h" diff --git a/remoting/host/setup/daemon_controller_delegate_linux.cc b/remoting/host/setup/daemon_controller_delegate_linux.cc index c483d7b..142f02d 100644 --- a/remoting/host/setup/daemon_controller_delegate_linux.cc +++ b/remoting/host/setup/daemon_controller_delegate_linux.cc @@ -12,8 +12,8 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/environment.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/md5.h" diff --git a/remoting/host/setup/daemon_controller_delegate_mac.mm b/remoting/host/setup/daemon_controller_delegate_mac.mm index b5021a3..3194344 100644 --- a/remoting/host/setup/daemon_controller_delegate_mac.mm +++ b/remoting/host/setup/daemon_controller_delegate_mac.mm @@ -13,8 +13,8 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/mac/foundation_util.h" diff --git a/remoting/host/win/elevated_controller.cc b/remoting/host/win/elevated_controller.cc index 7da5ab8..fc5aebe 100644 --- a/remoting/host/win/elevated_controller.cc +++ b/remoting/host/win/elevated_controller.cc @@ -4,8 +4,8 @@ #include "remoting/host/win/elevated_controller.h" -#include "base/file_util.h" #include "base/file_version_info.h" +#include "base/files/file_util.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h" diff --git a/remoting/protocol/authenticator_test_base.cc b/remoting/protocol/authenticator_test_base.cc index 3f1d9f6..2ef1658 100644 --- a/remoting/protocol/authenticator_test_base.cc +++ b/remoting/protocol/authenticator_test_base.cc @@ -5,8 +5,8 @@ #include "remoting/protocol/authenticator_test_base.h" #include "base/base64.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "base/test/test_timeouts.h" #include "base/timer/timer.h" diff --git a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc index cb239fb..84540fd 100644 --- a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc +++ b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc @@ -6,8 +6,8 @@ #include "base/base64.h" #include "base/bind.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/test/test_timeouts.h" diff --git a/remoting/test/protocol_perftest.cc b/remoting/test/protocol_perftest.cc index 2387ddb..6e216b00 100644 --- a/remoting/test/protocol_perftest.cc +++ b/remoting/test/protocol_perftest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/base64.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/message_loop/message_loop.h" #include "base/rand_util.h" #include "base/run_loop.h" diff --git a/rlz/chromeos/lib/rlz_value_store_chromeos.cc b/rlz/chromeos/lib/rlz_value_store_chromeos.cc index c54a194..2232b5a 100644 --- a/rlz/chromeos/lib/rlz_value_store_chromeos.cc +++ b/rlz/chromeos/lib/rlz_value_store_chromeos.cc @@ -5,7 +5,7 @@ #include "rlz/chromeos/lib/rlz_value_store_chromeos.h" #include "base/base_paths.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/important_file_writer.h" #include "base/json/json_file_value_serializer.h" #include "base/json/json_string_value_serializer.h" diff --git a/sandbox/linux/services/broker_process_unittest.cc b/sandbox/linux/services/broker_process_unittest.cc index 515dccc..87a7a31 100644 --- a/sandbox/linux/services/broker_process_unittest.cc +++ b/sandbox/linux/services/broker_process_unittest.cc @@ -18,7 +18,7 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/sandbox/linux/services/credentials_unittest.cc b/sandbox/linux/services/credentials_unittest.cc index 12ef320..28199fb 100644 --- a/sandbox/linux/services/credentials_unittest.cc +++ b/sandbox/linux/services/credentials_unittest.cc @@ -11,7 +11,7 @@ #include <sys/types.h> #include <unistd.h> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/sandbox/linux/services/scoped_process_unittest.cc b/sandbox/linux/services/scoped_process_unittest.cc index 382c7fb..82b85b9 100644 --- a/sandbox/linux/services/scoped_process_unittest.cc +++ b/sandbox/linux/services/scoped_process_unittest.cc @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" diff --git a/sandbox/linux/services/yama.cc b/sandbox/linux/services/yama.cc index 49e1b36..6658160 100644 --- a/sandbox/linux/services/yama.cc +++ b/sandbox/linux/services/yama.cc @@ -11,7 +11,7 @@ #include <unistd.h> #include "base/basictypes.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc index fc03cdd..f0b5cef 100644 --- a/sandbox/linux/suid/client/setuid_sandbox_client.cc +++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc @@ -14,8 +14,8 @@ #include "base/command_line.h" #include "base/environment.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/logging.h" #include "base/macros.h" diff --git a/sandbox/linux/tests/unit_tests.cc b/sandbox/linux/tests/unit_tests.cc index 25b6dc6..b7c3af6 100644 --- a/sandbox/linux/tests/unit_tests.cc +++ b/sandbox/linux/tests/unit_tests.cc @@ -12,7 +12,7 @@ #include <unistd.h> #include "base/debug/leak_annotations.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/posix/eintr_wrapper.h" #include "base/third_party/valgrind/valgrind.h" #include "build/build_config.h" diff --git a/sandbox/win/src/handle_inheritance_test.cc b/sandbox/win/src/handle_inheritance_test.cc index 6dceee6..8074c41 100644 --- a/sandbox/win/src/handle_inheritance_test.cc +++ b/sandbox/win/src/handle_inheritance_test.cc @@ -4,7 +4,7 @@ #include <stdio.h> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/win/windows_version.h" #include "sandbox/win/tests/common/controller.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/skia/ext/image_operations_unittest.cc b/skia/ext/image_operations_unittest.cc index 9a3dcff..73429fc 100644 --- a/skia/ext/image_operations_unittest.cc +++ b/skia/ext/image_operations_unittest.cc @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/strings/string_util.h" #include "skia/ext/image_operations.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/skia/ext/recursive_gaussian_convolution_unittest.cc b/skia/ext/recursive_gaussian_convolution_unittest.cc index 3f00bac..9fe386b 100644 --- a/skia/ext/recursive_gaussian_convolution_unittest.cc +++ b/skia/ext/recursive_gaussian_convolution_unittest.cc @@ -7,8 +7,8 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/time/time.h" #include "skia/ext/convolver.h" diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc index bd394d6..8785cb4 100644 --- a/skia/ext/vector_canvas_unittest.cc +++ b/skia/ext/vector_canvas_unittest.cc @@ -9,7 +9,7 @@ #endif #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/skia/tools/filter_fuzz_stub/filter_fuzz_stub.cc b/skia/tools/filter_fuzz_stub/filter_fuzz_stub.cc index 2d37a2d..4d5ec61 100644 --- a/skia/tools/filter_fuzz_stub/filter_fuzz_stub.cc +++ b/skia/tools/filter_fuzz_stub/filter_fuzz_stub.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.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkFlattenableSerialization.h" diff --git a/storage/browser/fileapi/quota/open_file_handle_context.cc b/storage/browser/fileapi/quota/open_file_handle_context.cc index 816a777..a775865 100644 --- a/storage/browser/fileapi/quota/open_file_handle_context.cc +++ b/storage/browser/fileapi/quota/open_file_handle_context.cc @@ -4,7 +4,7 @@ #include "storage/browser/fileapi/quota/open_file_handle_context.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "storage/browser/fileapi/quota/quota_reservation_buffer.h" namespace storage { diff --git a/storage/common/blob/scoped_file.cc b/storage/common/blob/scoped_file.cc index 408e187..b544449 100644 --- a/storage/common/blob/scoped_file.cc +++ b/storage/common/blob/scoped_file.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/location.h" #include "base/message_loop/message_loop_proxy.h" #include "base/task_runner.h" diff --git a/sync/syncable/directory.h b/sync/syncable/directory.h index 01baac7..1d86a1f 100644 --- a/sync/syncable/directory.h +++ b/sync/syncable/directory.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/containers/hash_tables.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/gtest_prod_util.h" #include "base/values.h" #include "sync/base/sync_export.h" diff --git a/sync/syncable/directory_backing_store_unittest.cc b/sync/syncable/directory_backing_store_unittest.cc index aad9523..03f2e95 100644 --- a/sync/syncable/directory_backing_store_unittest.cc +++ b/sync/syncable/directory_backing_store_unittest.cc @@ -6,8 +6,8 @@ #include <string> -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" diff --git a/sync/syncable/syncable_unittest.cc b/sync/syncable/syncable_unittest.cc index 7e1aad5..24d134d 100644 --- a/sync/syncable/syncable_unittest.cc +++ b/sync/syncable/syncable_unittest.cc @@ -6,8 +6,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/location.h" #include "base/logging.h" diff --git a/sync/test/engine/test_directory_setter_upper.cc b/sync/test/engine/test_directory_setter_upper.cc index 79bb783..847a7bb 100644 --- a/sync/test/engine/test_directory_setter_upper.cc +++ b/sync/test/engine/test_directory_setter_upper.cc @@ -5,7 +5,7 @@ #include "sync/test/engine/test_directory_setter_upper.h" #include "base/compiler_specific.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/location.h" #include "base/strings/string_util.h" #include "sync/syncable/directory.h" diff --git a/testing/android/native_test_launcher.cc b/testing/android/native_test_launcher.cc index 3952581..63e389a 100644 --- a/testing/android/native_test_launcher.cc +++ b/testing/android/native_test_launcher.cc @@ -20,8 +20,8 @@ #include "base/at_exit.h" #include "base/base_switches.h" #include "base/command_line.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" diff --git a/testing/android/native_test_util.cc b/testing/android/native_test_util.cc index 7d5f025..98f32c7 100644 --- a/testing/android/native_test_util.cc +++ b/testing/android/native_test_util.cc @@ -4,8 +4,8 @@ #include "testing/android/native_test_util.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/strings/string_tokenizer.h" #include "base/strings/string_util.h" diff --git a/tools/android/forwarder2/daemon.cc b/tools/android/forwarder2/daemon.cc index d753302..19a1054 100644 --- a/tools/android/forwarder2/daemon.cc +++ b/tools/android/forwarder2/daemon.cc @@ -18,8 +18,8 @@ #include <string> #include "base/basictypes.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/posix/eintr_wrapper.h" diff --git a/tools/android/forwarder2/host_forwarder_main.cc b/tools/android/forwarder2/host_forwarder_main.cc index 185bcea..59571b6 100644 --- a/tools/android/forwarder2/host_forwarder_main.cc +++ b/tools/android/forwarder2/host_forwarder_main.cc @@ -21,8 +21,8 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/containers/hash_tables.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/tools/android/md5sum/md5sum.cc b/tools/android/md5sum/md5sum.cc index bc4ca07..07ce2c29 100644 --- a/tools/android/md5sum/md5sum.cc +++ b/tools/android/md5sum/md5sum.cc @@ -10,9 +10,9 @@ #include <set> #include <string> -#include "base/file_util.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/md5.h" diff --git a/tools/android/memdump/memdump.cc b/tools/android/memdump/memdump.cc index a84d8e0..cb4b05a 100644 --- a/tools/android/memdump/memdump.cc +++ b/tools/android/memdump/memdump.cc @@ -21,7 +21,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/containers/hash_tables.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/format_macros.h" #include "base/logging.h" diff --git a/tools/gn/build_settings.cc b/tools/gn/build_settings.cc index 322e56a..37d50f5 100644 --- a/tools/gn/build_settings.cc +++ b/tools/gn/build_settings.cc @@ -4,7 +4,7 @@ #include "tools/gn/build_settings.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "tools/gn/filesystem_utils.h" BuildSettings::BuildSettings() { diff --git a/tools/gn/command_args.cc b/tools/gn/command_args.cc index 01dc8bc..8b1478f 100644 --- a/tools/gn/command_args.cc +++ b/tools/gn/command_args.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/environment.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/process/launch.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" diff --git a/tools/gn/filesystem_utils.cc b/tools/gn/filesystem_utils.cc index 7bda4c8..56e472e 100644 --- a/tools/gn/filesystem_utils.cc +++ b/tools/gn/filesystem_utils.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/tools/gn/function_exec_script.cc b/tools/gn/function_exec_script.cc index 572d997..ce697e5 100644 --- a/tools/gn/function_exec_script.cc +++ b/tools/gn/function_exec_script.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/process/kill.h" #include "base/process/launch.h" diff --git a/tools/gn/function_read_file.cc b/tools/gn/function_read_file.cc index e182e0c..f35e5a6 100644 --- a/tools/gn/function_read_file.cc +++ b/tools/gn/function_read_file.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.h" +#include "base/files/file_util.h" #include "tools/gn/err.h" #include "tools/gn/filesystem_utils.h" #include "tools/gn/functions.h" diff --git a/tools/gn/function_write_file.cc b/tools/gn/function_write_file.cc index 322fa65..69ae59ec 100644 --- a/tools/gn/function_write_file.cc +++ b/tools/gn/function_write_file.cc @@ -5,7 +5,7 @@ #include <iostream> #include <sstream> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "tools/gn/err.h" diff --git a/tools/gn/function_write_file_unittest.cc b/tools/gn/function_write_file_unittest.cc index 16dc888..e2e50e6 100644 --- a/tools/gn/function_write_file_unittest.cc +++ b/tools/gn/function_write_file_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_util.h" #include "base/files/file.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" #include "tools/gn/functions.h" diff --git a/tools/gn/generate_test_gn_data.cc b/tools/gn/generate_test_gn_data.cc index cebf3a0..fe4fdc75 100644 --- a/tools/gn/generate_test_gn_data.cc +++ b/tools/gn/generate_test_gn_data.cc @@ -5,8 +5,8 @@ #include <fstream> #include <iostream> -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" diff --git a/tools/gn/header_checker.cc b/tools/gn/header_checker.cc index df74125..4cdfc64e 100644 --- a/tools/gn/header_checker.cc +++ b/tools/gn/header_checker.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/bind.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_util.h" #include "base/threading/sequenced_worker_pool.h" diff --git a/tools/gn/input_file.cc b/tools/gn/input_file.cc index 8e29798..74e419d 100644 --- a/tools/gn/input_file.cc +++ b/tools/gn/input_file.cc @@ -4,7 +4,7 @@ #include "tools/gn/input_file.h" -#include "base/file_util.h" +#include "base/files/file_util.h" InputFile::InputFile(const SourceFile& name) : name_(name), diff --git a/tools/gn/ninja_build_writer.cc b/tools/gn/ninja_build_writer.cc index 73f3f27..1436af6 100644 --- a/tools/gn/ninja_build_writer.cc +++ b/tools/gn/ninja_build_writer.cc @@ -8,7 +8,7 @@ #include <map> #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "base/process/process_handle.h" #include "base/strings/string_util.h" diff --git a/tools/gn/ninja_target_writer.cc b/tools/gn/ninja_target_writer.cc index 75582a1..870cbb6 100644 --- a/tools/gn/ninja_target_writer.cc +++ b/tools/gn/ninja_target_writer.cc @@ -7,7 +7,7 @@ #include <fstream> #include <sstream> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/strings/string_util.h" #include "tools/gn/err.h" #include "tools/gn/filesystem_utils.h" diff --git a/tools/gn/ninja_toolchain_writer.cc b/tools/gn/ninja_toolchain_writer.cc index 0e26db1..5deead5 100644 --- a/tools/gn/ninja_toolchain_writer.cc +++ b/tools/gn/ninja_toolchain_writer.cc @@ -6,7 +6,7 @@ #include <fstream> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/strings/stringize_macros.h" #include "tools/gn/build_settings.h" #include "tools/gn/filesystem_utils.h" diff --git a/tools/gn/setup.cc b/tools/gn/setup.cc index 7ffe2f8..dd9093de7 100644 --- a/tools/gn/setup.cc +++ b/tools/gn/setup.cc @@ -11,8 +11,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/process/launch.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" diff --git a/tools/gn/trace.cc b/tools/gn/trace.cc index 4dfb6ca..df97c34 100644 --- a/tools/gn/trace.cc +++ b/tools/gn/trace.cc @@ -9,7 +9,7 @@ #include <sstream> #include <vector> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/json/string_escape.h" #include "base/logging.h" #include "base/strings/stringprintf.h" diff --git a/tools/imagediff/image_diff.cc b/tools/imagediff/image_diff.cc index c7fad6a..936bf5d 100644 --- a/tools/imagediff/image_diff.cc +++ b/tools/imagediff/image_diff.cc @@ -16,8 +16,8 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/containers/hash_tables.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/numerics/safe_conversions.h" diff --git a/tools/perf/clear_system_cache/clear_system_cache_main.cc b/tools/perf/clear_system_cache/clear_system_cache_main.cc index bae032d3..e5f08a1 100644 --- a/tools/perf/clear_system_cache/clear_system_cache_main.cc +++ b/tools/perf/clear_system_cache/clear_system_cache_main.cc @@ -10,9 +10,9 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/test/test_file_util.h" |