diff options
41 files changed, 50 insertions, 48 deletions
diff --git a/cc/test/paths.cc b/cc/test/paths.cc index f3ede27..bcd324b 100644 --- a/cc/test/paths.cc +++ b/cc/test/paths.cc @@ -4,8 +4,8 @@ #include "cc/test/paths.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/path_service.h" namespace cc { diff --git a/cc/test/pixel_test.h b/cc/test/pixel_test.h index 2ddfd04..94c6fa9 100644 --- a/cc/test/pixel_test.h +++ b/cc/test/pixel_test.h @@ -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 "cc/output/gl_renderer.h" #include "cc/output/software_renderer.h" #include "cc/quads/render_pass.h" diff --git a/cc/test/pixel_test_utils.cc b/cc/test/pixel_test_utils.cc index a0ddad3..43e70df 100644 --- a/cc/test/pixel_test_utils.cc +++ b/cc/test/pixel_test_utils.cc @@ -8,7 +8,7 @@ #include <vector> #include "base/base64.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" diff --git a/cc/trees/layer_tree_host_common_perftest.cc b/cc/trees/layer_tree_host_common_perftest.cc index 94b4594..d334e96 100644 --- a/cc/trees/layer_tree_host_common_perftest.cc +++ b/cc/trees/layer_tree_host_common_perftest.cc @@ -6,8 +6,8 @@ #include <sstream> -#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/path_service.h" #include "base/strings/string_piece.h" diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc index 8afba1f..07b4992 100644 --- a/cc/trees/layer_tree_host_perftest.cc +++ b/cc/trees/layer_tree_host_perftest.cc @@ -6,8 +6,8 @@ #include <sstream> -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "base/strings/string_piece.h" #include "base/time/time.h" diff --git a/chromecast/common/cast_paths.cc b/chromecast/common/cast_paths.cc index ec485c7..fb3cdf1 100644 --- a/chromecast/common/cast_paths.cc +++ b/chromecast/common/cast_paths.cc @@ -5,8 +5,8 @@ #include "chromecast/common/cast_paths.h" #include "base/base_paths.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "build/build_config.h" diff --git a/chromecast/common/chromecast_config.cc b/chromecast/common/chromecast_config.cc index e2ca950..0dc0da3 100644 --- a/chromecast/common/chromecast_config.cc +++ b/chromecast/common/chromecast_config.cc @@ -7,7 +7,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" #include "base/prefs/json_pref_store.h" diff --git a/cloud_print/common/win/install_utils.cc b/cloud_print/common/win/install_utils.cc index dd3d28b..6c421ed 100644 --- a/cloud_print/common/win/install_utils.cc +++ b/cloud_print/common/win/install_utils.cc @@ -7,9 +7,9 @@ #include <windows.h> #include "base/command_line.h" -#include "base/file_util.h" #include "base/file_version_info_win.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "base/process/launch.h" #include "base/win/registry.h" diff --git a/cloud_print/gcp20/prototype/print_job_handler.cc b/cloud_print/gcp20/prototype/print_job_handler.cc index dad81c2..946d5d5 100644 --- a/cloud_print/gcp20/prototype/print_job_handler.cc +++ b/cloud_print/gcp20/prototype/print_job_handler.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/format_macros.h" #include "base/guid.h" #include "base/logging.h" diff --git a/cloud_print/gcp20/prototype/printer.cc b/cloud_print/gcp20/prototype/printer.cc index fdbdf87..01cf062 100644 --- a/cloud_print/gcp20/prototype/printer.cc +++ b/cloud_print/gcp20/prototype/printer.cc @@ -4,15 +4,15 @@ #include "cloud_print/gcp20/prototype/printer.h" -#include <algorithm> #include <limits.h> #include <stdio.h> +#include <algorithm> #include <string> #include <vector> #include "base/bind.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/format_macros.h" #include "base/guid.h" #include "base/json/json_reader.h" diff --git a/cloud_print/gcp20/prototype/printer_state.cc b/cloud_print/gcp20/prototype/printer_state.cc index 17ccb6c..9dedf1d 100644 --- a/cloud_print/gcp20/prototype/printer_state.cc +++ b/cloud_print/gcp20/prototype/printer_state.cc @@ -4,7 +4,7 @@ #include "cloud_print/gcp20/prototype/printer_state.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/logging.h" diff --git a/cloud_print/service/win/chrome_launcher.cc b/cloud_print/service/win/chrome_launcher.cc index c00f708..25da2b8 100644 --- a/cloud_print/service/win/chrome_launcher.cc +++ b/cloud_print/service/win/chrome_launcher.cc @@ -6,7 +6,7 @@ #include "base/base_switches.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" diff --git a/cloud_print/service/win/cloud_print_service.cc b/cloud_print/service/win/cloud_print_service.cc index 2e15398..5565269 100644 --- a/cloud_print/service/win/cloud_print_service.cc +++ b/cloud_print/service/win/cloud_print_service.cc @@ -15,7 +15,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/guid.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/cloud_print/service/win/cloud_print_service_config.cc b/cloud_print/service/win/cloud_print_service_config.cc index 70f50c7..c3c9bc8 100644 --- a/cloud_print/service/win/cloud_print_service_config.cc +++ b/cloud_print/service/win/cloud_print_service_config.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/message_loop/message_loop.h" #include "base/message_loop/message_pump_dispatcher.h" #include "base/run_loop.h" diff --git a/cloud_print/service/win/installer.cc b/cloud_print/service/win/installer.cc index a08b1445..e3ff6a4 100644 --- a/cloud_print/service/win/installer.cc +++ b/cloud_print/service/win/installer.cc @@ -8,7 +8,7 @@ #include "base/at_exit.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "base/win/scoped_com_initializer.h" #include "base/win/shortcut.h" diff --git a/cloud_print/service/win/service_controller.cc b/cloud_print/service/win/service_controller.cc index bdfc44d..4b5d148 100644 --- a/cloud_print/service/win/service_controller.cc +++ b/cloud_print/service/win/service_controller.cc @@ -9,8 +9,8 @@ #include <atlctl.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/path_service.h" #include "base/win/scoped_handle.h" #include "chrome/common/chrome_switches.h" diff --git a/cloud_print/service/win/service_listener.cc b/cloud_print/service/win/service_listener.cc index bdb2217..a022cb3 100644 --- a/cloud_print/service/win/service_listener.cc +++ b/cloud_print/service/win/service_listener.cc @@ -5,8 +5,8 @@ #include "cloud_print/service/win/service_listener.h" #include "base/bind.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/threading/thread.h" #include "base/values.h" diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc index 588eb6d..5d32737 100644 --- a/cloud_print/virtual_driver/win/install/setup.cc +++ b/cloud_print/virtual_driver/win/install/setup.cc @@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <iomanip> #include <windows.h> -#include <winspool.h> #include <setupapi.h> // Must be included after windows.h +#include <winspool.h> +#include <iomanip> #include "base/at_exit.h" #include "base/command_line.h" -#include "base/file_util.h" #include "base/file_version_info_win.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/process/process.h" #include "base/process/launch.h" +#include "base/process/process.h" #include "base/strings/string16.h" #include "base/strings/string_util.h" #include "base/win/registry.h" diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc index e8a8574..c41b805 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc @@ -4,22 +4,22 @@ #include "cloud_print/virtual_driver/win/port_monitor/port_monitor.h" +#include <windows.h> #include <lmcons.h> #include <shellapi.h> #include <shlobj.h> #include <strsafe.h> #include <userenv.h> -#include <windows.h> #include <winspool.h> #include "base/at_exit.h" #include "base/command_line.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/process/process.h" #include "base/process/launch.h" +#include "base/process/process.h" #include "base/strings/string16.h" #include "base/win/registry.h" #include "base/win/scoped_handle.h" diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor.h b/cloud_print/virtual_driver/win/port_monitor/port_monitor.h index b836f45..20dae1e 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.h +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.h @@ -7,7 +7,7 @@ #include <windows.h> #include <string> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/process/process.h" #include "base/strings/string16.h" diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc index 43f82c9..c3c0594 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc @@ -4,17 +4,17 @@ #include "cloud_print/virtual_driver/win/port_monitor/port_monitor.h" +#include <windows.h> #include <lmcons.h> #include <shellapi.h> #include <shlobj.h> #include <strsafe.h> #include <userenv.h> -#include <windows.h> #include <winspool.h> #include "base/at_exit.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" #include "base/process/process.h" diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc index a4b2e0c..d6b4782 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc @@ -3,8 +3,10 @@ // found in the LICENSE file. #include "cloud_print/virtual_driver/win/port_monitor/port_monitor.h" + #include <winspool.h> -#include "base/file_util.h" + +#include "base/files/file_util.h" #include "base/path_service.h" #include "base/strings/string16.h" #include "base/win/registry.h" diff --git a/cloud_print/virtual_driver/win/virtual_driver_helpers.cc b/cloud_print/virtual_driver/win/virtual_driver_helpers.cc index 26a2bdf..0f31afa 100644 --- a/cloud_print/virtual_driver/win/virtual_driver_helpers.cc +++ b/cloud_print/virtual_driver/win/virtual_driver_helpers.cc @@ -7,7 +7,7 @@ #include <windows.h> #include <winspool.h> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/strings/string16.h" #include "base/win/windows_version.h" diff --git a/mojo/apps/js/test/js_to_cpp_unittest.cc b/mojo/apps/js/test/js_to_cpp_unittest.cc index 206e266..837c080 100644 --- a/mojo/apps/js/test/js_to_cpp_unittest.cc +++ b/mojo/apps/js/test/js_to_cpp_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/at_exit.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 "base/strings/utf_string_conversions.h" diff --git a/mojo/common/data_pipe_utils.cc b/mojo/common/data_pipe_utils.cc index 2a6b21e..e486c31 100644 --- a/mojo/common/data_pipe_utils.cc +++ b/mojo/common/data_pipe_utils.cc @@ -6,8 +6,8 @@ #include <stdio.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/message_loop/message_loop.h" #include "base/task_runner_util.h" diff --git a/mojo/common/test/test_support_impl.cc b/mojo/common/test/test_support_impl.cc index ce9e7ac..89e6de1 100644 --- a/mojo/common/test/test_support_impl.cc +++ b/mojo/common/test/test_support_impl.cc @@ -7,9 +7,9 @@ #include <stdlib.h> #include <string.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/path_service.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" diff --git a/mojo/embedder/platform_channel_pair_posix_unittest.cc b/mojo/embedder/platform_channel_pair_posix_unittest.cc index db1af39..8ca354f 100644 --- a/mojo/embedder/platform_channel_pair_posix_unittest.cc +++ b/mojo/embedder/platform_channel_pair_posix_unittest.cc @@ -15,8 +15,8 @@ #include <deque> -#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/files/scoped_temp_dir.h" #include "base/logging.h" diff --git a/mojo/embedder/simple_platform_shared_buffer_posix.cc b/mojo/embedder/simple_platform_shared_buffer_posix.cc index f5da0a8..3076aa8 100644 --- a/mojo/embedder/simple_platform_shared_buffer_posix.cc +++ b/mojo/embedder/simple_platform_shared_buffer_posix.cc @@ -13,8 +13,8 @@ #include <limits> -#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/mojo/shell/dynamic_application_loader.cc b/mojo/shell/dynamic_application_loader.cc index a4a5e15..ac0686e 100644 --- a/mojo/shell/dynamic_application_loader.cc +++ b/mojo/shell/dynamic_application_loader.cc @@ -6,8 +6,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/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" diff --git a/mojo/shell/out_of_process_dynamic_service_runner.cc b/mojo/shell/out_of_process_dynamic_service_runner.cc index 5f21d40..c1243a3 100644 --- a/mojo/shell/out_of_process_dynamic_service_runner.cc +++ b/mojo/shell/out_of_process_dynamic_service_runner.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/scoped_native_library.h" diff --git a/mojo/shell/shell_test_base.cc b/mojo/shell/shell_test_base.cc index 7c8a9af..296db5e 100644 --- a/mojo/shell/shell_test_base.cc +++ b/mojo/shell/shell_test_base.cc @@ -5,8 +5,8 @@ #include "mojo/shell/shell_test_base.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/path_service.h" #include "build/build_config.h" diff --git a/mojo/shell/shell_test_helper.cc b/mojo/shell/shell_test_helper.cc index 691fe76..d0f0f7a 100644 --- a/mojo/shell/shell_test_helper.cc +++ b/mojo/shell/shell_test_helper.cc @@ -5,8 +5,8 @@ #include "mojo/shell/shell_test_helper.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/path_service.h" #include "mojo/shell/init.h" diff --git a/mojo/system/multiprocess_message_pipe_unittest.cc b/mojo/system/multiprocess_message_pipe_unittest.cc index b3238ab..829786d 100644 --- a/mojo/system/multiprocess_message_pipe_unittest.cc +++ b/mojo/system/multiprocess_message_pipe_unittest.cc @@ -10,8 +10,8 @@ #include <vector> #include "base/bind.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/files/scoped_temp_dir.h" #include "base/location.h" diff --git a/mojo/system/platform_handle_dispatcher_unittest.cc b/mojo/system/platform_handle_dispatcher_unittest.cc index df2e36c..62247e7 100644 --- a/mojo/system/platform_handle_dispatcher_unittest.cc +++ b/mojo/system/platform_handle_dispatcher_unittest.cc @@ -6,8 +6,8 @@ #include <stdio.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/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" diff --git a/mojo/system/remote_message_pipe_unittest.cc b/mojo/system/remote_message_pipe_unittest.cc index bb27d80..1d22d13 100644 --- a/mojo/system/remote_message_pipe_unittest.cc +++ b/mojo/system/remote_message_pipe_unittest.cc @@ -9,8 +9,8 @@ #include <vector> #include "base/bind.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/files/scoped_temp_dir.h" #include "base/location.h" diff --git a/mojo/tools/message_generator.cc b/mojo/tools/message_generator.cc index 86fcab2..08b7dcc 100644 --- a/mojo/tools/message_generator.cc +++ b/mojo/tools/message_generator.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_path.h" +#include "base/files/file_util.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "mojo/public/cpp/bindings/lib/message_builder.h" diff --git a/win8/delegate_execute/chrome_util.cc b/win8/delegate_execute/chrome_util.cc index 89d869d..1b7fc0a 100644 --- a/win8/delegate_execute/chrome_util.cc +++ b/win8/delegate_execute/chrome_util.cc @@ -12,8 +12,8 @@ #include <limits> #include <string> -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/md5.h" #include "base/process/kill.h" #include "base/process/launch.h" diff --git a/win8/delegate_execute/command_execute_impl.cc b/win8/delegate_execute/command_execute_impl.cc index aea54f3..bea3e75 100644 --- a/win8/delegate_execute/command_execute_impl.cc +++ b/win8/delegate_execute/command_execute_impl.cc @@ -9,7 +9,7 @@ #include <shlguid.h> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "base/process/launch.h" #include "base/process/process_handle.h" diff --git a/win8/delegate_execute/delegate_execute.cc b/win8/delegate_execute/delegate_execute.cc index d78210b..986911c 100644 --- a/win8/delegate_execute/delegate_execute.cc +++ b/win8/delegate_execute/delegate_execute.cc @@ -10,7 +10,7 @@ #include "base/at_exit.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/process/kill.h" #include "base/strings/string16.h" diff --git a/win8/test/metro_registration_helper.cc b/win8/test/metro_registration_helper.cc index cd4a772..c5d6735 100644 --- a/win8/test/metro_registration_helper.cc +++ b/win8/test/metro_registration_helper.cc @@ -9,8 +9,8 @@ #include <vector> #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/path_service.h" #include "base/process/kill.h" diff --git a/win8/viewer/metro_viewer_process_host.cc b/win8/viewer/metro_viewer_process_host.cc index 8a39885..276aa2c 100644 --- a/win8/viewer/metro_viewer_process_host.cc +++ b/win8/viewer/metro_viewer_process_host.cc @@ -7,8 +7,8 @@ #include <shlobj.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/memory/ref_counted.h" #include "base/path_service.h" #include "base/process/process.h" |