diff options
| author | thestig <thestig@chromium.org> | 2014-09-03 23:33:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-04 06:35:24 +0000 |
| commit | d8df033c40ff837a4858d28d61c717b02d9b116d (patch) | |
| tree | fda2cf5c2ac883472f56ea2fdc5acb3d52b47ce0 /net | |
| parent | ec4db5bdb0f28b5a4b5bfbfa8849c71e03ba4e0c (diff) | |
| download | chromium_src-d8df033c40ff837a4858d28d61c717b02d9b116d.zip chromium_src-d8df033c40ff837a4858d28d61c717b02d9b116d.tar.gz chromium_src-d8df033c40ff837a4858d28d61c717b02d9b116d.tar.bz2 | |
Change base/file_utils.h includes to base/files/file_utils.h in net/
Review URL: https://codereview.chromium.org/520303003
Cr-Commit-Position: refs/heads/master@{#293271}
Diffstat (limited to 'net')
84 files changed, 85 insertions, 85 deletions
diff --git a/net/android/keystore_unittest.cc b/net/android/keystore_unittest.cc index 4fe38ab..15fec4b 100644 --- a/net/android/keystore_unittest.cc +++ b/net/android/keystore_unittest.cc @@ -19,8 +19,8 @@ #include "base/bind.h" #include "base/callback.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_file.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc index 2865239..841f454 100644 --- a/net/base/directory_lister.cc +++ b/net/base/directory_lister.cc @@ -8,8 +8,8 @@ #include <vector> #include "base/bind.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" +#include "base/files/file_util.h" #include "base/i18n/file_util_icu.h" #include "base/message_loop/message_loop.h" #include "base/threading/thread_restrictions.h" diff --git a/net/base/directory_lister_unittest.cc b/net/base/directory_lister_unittest.cc index 88c517d..970f0d7 100644 --- a/net/base/directory_lister_unittest.cc +++ b/net/base/directory_lister_unittest.cc @@ -5,8 +5,8 @@ #include <list> #include <utility> -#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/i18n/file_util_icu.h" #include "base/message_loop/message_loop.h" diff --git a/net/base/file_stream_unittest.cc b/net/base/file_stream_unittest.cc index cb5c798..883421b 100644 --- a/net/base/file_stream_unittest.cc +++ b/net/base/file_stream_unittest.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_util.h" #include "base/files/file.h" +#include "base/files/file_util.h" #include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop_proxy.h" #include "base/path_service.h" diff --git a/net/base/filename_util.cc b/net/base/filename_util.cc index 31b5fe5..6573c22 100644 --- a/net/base/filename_util.cc +++ b/net/base/filename_util.cc @@ -4,8 +4,8 @@ #include "net/base/filename_util.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/strings/string_util.h" #include "base/strings/sys_string_conversions.h" diff --git a/net/base/filename_util_internal.cc b/net/base/filename_util_internal.cc index ae0b4c6..49b6a3d 100644 --- a/net/base/filename_util_internal.cc +++ b/net/base/filename_util_internal.cc @@ -4,8 +4,8 @@ #include "net/base/filename_util.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/strings/string_util.h" #include "base/strings/sys_string_conversions.h" diff --git a/net/base/filename_util_unittest.cc b/net/base/filename_util_unittest.cc index 6cbcae1..2201033 100644 --- a/net/base/filename_util_unittest.cc +++ b/net/base/filename_util_unittest.cc @@ -4,8 +4,8 @@ #include "net/base/filename_util.h" -#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/utf_string_conversions.h" #include "base/test/test_file_util.h" diff --git a/net/base/net_log_logger_unittest.cc b/net/base/net_log_logger_unittest.cc index 5d587da..065e934 100644 --- a/net/base/net_log_logger_unittest.cc +++ b/net/base/net_log_logger_unittest.cc @@ -4,8 +4,8 @@ #include "net/base/net_log_logger.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/json/json_reader.h" #include "base/values.h" diff --git a/net/base/upload_data_stream_unittest.cc b/net/base/upload_data_stream_unittest.cc index 90a78d2..2df38cd 100644 --- a/net/base/upload_data_stream_unittest.cc +++ b/net/base/upload_data_stream_unittest.cc @@ -9,8 +9,8 @@ #include "base/basictypes.h" #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_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" diff --git a/net/base/upload_file_element_reader.cc b/net/base/upload_file_element_reader.cc index a996686..6878564 100644 --- a/net/base/upload_file_element_reader.cc +++ b/net/base/upload_file_element_reader.cc @@ -5,7 +5,7 @@ #include "net/base/upload_file_element_reader.h" #include "base/bind.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/location.h" #include "base/task_runner_util.h" #include "net/base/file_stream.h" diff --git a/net/base/upload_file_element_reader_unittest.cc b/net/base/upload_file_element_reader_unittest.cc index 395b867..2069fa0 100644 --- a/net/base/upload_file_element_reader_unittest.cc +++ b/net/base/upload_file_element_reader_unittest.cc @@ -4,7 +4,7 @@ #include "net/base/upload_file_element_reader.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/message_loop/message_loop_proxy.h" #include "base/run_loop.h" diff --git a/net/cert/cert_verify_proc_unittest.cc b/net/cert/cert_verify_proc_unittest.cc index 5c1d9077..533d6d8 100644 --- a/net/cert/cert_verify_proc_unittest.cc +++ b/net/cert/cert_verify_proc_unittest.cc @@ -7,8 +7,8 @@ #include <vector> #include "base/callback_helpers.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/sha1.h" #include "base/strings/string_number_conversions.h" diff --git a/net/cert/ct_serialization_unittest.cc b/net/cert/ct_serialization_unittest.cc index 606bdd1..866f961 100644 --- a/net/cert/ct_serialization_unittest.cc +++ b/net/cert/ct_serialization_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 "net/base/net_log.h" #include "net/base/test_completion_callback.h" #include "net/base/test_data_directory.h" diff --git a/net/cert/multi_log_ct_verifier_unittest.cc b/net/cert/multi_log_ct_verifier_unittest.cc index c5e0146..8edf4eb 100644 --- a/net/cert/multi_log_ct_verifier_unittest.cc +++ b/net/cert/multi_log_ct_verifier_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/metrics/histogram.h" #include "base/metrics/histogram_samples.h" #include "base/metrics/statistics_recorder.h" diff --git a/net/cert/nss_cert_database_unittest.cc b/net/cert/nss_cert_database_unittest.cc index ffa6174..97e9489 100644 --- a/net/cert/nss_cert_database_unittest.cc +++ b/net/cert/nss_cert_database_unittest.cc @@ -9,8 +9,8 @@ #include <algorithm> #include "base/bind.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/message_loop/message_loop.h" #include "base/message_loop/message_loop_proxy.h" diff --git a/net/cert/test_root_certs.cc b/net/cert/test_root_certs.cc index f495890..c39c4b49 100644 --- a/net/cert/test_root_certs.cc +++ b/net/cert/test_root_certs.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/logging.h" #include "net/cert/x509_certificate.h" diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc index 65f8cb0..9adcc73 100644 --- a/net/disk_cache/backend_unittest.cc +++ b/net/disk_cache/backend_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/metrics/field_trial.h" #include "base/port.h" #include "base/strings/string_util.h" diff --git a/net/disk_cache/blockfile/backend_impl.cc b/net/disk_cache/blockfile/backend_impl.cc index 884dd2d..0d25835 100644 --- a/net/disk_cache/blockfile/backend_impl.cc +++ b/net/disk_cache/blockfile/backend_impl.cc @@ -6,9 +6,9 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_util.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/hash.h" #include "base/message_loop/message_loop.h" #include "base/metrics/field_trial.h" diff --git a/net/disk_cache/blockfile/backend_impl_v3.cc b/net/disk_cache/blockfile/backend_impl_v3.cc index e5c6033..d81ec4c 100644 --- a/net/disk_cache/blockfile/backend_impl_v3.cc +++ b/net/disk_cache/blockfile/backend_impl_v3.cc @@ -6,8 +6,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/hash.h" #include "base/message_loop/message_loop.h" #include "base/metrics/field_trial.h" diff --git a/net/disk_cache/blockfile/backend_worker_v3.cc b/net/disk_cache/blockfile/backend_worker_v3.cc index 4e55912..1d89de6 100644 --- a/net/disk_cache/blockfile/backend_worker_v3.cc +++ b/net/disk_cache/blockfile/backend_worker_v3.cc @@ -6,8 +6,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/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/net/disk_cache/blockfile/block_files_unittest.cc b/net/disk_cache/blockfile/block_files_unittest.cc index bbd8981..343485a 100644 --- a/net/disk_cache/blockfile/block_files_unittest.cc +++ b/net/disk_cache/blockfile/block_files_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_enumerator.h" +#include "base/files/file_util.h" #include "net/disk_cache/blockfile/block_files.h" #include "net/disk_cache/disk_cache.h" #include "net/disk_cache/disk_cache_test_base.h" diff --git a/net/disk_cache/cache_util.cc b/net/disk_cache/cache_util.cc index 276f2f3..ea39df0 100644 --- a/net/disk_cache/cache_util.cc +++ b/net/disk_cache/cache_util.cc @@ -4,8 +4,8 @@ #include "net/disk_cache/cache_util.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" +#include "base/files/file_util.h" #include "base/location.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/net/disk_cache/cache_util_posix.cc b/net/disk_cache/cache_util_posix.cc index 59e1c50..951e5b2 100644 --- a/net/disk_cache/cache_util_posix.cc +++ b/net/disk_cache/cache_util_posix.cc @@ -4,8 +4,8 @@ #include "net/disk_cache/cache_util.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/strings/string_util.h" diff --git a/net/disk_cache/cache_util_unittest.cc b/net/disk_cache/cache_util_unittest.cc index 3a05196..b755815 100644 --- a/net/disk_cache/cache_util_unittest.cc +++ b/net/disk_cache/cache_util_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 "net/disk_cache/cache_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/disk_cache/disk_cache_test_base.cc b/net/disk_cache/disk_cache_test_base.cc index 6383184..d0f9842 100644 --- a/net/disk_cache/disk_cache_test_base.cc +++ b/net/disk_cache/disk_cache_test_base.cc @@ -4,7 +4,7 @@ #include "net/disk_cache/disk_cache_test_base.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc index 0701311..803f98f 100644 --- a/net/disk_cache/entry_unittest.cc +++ b/net/disk_cache/entry_unittest.cc @@ -5,8 +5,8 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_util.h" #include "base/files/file.h" +#include "base/files/file_util.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/threading/platform_thread.h" diff --git a/net/disk_cache/simple/simple_backend_impl.cc b/net/disk_cache/simple/simple_backend_impl.cc index 04329e4..ffdc9b1 100644 --- a/net/disk_cache/simple/simple_backend_impl.cc +++ b/net/disk_cache/simple/simple_backend_impl.cc @@ -14,7 +14,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/metrics/field_trial.h" #include "base/metrics/histogram.h" diff --git a/net/disk_cache/simple/simple_index.cc b/net/disk_cache/simple/simple_index.cc index de07e1c..02afe2d 100644 --- a/net/disk_cache/simple/simple_index.cc +++ b/net/disk_cache/simple/simple_index.cc @@ -11,8 +11,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "base/metrics/field_trial.h" diff --git a/net/disk_cache/simple/simple_index_file.cc b/net/disk_cache/simple/simple_index_file.cc index a96f023..d819c9f 100644 --- a/net/disk_cache/simple/simple_index_file.cc +++ b/net/disk_cache/simple/simple_index_file.cc @@ -6,7 +6,7 @@ #include <vector> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/memory_mapped_file.h" #include "base/hash.h" #include "base/logging.h" diff --git a/net/disk_cache/simple/simple_index_file_unittest.cc b/net/disk_cache/simple/simple_index_file_unittest.cc index be5b738..19ea0f8 100644 --- a/net/disk_cache/simple/simple_index_file_unittest.cc +++ b/net/disk_cache/simple/simple_index_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 "base/hash.h" #include "base/logging.h" diff --git a/net/disk_cache/simple/simple_synchronous_entry.cc b/net/disk_cache/simple/simple_synchronous_entry.cc index 14be1d4..1e7b9aa 100644 --- a/net/disk_cache/simple/simple_synchronous_entry.cc +++ b/net/disk_cache/simple/simple_synchronous_entry.cc @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/hash.h" #include "base/location.h" #include "base/sha1.h" diff --git a/net/disk_cache/simple/simple_util.cc b/net/disk_cache/simple/simple_util.cc index 4feeeec..844b695 100644 --- a/net/disk_cache/simple/simple_util.cc +++ b/net/disk_cache/simple/simple_util.cc @@ -6,7 +6,7 @@ #include <limits> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/format_macros.h" #include "base/logging.h" #include "base/sha1.h" diff --git a/net/disk_cache/simple/simple_version_upgrade.cc b/net/disk_cache/simple/simple_version_upgrade.cc index f5bf2dc..c20a1ba 100644 --- a/net/disk_cache/simple/simple_version_upgrade.cc +++ b/net/disk_cache/simple/simple_version_upgrade.cc @@ -6,9 +6,9 @@ #include <cstring> -#include "base/file_util.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/files/memory_mapped_file.h" #include "base/logging.h" #include "base/pickle.h" diff --git a/net/disk_cache/simple/simple_version_upgrade_unittest.cc b/net/disk_cache/simple/simple_version_upgrade_unittest.cc index 15f4fa1..fab2a4c 100644 --- a/net/disk_cache/simple/simple_version_upgrade_unittest.cc +++ b/net/disk_cache/simple/simple_version_upgrade_unittest.cc @@ -5,8 +5,8 @@ #include "net/disk_cache/simple/simple_version_upgrade.h" #include "base/basictypes.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/format_macros.h" #include "base/strings/stringprintf.h" diff --git a/net/dns/dns_hosts.cc b/net/dns/dns_hosts.cc index 76acd47..3867b44 100644 --- a/net/dns/dns_hosts.cc +++ b/net/dns/dns_hosts.cc @@ -4,7 +4,7 @@ #include "net/dns/dns_hosts.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/strings/string_util.h" diff --git a/net/filter/gzip_filter_unittest.cc b/net/filter/gzip_filter_unittest.cc index 97d7b7d..f3f9111 100644 --- a/net/filter/gzip_filter_unittest.cc +++ b/net/filter/gzip_filter_unittest.cc @@ -5,7 +5,7 @@ #include <fstream> #include <ostream> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "net/base/io_buffer.h" diff --git a/net/ftp/ftp_directory_listing_parser_unittest.cc b/net/ftp/ftp_directory_listing_parser_unittest.cc index 145b90c..70795e5 100644 --- a/net/ftp/ftp_directory_listing_parser_unittest.cc +++ b/net/ftp/ftp_directory_listing_parser_unittest.cc @@ -4,12 +4,12 @@ #include "net/ftp/ftp_directory_listing_parser.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/format_macros.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" -#include "base/strings/stringprintf.h" #include "base/strings/string_split.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/ftp/ftp_directory_listing_parser.h" diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index bfb21ad..58fc24c 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc @@ -15,7 +15,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/format_macros.h" #include "base/location.h" #include "base/memory/ref_counted.h" diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 6a3efdd..bc2dd65 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -11,8 +11,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/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/net/http/http_stream_parser_unittest.cc b/net/http/http_stream_parser_unittest.cc index 8e7486f..38279a4 100644 --- a/net/http/http_stream_parser_unittest.cc +++ b/net/http/http_stream_parser_unittest.cc @@ -8,8 +8,8 @@ #include <string> #include <vector> -#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/ref_counted.h" #include "base/run_loop.h" diff --git a/net/http/transport_security_persister.cc b/net/http/transport_security_persister.cc index eda5638..82a4b51 100644 --- a/net/http/transport_security_persister.cc +++ b/net/http/transport_security_persister.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/json/json_reader.h" #include "base/json/json_writer.h" #include "base/message_loop/message_loop.h" diff --git a/net/http/transport_security_persister_unittest.cc b/net/http/transport_security_persister_unittest.cc index a30edae..7de0a44 100644 --- a/net/http/transport_security_persister_unittest.cc +++ b/net/http/transport_security_persister_unittest.cc @@ -8,8 +8,8 @@ #include <string> #include <vector> -#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/message_loop/message_loop.h" #include "net/http/transport_security_state.h" diff --git a/net/ocsp/nss_ocsp_unittest.cc b/net/ocsp/nss_ocsp_unittest.cc index f67e3ff..0201ad1 100644 --- a/net/ocsp/nss_ocsp_unittest.cc +++ b/net/ocsp/nss_ocsp_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/logging.h" #include "base/memory/ref_counted.h" #include "net/base/net_errors.h" diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index 489f14c9..5c608e0 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -21,8 +21,8 @@ #include "base/compiler_specific.h" #include "base/debug/leak_annotations.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/message_loop/message_loop.h" diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc index 5635a87..aec6564 100644 --- a/net/proxy/proxy_config_service_linux_unittest.cc +++ b/net/proxy/proxy_config_service_linux_unittest.cc @@ -10,8 +10,8 @@ #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/format_macros.h" #include "base/logging.h" #include "base/strings/string_util.h" diff --git a/net/proxy/proxy_resolver_perftest.cc b/net/proxy/proxy_resolver_perftest.cc index 6b0b68f..3d7854c 100644 --- a/net/proxy/proxy_resolver_perftest.cc +++ b/net/proxy/proxy_resolver_perftest.cc @@ -4,7 +4,7 @@ #include "base/base_paths.h" #include "base/compiler_specific.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/test/perf_time_logger.h" diff --git a/net/proxy/proxy_resolver_v8_tracing_unittest.cc b/net/proxy/proxy_resolver_v8_tracing_unittest.cc index 5cad3a2..b5ea3e8 100644 --- a/net/proxy/proxy_resolver_v8_tracing_unittest.cc +++ b/net/proxy/proxy_resolver_v8_tracing_unittest.cc @@ -4,7 +4,7 @@ #include "net/proxy/proxy_resolver_v8_tracing.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/stl_util.h" diff --git a/net/proxy/proxy_resolver_v8_unittest.cc b/net/proxy/proxy_resolver_v8_unittest.cc index 8540eab..b0f2d17 100644 --- a/net/proxy/proxy_resolver_v8_unittest.cc +++ b/net/proxy/proxy_resolver_v8_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/compiler_specific.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/net/quic/quic_in_memory_cache.h b/net/quic/quic_in_memory_cache.h index 9f0418c..ea9c24e 100644 --- a/net/quic/quic_in_memory_cache.h +++ b/net/quic/quic_in_memory_cache.h @@ -8,7 +8,7 @@ #include <string> #include "base/containers/hash_tables.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/memory/singleton.h" #include "base/strings/string_piece.h" #include "net/http/http_response_headers.h" diff --git a/net/socket/ssl_client_socket_openssl_unittest.cc b/net/socket/ssl_client_socket_openssl_unittest.cc index 513188b..8a6a882 100644 --- a/net/socket/ssl_client_socket_openssl_unittest.cc +++ b/net/socket/ssl_client_socket_openssl_unittest.cc @@ -13,8 +13,8 @@ #include <openssl/pem.h> #include <openssl/rsa.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/message_loop/message_loop_proxy.h" #include "base/values.h" diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc index e9b599a..f28d51a 100644 --- a/net/socket/ssl_server_socket_unittest.cc +++ b/net/socket/ssl_server_socket_unittest.cc @@ -20,8 +20,8 @@ #include <queue> #include "base/compiler_specific.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 "crypto/nss_util.h" diff --git a/net/socket/tcp_socket.cc b/net/socket/tcp_socket.cc index 8641597..842cc06 100644 --- a/net/socket/tcp_socket.cc +++ b/net/socket/tcp_socket.cc @@ -4,8 +4,8 @@ #include "net/socket/tcp_socket.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/threading/worker_pool.h" diff --git a/net/socket/unix_domain_listen_socket_posix_unittest.cc b/net/socket/unix_domain_listen_socket_posix_unittest.cc index 6fcbfd5..117c5c5 100644 --- a/net/socket/unix_domain_listen_socket_posix_unittest.cc +++ b/net/socket/unix_domain_listen_socket_posix_unittest.cc @@ -21,8 +21,8 @@ #include "base/bind.h" #include "base/callback.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/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/net/spdy/fuzzing/hpack_example_generator.cc b/net/spdy/fuzzing/hpack_example_generator.cc index c0d495d..8c0824a 100644 --- a/net/spdy/fuzzing/hpack_example_generator.cc +++ b/net/spdy/fuzzing/hpack_example_generator.cc @@ -4,8 +4,8 @@ #include "base/at_exit.h" #include "base/command_line.h" -#include "base/file_util.h" #include "base/files/file.h" +#include "base/files/file_util.h" #include "base/strings/string_number_conversions.h" #include "net/spdy/fuzzing/hpack_fuzz_util.h" #include "net/spdy/hpack_constants.h" diff --git a/net/spdy/fuzzing/hpack_fuzz_mutator.cc b/net/spdy/fuzzing/hpack_fuzz_mutator.cc index 37e10e2..6301070 100644 --- a/net/spdy/fuzzing/hpack_fuzz_mutator.cc +++ b/net/spdy/fuzzing/hpack_fuzz_mutator.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_util.h" #include "base/files/file.h" +#include "base/files/file_util.h" #include "base/strings/string_number_conversions.h" #include "net/spdy/fuzzing/hpack_fuzz_util.h" diff --git a/net/spdy/fuzzing/hpack_fuzz_util_test.cc b/net/spdy/fuzzing/hpack_fuzz_util_test.cc index 4c512d0..bf93def 100644 --- a/net/spdy/fuzzing/hpack_fuzz_util_test.cc +++ b/net/spdy/fuzzing/hpack_fuzz_util_test.cc @@ -7,8 +7,8 @@ #include <map> #include "base/base_paths.h" -#include "base/file_util.h" #include "base/files/file.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "net/spdy/spdy_test_utils.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/net/spdy/fuzzing/hpack_fuzz_wrapper.cc b/net/spdy/fuzzing/hpack_fuzz_wrapper.cc index b9d7c3d..f816b1e 100644 --- a/net/spdy/fuzzing/hpack_fuzz_wrapper.cc +++ b/net/spdy/fuzzing/hpack_fuzz_wrapper.cc @@ -4,7 +4,7 @@ #include "base/at_exit.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "net/spdy/fuzzing/hpack_fuzz_util.h" namespace { diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc index 8dc0237..2cd0ec1 100644 --- a/net/spdy/spdy_network_transaction_unittest.cc +++ b/net/spdy/spdy_network_transaction_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_vector.h" #include "base/run_loop.h" diff --git a/net/ssl/client_cert_store_chromeos_unittest.cc b/net/ssl/client_cert_store_chromeos_unittest.cc index 33601ef..0d381ea 100644 --- a/net/ssl/client_cert_store_chromeos_unittest.cc +++ b/net/ssl/client_cert_store_chromeos_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/run_loop.h" #include "crypto/nss_util_internal.h" #include "crypto/rsa_private_key.h" diff --git a/net/test/cert_test_util.cc b/net/test/cert_test_util.cc index 3ccfa65..acf2c60 100644 --- a/net/test/cert_test_util.cc +++ b/net/test/cert_test_util.cc @@ -4,8 +4,8 @@ #include "net/test/cert_test_util.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "net/cert/ev_root_ca_metadata.h" #include "net/cert/x509_certificate.h" diff --git a/net/test/cert_test_util_nss.cc b/net/test/cert_test_util_nss.cc index 29be6ae..d377e46 100644 --- a/net/test/cert_test_util_nss.cc +++ b/net/test/cert_test_util_nss.cc @@ -7,8 +7,8 @@ #include <pk11pub.h> #include <secmodt.h> -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "crypto/nss_util.h" #include "crypto/rsa_private_key.h" diff --git a/net/test/embedded_test_server/embedded_test_server.cc b/net/test/embedded_test_server/embedded_test_server.cc index 75b46e2..2912adfd 100644 --- a/net/test/embedded_test_server/embedded_test_server.cc +++ b/net/test/embedded_test_server/embedded_test_server.cc @@ -5,8 +5,8 @@ #include "net/test/embedded_test_server/embedded_test_server.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/process/process_metrics.h" diff --git a/net/test/python_utils.cc b/net/test/python_utils.cc index d6bf873..7e40fae 100644 --- a/net/test/python_utils.cc +++ b/net/test/python_utils.cc @@ -7,8 +7,8 @@ #include "base/base_paths.h" #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/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc index 5cc6eb6..0e23c7a 100644 --- a/net/test/spawned_test_server/base_test_server.cc +++ b/net/test/spawned_test_server/base_test_server.cc @@ -8,7 +8,7 @@ #include <vector> #include "base/base64.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/net/test/spawned_test_server/local_test_server.h b/net/test/spawned_test_server/local_test_server.h index 5c4ca22..a719598 100644 --- a/net/test/spawned_test_server/local_test_server.h +++ b/net/test/spawned_test_server/local_test_server.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/process/process_handle.h" #include "net/test/spawned_test_server/base_test_server.h" diff --git a/net/test/spawned_test_server/local_test_server_posix.cc b/net/test/spawned_test_server/local_test_server_posix.cc index 67911ed..fdcfdab 100644 --- a/net/test/spawned_test_server/local_test_server_posix.cc +++ b/net/test/spawned_test_server/local_test_server_posix.cc @@ -9,7 +9,7 @@ #include <vector> #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/logging.h" #include "base/process/kill.h" diff --git a/net/test/spawned_test_server/remote_test_server.cc b/net/test/spawned_test_server/remote_test_server.cc index 13286a9..6d098c8 100644 --- a/net/test/spawned_test_server/remote_test_server.cc +++ b/net/test/spawned_test_server/remote_test_server.cc @@ -7,8 +7,8 @@ #include <vector> #include "base/base_paths.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/path_service.h" diff --git a/net/tools/crash_cache/crash_cache.cc b/net/tools/crash_cache/crash_cache.cc index aeeafbe..d548c79 100644 --- a/net/tools/crash_cache/crash_cache.cc +++ b/net/tools/crash_cache/crash_cache.cc @@ -11,7 +11,7 @@ #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/message_loop/message_loop.h" #include "base/path_service.h" diff --git a/net/tools/crl_set_dump/crl_set_dump.cc b/net/tools/crl_set_dump/crl_set_dump.cc index a9dd624..72ed59c 100644 --- a/net/tools/crl_set_dump/crl_set_dump.cc +++ b/net/tools/crl_set_dump/crl_set_dump.cc @@ -12,7 +12,7 @@ #include <string> #include "base/at_exit.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/memory/ref_counted.h" #include "base/strings/string_number_conversions.h" #include "net/cert/crl_set.h" diff --git a/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc b/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc index d77abee..5dbcead 100644 --- a/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc +++ b/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc @@ -8,8 +8,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/json/json_reader.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" diff --git a/net/tools/dump_cache/cache_dumper.cc b/net/tools/dump_cache/cache_dumper.cc index 2898164..0ce46a9 100644 --- a/net/tools/dump_cache/cache_dumper.cc +++ b/net/tools/dump_cache/cache_dumper.cc @@ -4,7 +4,7 @@ #include "net/tools/dump_cache/cache_dumper.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/strings/utf_string_conversions.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/net/tools/dump_cache/dump_files.cc b/net/tools/dump_cache/dump_files.cc index 796f205..ab0aa6f 100644 --- a/net/tools/dump_cache/dump_files.cc +++ b/net/tools/dump_cache/dump_files.cc @@ -13,9 +13,9 @@ #include <set> #include <string> -#include "base/file_util.h" #include "base/files/file.h" #include "base/files/file_enumerator.h" +#include "base/files/file_util.h" #include "base/format_macros.h" #include "base/message_loop/message_loop.h" #include "net/disk_cache/blockfile/block_files.h" diff --git a/net/tools/flip_server/loadtime_measurement.h b/net/tools/flip_server/loadtime_measurement.h index 59fcc0b..d18ac2f 100644 --- a/net/tools/flip_server/loadtime_measurement.h +++ b/net/tools/flip_server/loadtime_measurement.h @@ -15,7 +15,7 @@ #include <string> #include <vector> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/strings/string_split.h" // Class to handle loadtime measure related urls, which all start with testing diff --git a/net/tools/gdig/gdig.cc b/net/tools/gdig/gdig.cc index de62de1..179ab78 100644 --- a/net/tools/gdig/gdig.cc +++ b/net/tools/gdig/gdig.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/cancelable_callback.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/message_loop/message_loop.h" #include "base/strings/string_number_conversions.h" diff --git a/net/tools/quic/quic_in_memory_cache.cc b/net/tools/quic/quic_in_memory_cache.cc index 15a783d..779c9a2 100644 --- a/net/tools/quic/quic_in_memory_cache.cc +++ b/net/tools/quic/quic_in_memory_cache.cc @@ -4,8 +4,8 @@ #include "net/tools/quic/quic_in_memory_cache.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" +#include "base/files/file_util.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "net/tools/balsa/balsa_headers.h" diff --git a/net/tools/tld_cleanup/tld_cleanup.cc b/net/tools/tld_cleanup/tld_cleanup.cc index 5594145..d9731d8 100644 --- a/net/tools/tld_cleanup/tld_cleanup.cc +++ b/net/tools/tld_cleanup/tld_cleanup.cc @@ -26,8 +26,8 @@ #include "base/at_exit.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/i18n/icu_util.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/net/tools/tld_cleanup/tld_cleanup_util.cc b/net/tools/tld_cleanup/tld_cleanup_util.cc index 5a206e4..8cf2323 100644 --- a/net/tools/tld_cleanup/tld_cleanup_util.cc +++ b/net/tools/tld_cleanup/tld_cleanup_util.cc @@ -4,7 +4,7 @@ #include "net/tools/tld_cleanup/tld_cleanup_util.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" diff --git a/net/url_request/test_url_fetcher_factory.cc b/net/url_request/test_url_fetcher_factory.cc index bd4f5e1..c595a4e 100644 --- a/net/url_request/test_url_fetcher_factory.cc +++ b/net/url_request/test_url_fetcher_factory.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/threading/thread_restrictions.h" diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc index 6da5f83..2f1acce 100644 --- a/net/url_request/url_fetcher_impl_unittest.cc +++ b/net/url_request/url_fetcher_impl_unittest.cc @@ -8,7 +8,7 @@ #include <string> #include "base/bind.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/message_loop/message_loop_proxy.h" #include "base/strings/stringprintf.h" diff --git a/net/url_request/url_fetcher_response_writer.cc b/net/url_request/url_fetcher_response_writer.cc index 6e3b613..fcc8cbf 100644 --- a/net/url_request/url_fetcher_response_writer.cc +++ b/net/url_request/url_fetcher_response_writer.cc @@ -4,7 +4,7 @@ #include "net/url_request/url_fetcher_response_writer.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/location.h" #include "base/sequenced_task_runner.h" #include "base/task_runner_util.h" diff --git a/net/url_request/url_fetcher_response_writer_unittest.cc b/net/url_request/url_fetcher_response_writer_unittest.cc index 629e4bc..a2e00c8 100644 --- a/net/url_request/url_fetcher_response_writer_unittest.cc +++ b/net/url_request/url_fetcher_response_writer_unittest.cc @@ -4,7 +4,7 @@ #include "net/url_request/url_fetcher_response_writer.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/message_loop/message_loop_proxy.h" #include "base/run_loop.h" diff --git a/net/url_request/url_request_file_job.cc b/net/url_request/url_request_file_job.cc index 2ce6b99..b139918 100644 --- a/net/url_request/url_request_file_job.cc +++ b/net/url_request/url_request_file_job.cc @@ -21,7 +21,7 @@ #include "base/bind.h" #include "base/compiler_specific.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/synchronization/lock.h" diff --git a/net/url_request/url_request_file_job_unittest.cc b/net/url_request/url_request_file_job_unittest.cc index 8e0cabb..14b283d 100644 --- a/net/url_request/url_request_file_job_unittest.cc +++ b/net/url_request/url_request_file_job_unittest.cc @@ -4,7 +4,7 @@ #include "net/url_request/url_request_file_job.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 818a3188..60101dd 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -15,7 +15,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/format_macros.h" #include "base/memory/weak_ptr.h" |