diff --git a/apps/app_shim/app_shim_host_manager_mac.mm b/apps/app_shim/app_shim_host_manager_mac.mm index 97664424be04..6ea9ef1e9fc9 100644 --- a/apps/app_shim/app_shim_host_manager_mac.mm +++ b/apps/app_shim/app_shim_host_manager_mac.mm @@ -11,8 +11,8 @@ #include "base/base64.h" #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/logging.h" #include "base/path_service.h" #include "base/sha1.h" diff --git a/apps/app_shim/chrome_main_app_mode_mac.mm b/apps/app_shim/chrome_main_app_mode_mac.mm index ed07e6a50010..21e3fe21835e 100644 --- a/apps/app_shim/chrome_main_app_mode_mac.mm +++ b/apps/app_shim/chrome_main_app_mode_mac.mm @@ -14,7 +14,7 @@ #include "base/at_exit.h" #include "base/command_line.h" #include "base/files/file_path.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" @@ -37,8 +37,8 @@ #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_message.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/apps/app_shim/unix_domain_socket_acceptor.cc b/apps/app_shim/unix_domain_socket_acceptor.cc index f837a16c45d2..f5cda65159a8 100644 --- a/apps/app_shim/unix_domain_socket_acceptor.cc +++ b/apps/app_shim/unix_domain_socket_acceptor.cc @@ -4,7 +4,7 @@ #include "apps/app_shim/unix_domain_socket_acceptor.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/logging.h" #include "ipc/unix_domain_socket_util.h" diff --git a/apps/launcher.cc b/apps/launcher.cc index aabbc6489241..9272a665ab19 100644 --- a/apps/launcher.cc +++ b/apps/launcher.cc @@ -8,8 +8,8 @@ #include #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/memory/ref_counted.h" #include "base/strings/string_util.h" diff --git a/extensions/browser/api/storage/leveldb_settings_storage_factory.cc b/extensions/browser/api/storage/leveldb_settings_storage_factory.cc index 03c5ab2969c9..f4d9884ec5ae 100644 --- a/extensions/browser/api/storage/leveldb_settings_storage_factory.cc +++ b/extensions/browser/api/storage/leveldb_settings_storage_factory.cc @@ -4,7 +4,7 @@ #include "extensions/browser/api/storage/leveldb_settings_storage_factory.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "extensions/browser/value_store/leveldb_value_store.h" diff --git a/extensions/browser/api/storage/storage_frontend_unittest.cc b/extensions/browser/api/storage/storage_frontend_unittest.cc index fe56ef2cabb6..519dba4c97f2 100644 --- a/extensions/browser/api/storage/storage_frontend_unittest.cc +++ b/extensions/browser/api/storage/storage_frontend_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" diff --git a/extensions/browser/computed_hashes.cc b/extensions/browser/computed_hashes.cc index 19c8337b99e8..3c89770e0f28 100644 --- a/extensions/browser/computed_hashes.cc +++ b/extensions/browser/computed_hashes.cc @@ -5,8 +5,8 @@ #include "extensions/browser/computed_hashes.h" #include "base/base64.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/stl_util.h" diff --git a/extensions/browser/content_hash_fetcher.cc b/extensions/browser/content_hash_fetcher.cc index a8cc0f79738b..aa3475e94e1c 100644 --- a/extensions/browser/content_hash_fetcher.cc +++ b/extensions/browser/content_hash_fetcher.cc @@ -7,8 +7,8 @@ #include #include "base/base64.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" +#include "base/files/file_util.h" #include "base/json/json_reader.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram.h" diff --git a/extensions/browser/content_hash_reader.cc b/extensions/browser/content_hash_reader.cc index 1c9ae97c62a1..76fb3e2941b0 100644 --- a/extensions/browser/content_hash_reader.cc +++ b/extensions/browser/content_hash_reader.cc @@ -5,7 +5,7 @@ #include "extensions/browser/content_hash_reader.h" #include "base/base64.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/json/json_reader.h" #include "base/metrics/histogram.h" #include "base/strings/string_util.h" diff --git a/extensions/browser/extension_protocols.cc b/extensions/browser/extension_protocols.cc index e1d7b44a806b..36218eb98825 100644 --- a/extensions/browser/extension_protocols.cc +++ b/extensions/browser/extension_protocols.cc @@ -10,8 +10,8 @@ #include "base/base64.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/format_macros.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" diff --git a/extensions/browser/file_reader.cc b/extensions/browser/file_reader.cc index 3ca74eb476e8..ebb9ed4bac6f 100644 --- a/extensions/browser/file_reader.cc +++ b/extensions/browser/file_reader.cc @@ -5,7 +5,7 @@ #include "extensions/browser/file_reader.h" #include "base/bind.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/message_loop/message_loop.h" #include "content/public/browser/browser_thread.h" diff --git a/extensions/browser/file_reader_unittest.cc b/extensions/browser/file_reader_unittest.cc index 491d5949fb6e..efd436752595 100644 --- a/extensions/browser/file_reader_unittest.cc +++ b/extensions/browser/file_reader_unittest.cc @@ -4,8 +4,8 @@ #include "base/bind.h" #include "base/bind_helpers.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 "components/crx_file/id_util.h" diff --git a/extensions/browser/image_loader.cc b/extensions/browser/image_loader.cc index 2c19a737c834..cfbe34efebe7 100644 --- a/extensions/browser/image_loader.cc +++ b/extensions/browser/image_loader.cc @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/strings/string_number_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "content/public/browser/browser_thread.h" diff --git a/extensions/browser/value_store/leveldb_value_store.cc b/extensions/browser/value_store/leveldb_value_store.cc index 6d7fdc9a34f1..58cf32fecf50 100644 --- a/extensions/browser/value_store/leveldb_value_store.cc +++ b/extensions/browser/value_store/leveldb_value_store.cc @@ -4,7 +4,7 @@ #include "extensions/browser/value_store/leveldb_value_store.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/extensions/browser/value_store/leveldb_value_store_unittest.cc b/extensions/browser/value_store/leveldb_value_store_unittest.cc index ddcedb2f1793..2630a6dd4b46 100644 --- a/extensions/browser/value_store/leveldb_value_store_unittest.cc +++ b/extensions/browser/value_store/leveldb_value_store_unittest.cc @@ -4,8 +4,8 @@ #include "extensions/browser/value_store/value_store_unittest.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/message_loop/message_loop.h" diff --git a/extensions/browser/value_store/value_store_frontend_unittest.cc b/extensions/browser/value_store/value_store_frontend_unittest.cc index e7a81a647d79..6622af96df69 100644 --- a/extensions/browser/value_store/value_store_frontend_unittest.cc +++ b/extensions/browser/value_store/value_store_frontend_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/scoped_ptr.h" #include "base/message_loop/message_loop.h" diff --git a/extensions/browser/verified_contents.cc b/extensions/browser/verified_contents.cc index b92e72d3210a..47c94662a166 100644 --- a/extensions/browser/verified_contents.cc +++ b/extensions/browser/verified_contents.cc @@ -5,7 +5,7 @@ #include "extensions/browser/verified_contents.h" #include "base/base64.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/json/json_reader.h" #include "base/strings/string_util.h" #include "base/values.h" diff --git a/extensions/browser/verified_contents_unittest.cc b/extensions/browser/verified_contents_unittest.cc index f52b74b57730..80f1f813a30f 100644 --- a/extensions/browser/verified_contents_unittest.cc +++ b/extensions/browser/verified_contents_unittest.cc @@ -6,8 +6,8 @@ #include #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/stl_util.h" #include "extensions/browser/verified_contents.h" diff --git a/extensions/common/extension_l10n_util.cc b/extensions/common/extension_l10n_util.cc index 24af4b7f90ab..e60e2ec726b2 100644 --- a/extensions/common/extension_l10n_util.cc +++ b/extensions/common/extension_l10n_util.cc @@ -9,8 +9,8 @@ #include #include -#include "base/file_util.h" #include "base/files/file_enumerator.h" +#include "base/files/file_util.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" #include "base/memory/linked_ptr.h" diff --git a/extensions/common/extension_l10n_util_unittest.cc b/extensions/common/extension_l10n_util_unittest.cc index 830423c63277..49970fed1eef 100644 --- a/extensions/common/extension_l10n_util_unittest.cc +++ b/extensions/common/extension_l10n_util_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_path.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" diff --git a/extensions/common/extension_paths.cc b/extensions/common/extension_paths.cc index 210310068d95..636c266907ef 100644 --- a/extensions/common/extension_paths.cc +++ b/extensions/common/extension_paths.cc @@ -4,7 +4,7 @@ #include "extensions/common/extension_paths.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/path_service.h" namespace extensions { diff --git a/extensions/common/extension_resource.cc b/extensions/common/extension_resource.cc index e66054401328..13824c120957 100644 --- a/extensions/common/extension_resource.cc +++ b/extensions/common/extension_resource.cc @@ -4,7 +4,7 @@ #include "extensions/common/extension_resource.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/threading/thread_restrictions.h" diff --git a/extensions/common/extension_resource_unittest.cc b/extensions/common/extension_resource_unittest.cc index 17495e353e87..c3285eb75f24 100644 --- a/extensions/common/extension_resource_unittest.cc +++ b/extensions/common/extension_resource_unittest.cc @@ -4,7 +4,7 @@ #include -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "components/crx_file/id_util.h" diff --git a/extensions/common/file_util.cc b/extensions/common/file_util.cc index 8f025dbc9166..e0ce3399c0b5 100644 --- a/extensions/common/file_util.cc +++ b/extensions/common/file_util.cc @@ -10,9 +10,9 @@ #include #include -#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/files/scoped_temp_dir.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" diff --git a/extensions/common/file_util_unittest.cc b/extensions/common/file_util_unittest.cc index 9a03f9b55f35..5008a9cd5b54 100644 --- a/extensions/common/file_util_unittest.cc +++ b/extensions/common/file_util_unittest.cc @@ -5,7 +5,7 @@ #include "extensions/common/file_util.h" #include "base/basictypes.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/json/json_string_value_serializer.h" #include "base/path_service.h" diff --git a/extensions/common/manifest_handlers/background_info.cc b/extensions/common/manifest_handlers/background_info.cc index 1e06e8c4d69b..230eba13745a 100644 --- a/extensions/common/manifest_handlers/background_info.cc +++ b/extensions/common/manifest_handlers/background_info.cc @@ -5,7 +5,7 @@ #include "extensions/common/manifest_handlers/background_info.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" diff --git a/extensions/common/manifest_handlers/icons_handler.cc b/extensions/common/manifest_handlers/icons_handler.cc index c7e6c61e3197..c8e01d4cb519 100644 --- a/extensions/common/manifest_handlers/icons_handler.cc +++ b/extensions/common/manifest_handlers/icons_handler.cc @@ -4,7 +4,7 @@ #include "extensions/common/manifest_handlers/icons_handler.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" diff --git a/extensions/renderer/module_system_test.cc b/extensions/renderer/module_system_test.cc index 7bd2730d8038..dc7e4dfb20ca 100644 --- a/extensions/renderer/module_system_test.cc +++ b/extensions/renderer/module_system_test.cc @@ -8,8 +8,8 @@ #include #include "base/callback.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/extensions/shell/browser/default_shell_browser_main_delegate.cc b/extensions/shell/browser/default_shell_browser_main_delegate.cc index 51b936b96f1e..491fe4370324 100644 --- a/extensions/shell/browser/default_shell_browser_main_delegate.cc +++ b/extensions/shell/browser/default_shell_browser_main_delegate.cc @@ -5,8 +5,8 @@ #include "extensions/shell/browser/default_shell_browser_main_delegate.h" #include "base/command_line.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "extensions/shell/browser/shell_desktop_controller.h" #include "extensions/shell/browser/shell_extension_system.h" #include "extensions/shell/common/switches.h" diff --git a/extensions/shell/browser/shell_extension_system.cc b/extensions/shell/browser/shell_extension_system.cc index 4598e39acd28..dd430043f225 100644 --- a/extensions/shell/browser/shell_extension_system.cc +++ b/extensions/shell/browser/shell_extension_system.cc @@ -6,8 +6,8 @@ #include -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h"