diff options
81 files changed, 82 insertions, 82 deletions
diff --git a/net/base/escape.cc b/net/base/escape.cc index f578275..0b11f43 100644 --- a/net/base/escape.cc +++ b/net/base/escape.cc @@ -11,7 +11,7 @@ #include "base/string_util.h" #include "base/strings/string_piece.h" #include "base/strings/utf_offset_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace net { diff --git a/net/base/escape_unittest.cc b/net/base/escape_unittest.cc index f654b2d..c1f3cdd 100644 --- a/net/base/escape_unittest.cc +++ b/net/base/escape_unittest.cc @@ -11,7 +11,7 @@ #include "base/i18n/icu_string_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/base/keygen_handler_win.cc b/net/base/keygen_handler_win.cc index 730c0ee..85df914 100644 --- a/net/base/keygen_handler_win.cc +++ b/net/base/keygen_handler_win.cc @@ -19,7 +19,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "crypto/capi_util.h" #include "crypto/scoped_capi_types.h" diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index 0e2613e..220ebca 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -15,7 +15,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" using std::string; diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc index 5b84700..1a26014 100644 --- a/net/base/mime_util_unittest.cc +++ b/net/base/mime_util_unittest.cc @@ -4,7 +4,7 @@ #include "base/basictypes.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/mime_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/base/net_log.cc b/net/base/net_log.cc index 14f1436..1b61698 100644 --- a/net/base/net_log.cc +++ b/net/base/net_log.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/logging.h" #include "base/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "net/base/net_errors.h" diff --git a/net/base/net_util.cc b/net/base/net_util.cc index bf7fbb8..f7f3438d4 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -47,10 +47,10 @@ #include "base/strings/string_tokenizer.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_offset_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/sys_byteorder.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "googleurl/src/gurl.h" #include "googleurl/src/url_canon.h" diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc index a40ad79..cc7bd41 100644 --- a/net/base/net_util_unittest.cc +++ b/net/base/net_util_unittest.cc @@ -14,10 +14,10 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/sys_byteorder.h" #include "base/test/test_file_util.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/base/net_util_win.cc b/net/base/net_util_win.cc index 48253d9..13358de 100644 --- a/net/base/net_util_win.cc +++ b/net/base/net_util_win.cc @@ -15,8 +15,8 @@ #include "base/string_util.h" #include "base/strings/string_piece.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_handle.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" diff --git a/net/base/network_time_notifier.cc b/net/base/network_time_notifier.cc index 61ac14f..788619f 100644 --- a/net/base/network_time_notifier.cc +++ b/net/base/network_time_notifier.cc @@ -10,7 +10,7 @@ #include "base/location.h" #include "base/message_loop.h" #include "base/stl_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace { diff --git a/net/base/platform_mime_util_win.cc b/net/base/platform_mime_util_win.cc index 901a4d3..421ddba 100644 --- a/net/base/platform_mime_util_win.cc +++ b/net/base/platform_mime_util_win.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/registry.h" namespace net { diff --git a/net/base/registry_controlled_domains/registry_controlled_domain.cc b/net/base/registry_controlled_domains/registry_controlled_domain.cc index bfdfbe0..ebcee1a 100644 --- a/net/base/registry_controlled_domains/registry_controlled_domain.cc +++ b/net/base/registry_controlled_domains/registry_controlled_domain.cc @@ -47,7 +47,7 @@ #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "googleurl/src/url_parse.h" #include "net/base/net_module.h" diff --git a/net/cert/cert_verify_proc_win.cc b/net/cert/cert_verify_proc_win.cc index 8f6f805..de7182b 100644 --- a/net/cert/cert_verify_proc_win.cc +++ b/net/cert/cert_verify_proc_win.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/sha1.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "crypto/capi_util.h" #include "crypto/scoped_capi_types.h" #include "crypto/sha2.h" diff --git a/net/cert/nss_cert_database_unittest.cc b/net/cert/nss_cert_database_unittest.cc index 7a1b8c8..be943a8 100644 --- a/net/cert/nss_cert_database_unittest.cc +++ b/net/cert/nss_cert_database_unittest.cc @@ -15,7 +15,7 @@ #include "base/path_service.h" #include "base/string16.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "crypto/nss_util.h" #include "crypto/nss_util_internal.h" #include "crypto/scoped_nss_types.h" diff --git a/net/cert/x509_cert_types_mac.cc b/net/cert/x509_cert_types_mac.cc index 00795ed..a41b690 100644 --- a/net/cert/x509_cert_types_mac.cc +++ b/net/cert/x509_cert_types_mac.cc @@ -11,7 +11,7 @@ #include "base/i18n/icu_string_conversions.h" #include "base/logging.h" #include "base/mac/mac_logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace net { diff --git a/net/cert/x509_cert_types_win.cc b/net/cert/x509_cert_types_win.cc index 7b99bec..85b9ab0 100644 --- a/net/cert/x509_cert_types_win.cc +++ b/net/cert/x509_cert_types_win.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "crypto/capi_util.h" #pragma comment(lib, "crypt32.lib") diff --git a/net/cert/x509_certificate_win.cc b/net/cert/x509_certificate_win.cc index 0201d08..bfc9a96 100644 --- a/net/cert/x509_certificate_win.cc +++ b/net/cert/x509_certificate_win.cc @@ -11,7 +11,7 @@ #include "base/pickle.h" #include "base/sha1.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "crypto/capi_util.h" #include "crypto/rsa_private_key.h" #include "crypto/scoped_capi_types.h" diff --git a/net/disk_cache/stress_cache.cc b/net/disk_cache/stress_cache.cc index d5cbd98a..6ed7091 100644 --- a/net/disk_cache/stress_cache.cc +++ b/net/disk_cache/stress_cache.cc @@ -28,9 +28,9 @@ #include "base/process_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" -#include "base/utf_string_conversions.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" diff --git a/net/dns/dns_config_service_win.cc b/net/dns/dns_config_service_win.cc index e1f6b23..d9a4b4f 100644 --- a/net/dns/dns_config_service_win.cc +++ b/net/dns/dns_config_service_win.cc @@ -17,11 +17,11 @@ #include "base/metrics/histogram.h" #include "base/string_util.h" #include "base/strings/string_split.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/threading/non_thread_safe.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/win/object_watcher.h" #include "base/win/registry.h" #include "base/win/windows_version.h" diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc index 844c1a7..408c96f 100644 --- a/net/dns/host_resolver_impl.cc +++ b/net/dns/host_resolver_impl.cc @@ -26,9 +26,9 @@ #include "base/metrics/histogram.h" #include "base/stl_util.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/worker_pool.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "net/base/address_family.h" #include "net/base/address_list.h" diff --git a/net/ftp/ftp_auth_cache_unittest.cc b/net/ftp/ftp_auth_cache_unittest.cc index e036635..a07f10e 100644 --- a/net/ftp/ftp_auth_cache_unittest.cc +++ b/net/ftp/ftp_auth_cache_unittest.cc @@ -6,7 +6,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/base/auth.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/ftp/ftp_directory_listing_parser.cc b/net/ftp/ftp_directory_listing_parser.cc index eb322e6..c19a845 100644 --- a/net/ftp/ftp_directory_listing_parser.cc +++ b/net/ftp/ftp_directory_listing_parser.cc @@ -11,7 +11,7 @@ #include "base/stl_util.h" #include "base/string_util.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/ftp/ftp_directory_listing_parser_ls.h" #include "net/ftp/ftp_directory_listing_parser_netware.h" diff --git a/net/ftp/ftp_directory_listing_parser_ls.cc b/net/ftp/ftp_directory_listing_parser_ls.cc index cab3101..520a778 100644 --- a/net/ftp/ftp_directory_listing_parser_ls.cc +++ b/net/ftp/ftp_directory_listing_parser_ls.cc @@ -9,8 +9,8 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/strings/string_split.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "net/ftp/ftp_directory_listing_parser.h" #include "net/ftp/ftp_util.h" diff --git a/net/ftp/ftp_directory_listing_parser_netware.cc b/net/ftp/ftp_directory_listing_parser_netware.cc index 3229c3e..8b7de8a 100644 --- a/net/ftp/ftp_directory_listing_parser_netware.cc +++ b/net/ftp/ftp_directory_listing_parser_netware.cc @@ -9,7 +9,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/ftp/ftp_directory_listing_parser.h" #include "net/ftp/ftp_util.h" diff --git a/net/ftp/ftp_directory_listing_parser_netware_unittest.cc b/net/ftp/ftp_directory_listing_parser_netware_unittest.cc index e5e4211..6ff8d09 100644 --- a/net/ftp/ftp_directory_listing_parser_netware_unittest.cc +++ b/net/ftp/ftp_directory_listing_parser_netware_unittest.cc @@ -7,7 +7,7 @@ #include "base/format_macros.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/ftp/ftp_directory_listing_parser_netware.h" namespace net { diff --git a/net/ftp/ftp_directory_listing_parser_unittest.cc b/net/ftp/ftp_directory_listing_parser_unittest.cc index c50b07b..7511649 100644 --- a/net/ftp/ftp_directory_listing_parser_unittest.cc +++ b/net/ftp/ftp_directory_listing_parser_unittest.cc @@ -10,7 +10,7 @@ #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/ftp/ftp_directory_listing_parser.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/ftp/ftp_directory_listing_parser_unittest.h b/net/ftp/ftp_directory_listing_parser_unittest.h index a7c520a..9ac42d8 100644 --- a/net/ftp/ftp_directory_listing_parser_unittest.h +++ b/net/ftp/ftp_directory_listing_parser_unittest.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/ftp/ftp_directory_listing_parser.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/ftp/ftp_directory_listing_parser_vms.cc b/net/ftp/ftp_directory_listing_parser_vms.cc index e20a063..ea73584 100644 --- a/net/ftp/ftp_directory_listing_parser_vms.cc +++ b/net/ftp/ftp_directory_listing_parser_vms.cc @@ -9,8 +9,8 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/strings/string_split.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "net/ftp/ftp_directory_listing_parser.h" #include "net/ftp/ftp_util.h" diff --git a/net/ftp/ftp_directory_listing_parser_vms_unittest.cc b/net/ftp/ftp_directory_listing_parser_vms_unittest.cc index ceea951..ff0a3c4 100644 --- a/net/ftp/ftp_directory_listing_parser_vms_unittest.cc +++ b/net/ftp/ftp_directory_listing_parser_vms_unittest.cc @@ -8,7 +8,7 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/ftp/ftp_directory_listing_parser_vms.h" namespace net { diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc index 0cf42c3..b60712a 100644 --- a/net/ftp/ftp_network_transaction.cc +++ b/net/ftp/ftp_network_transaction.cc @@ -11,7 +11,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "net/base/address_list.h" #include "net/base/connection_type_histograms.h" diff --git a/net/ftp/ftp_network_transaction_unittest.cc b/net/ftp/ftp_network_transaction_unittest.cc index efc5143..45c632c 100644 --- a/net/ftp/ftp_network_transaction_unittest.cc +++ b/net/ftp/ftp_network_transaction_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" #include "net/base/net_util.h" diff --git a/net/ftp/ftp_util.cc b/net/ftp/ftp_util.cc index b2c816c..502d13e 100644 --- a/net/ftp/ftp_util.cc +++ b/net/ftp/ftp_util.cc @@ -16,8 +16,8 @@ #include "base/strings/string_piece.h" #include "base/strings/string_split.h" #include "base/strings/string_tokenizer.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "third_party/icu/public/common/unicode/uchar.h" #include "third_party/icu/public/i18n/unicode/datefmt.h" #include "third_party/icu/public/i18n/unicode/dtfmtsym.h" diff --git a/net/ftp/ftp_util_unittest.cc b/net/ftp/ftp_util_unittest.cc index 0f34bf5..302e17e 100644 --- a/net/ftp/ftp_util_unittest.cc +++ b/net/ftp/ftp_util_unittest.cc @@ -8,8 +8,8 @@ #include "base/format_macros.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/net/http/http_auth_cache_unittest.cc b/net/http/http_auth_cache_unittest.cc index 0bdb280..30cf465 100644 --- a/net/http/http_auth_cache_unittest.cc +++ b/net/http/http_auth_cache_unittest.cc @@ -7,7 +7,7 @@ #include "base/string16.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/http/http_auth_cache.h" #include "net/http/http_auth_handler.h" diff --git a/net/http/http_auth_controller.cc b/net/http/http_auth_controller.cc index 00b30d75..fe32d4e 100644 --- a/net/http/http_auth_controller.cc +++ b/net/http/http_auth_controller.cc @@ -8,8 +8,8 @@ #include "base/bind_helpers.h" #include "base/metrics/histogram.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/platform_thread.h" -#include "base/utf_string_conversions.h" #include "net/base/auth.h" #include "net/base/net_util.h" #include "net/dns/host_resolver.h" diff --git a/net/http/http_auth_controller_unittest.cc b/net/http/http_auth_controller_unittest.cc index dd9c0c2..2a18369 100644 --- a/net/http/http_auth_controller_unittest.cc +++ b/net/http/http_auth_controller_unittest.cc @@ -4,7 +4,7 @@ #include "net/http/http_auth_controller.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/test_completion_callback.h" diff --git a/net/http/http_auth_handler_basic.cc b/net/http/http_auth_handler_basic.cc index 52396cc..ecd0b4f 100644 --- a/net/http/http_auth_handler_basic.cc +++ b/net/http/http_auth_handler_basic.cc @@ -9,7 +9,7 @@ #include "base/base64.h" #include "base/i18n/icu_string_conversions.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/http/http_auth.h" diff --git a/net/http/http_auth_handler_basic_unittest.cc b/net/http/http_auth_handler_basic_unittest.cc index e8bf1d3..7a30647 100644 --- a/net/http/http_auth_handler_basic_unittest.cc +++ b/net/http/http_auth_handler_basic_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/http/http_auth_handler_basic.h" #include "net/http/http_request_info.h" diff --git a/net/http/http_auth_handler_digest.cc b/net/http/http_auth_handler_digest.cc index cc90b52..030fc21 100644 --- a/net/http/http_auth_handler_digest.cc +++ b/net/http/http_auth_handler_digest.cc @@ -12,7 +12,7 @@ #include "base/rand_util.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/http/http_auth.h" diff --git a/net/http/http_auth_handler_digest_unittest.cc b/net/http/http_auth_handler_digest_unittest.cc index 55ef565..da89a81 100644 --- a/net/http/http_auth_handler_digest_unittest.cc +++ b/net/http/http_auth_handler_digest_unittest.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" #include "net/http/http_auth_handler_digest.h" diff --git a/net/http/http_auth_handler_negotiate.cc b/net/http/http_auth_handler_negotiate.cc index f509d90..0d26ed2 100644 --- a/net/http/http_auth_handler_negotiate.cc +++ b/net/http/http_auth_handler_negotiate.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/address_family.h" #include "net/base/net_errors.h" #include "net/dns/host_resolver.h" diff --git a/net/http/http_auth_handler_negotiate_unittest.cc b/net/http/http_auth_handler_negotiate_unittest.cc index 9891c20..097e459 100644 --- a/net/http/http_auth_handler_negotiate_unittest.cc +++ b/net/http/http_auth_handler_negotiate_unittest.cc @@ -5,7 +5,7 @@ #include "net/http/http_auth_handler_negotiate.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" #include "net/dns/mock_host_resolver.h" diff --git a/net/http/http_auth_handler_ntlm.cc b/net/http/http_auth_handler_ntlm.cc index d404ce2..fdc5ca2 100644 --- a/net/http/http_auth_handler_ntlm.cc +++ b/net/http/http_auth_handler_ntlm.cc @@ -9,7 +9,7 @@ #endif #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" diff --git a/net/http/http_auth_handler_ntlm_portable.cc b/net/http/http_auth_handler_ntlm_portable.cc index 491a299a6..9a249f7 100644 --- a/net/http/http_auth_handler_ntlm_portable.cc +++ b/net/http/http_auth_handler_ntlm_portable.cc @@ -16,7 +16,7 @@ #include "base/rand_util.h" #include "base/string_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/base/zap.h" diff --git a/net/http/http_auth_handler_unittest.cc b/net/http/http_auth_handler_unittest.cc index f079bab..89ddf2b 100644 --- a/net/http/http_auth_handler_unittest.cc +++ b/net/http/http_auth_handler_unittest.cc @@ -5,7 +5,7 @@ #include "net/http/http_auth_handler.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/capturing_net_log.h" #include "net/base/net_errors.h" #include "net/base/net_log_unittest.h" diff --git a/net/http/http_auth_sspi_win.cc b/net/http/http_auth_sspi_win.cc index 61b3338..1a4d836 100644 --- a/net/http/http_auth_sspi_win.cc +++ b/net/http/http_auth_sspi_win.cc @@ -10,7 +10,7 @@ #include "base/base64.h" #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/http/http_auth.h" diff --git a/net/http/http_content_disposition.cc b/net/http/http_content_disposition.cc index b280bc1..c14fae5 100644 --- a/net/http/http_content_disposition.cc +++ b/net/http/http_content_disposition.cc @@ -10,7 +10,7 @@ #include "base/string_util.h" #include "base/strings/string_tokenizer.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_util.h" #include "net/http/http_util.h" #include "third_party/icu/public/common/unicode/ucnv.h" diff --git a/net/http/http_content_disposition_unittest.cc b/net/http/http_content_disposition_unittest.cc index 66c1a7f..62d9577 100644 --- a/net/http/http_content_disposition_unittest.cc +++ b/net/http/http_content_disposition_unittest.cc @@ -4,7 +4,7 @@ #include "net/http/http_content_disposition.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc index 54f1a43..6f5c955 100644 --- a/net/http/http_network_transaction_spdy2_unittest.cc +++ b/net/http/http_network_transaction_spdy2_unittest.cc @@ -16,8 +16,8 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/test/test_file_util.h" -#include "base/utf_string_conversions.h" #include "net/base/auth.h" #include "net/base/capturing_net_log.h" #include "net/base/completion_callback.h" diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc index 24b0b11..af4fb72 100644 --- a/net/http/http_network_transaction_spdy3_unittest.cc +++ b/net/http/http_network_transaction_spdy3_unittest.cc @@ -16,8 +16,8 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/test/test_file_util.h" -#include "base/utf_string_conversions.h" #include "net/base/auth.h" #include "net/base/capturing_net_log.h" #include "net/base/completion_callback.h" diff --git a/net/http/http_pipelined_network_transaction_unittest.cc b/net/http/http_pipelined_network_transaction_unittest.cc index 027eb1a..fdc5ab3 100644 --- a/net/http/http_pipelined_network_transaction_unittest.cc +++ b/net/http/http_pipelined_network_transaction_unittest.cc @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/address_list.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc b/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc index ea23e48..630693f 100644 --- a/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc +++ b/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" #include "net/http/http_network_session.h" diff --git a/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc b/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc index c1086d5..f408915 100644 --- a/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc +++ b/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" #include "net/http/http_network_session.h" diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc index 66a21c0..f4d5916 100644 --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc @@ -25,8 +25,8 @@ #include "base/sha1.h" #include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "crypto/sha2.h" #include "googleurl/src/gurl.h" diff --git a/net/http/url_security_manager_win.cc b/net/http/url_security_manager_win.cc index 858cc50..dbf9353 100644 --- a/net/http/url_security_manager_win.cc +++ b/net/http/url_security_manager_win.cc @@ -8,7 +8,7 @@ #pragma comment(lib, "urlmon.lib") #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/scoped_comptr.h" #include "googleurl/src/gurl.h" #include "net/http/http_auth_filter.h" diff --git a/net/proxy/mock_proxy_script_fetcher.cc b/net/proxy/mock_proxy_script_fetcher.cc index ef1ff83..2bd9730 100644 --- a/net/proxy/mock_proxy_script_fetcher.cc +++ b/net/proxy/mock_proxy_script_fetcher.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" namespace net { diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc index 994dd8f..da28be1 100644 --- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc +++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc @@ -8,9 +8,9 @@ #include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/threading/platform_thread.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" +#include "base/threading/platform_thread.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" diff --git a/net/proxy/proxy_resolver_script_data.cc b/net/proxy/proxy_resolver_script_data.cc index fffaed3..7ee07a5 100644 --- a/net/proxy/proxy_resolver_script_data.cc +++ b/net/proxy/proxy_resolver_script_data.cc @@ -5,7 +5,7 @@ #include "net/proxy/proxy_resolver_script_data.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace net { diff --git a/net/proxy/proxy_resolver_v8.cc b/net/proxy/proxy_resolver_v8.cc index 71ddd13..356cd48 100644 --- a/net/proxy/proxy_resolver_v8.cc +++ b/net/proxy/proxy_resolver_v8.cc @@ -12,8 +12,8 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/strings/string_tokenizer.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "googleurl/src/url_canon.h" #include "net/base/net_errors.h" diff --git a/net/proxy/proxy_resolver_v8_tracing_unittest.cc b/net/proxy/proxy_resolver_v8_tracing_unittest.cc index a4214bd..1ff4289 100644 --- a/net/proxy/proxy_resolver_v8_tracing_unittest.cc +++ b/net/proxy/proxy_resolver_v8_tracing_unittest.cc @@ -10,9 +10,9 @@ #include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" diff --git a/net/proxy/proxy_resolver_v8_unittest.cc b/net/proxy/proxy_resolver_v8_unittest.cc index eb50e35..e665de9 100644 --- a/net/proxy/proxy_resolver_v8_unittest.cc +++ b/net/proxy/proxy_resolver_v8_unittest.cc @@ -7,7 +7,7 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/net_log_unittest.h" diff --git a/net/proxy/proxy_resolver_winhttp.cc b/net/proxy/proxy_resolver_winhttp.cc index 1ddc8ca..96fea3f 100644 --- a/net/proxy/proxy_resolver_winhttp.cc +++ b/net/proxy/proxy_resolver_winhttp.cc @@ -9,7 +9,7 @@ #include "base/metrics/histogram.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/proxy/proxy_info.h" diff --git a/net/proxy/proxy_script_decider.cc b/net/proxy/proxy_script_decider.cc index e71712a..958d0c3 100644 --- a/net/proxy/proxy_script_decider.cc +++ b/net/proxy/proxy_script_decider.cc @@ -10,7 +10,7 @@ #include "base/format_macros.h" #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "net/base/net_errors.h" #include "net/proxy/dhcp_proxy_script_fetcher.h" diff --git a/net/proxy/proxy_script_decider_unittest.cc b/net/proxy/proxy_script_decider_unittest.cc index 24808c1..a9e7585 100644 --- a/net/proxy/proxy_script_decider_unittest.cc +++ b/net/proxy/proxy_script_decider_unittest.cc @@ -8,8 +8,8 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc index 6462643..b4f1f7a 100644 --- a/net/proxy/proxy_script_fetcher_impl_unittest.cc +++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/path_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/load_flags.h" #include "net/base/net_util.h" #include "net/base/test_completion_callback.h" diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc index e9abcee..ec24276 100644 --- a/net/proxy/proxy_service_unittest.cc +++ b/net/proxy/proxy_service_unittest.cc @@ -9,7 +9,7 @@ #include "base/format_macros.h" #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc index 7e1eeb9..8f376bb 100644 --- a/net/socket/ssl_client_socket_pool_unittest.cc +++ b/net/socket/ssl_client_socket_pool_unittest.cc @@ -7,8 +7,8 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "net/base/auth.h" #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index 6c8cbd3..097ae0b 100644 --- a/net/socket_stream/socket_stream.cc +++ b/net/socket_stream/socket_stream.cc @@ -18,7 +18,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/auth.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/net/socket_stream/socket_stream_unittest.cc b/net/socket_stream/socket_stream_unittest.cc index 7f3c5f1..d5c261b 100644 --- a/net/socket_stream/socket_stream_unittest.cc +++ b/net/socket_stream/socket_stream_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/auth.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc index 9c06f9c..fe626de 100644 --- a/net/spdy/spdy_proxy_client_socket_unittest.cc +++ b/net/spdy/spdy_proxy_client_socket_unittest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/address_list.h" #include "net/base/capturing_net_log.h" #include "net/base/net_log.h" diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index 1e71a27..c16e6ad 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -20,8 +20,8 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "crypto/ec_private_key.h" #include "crypto/ec_signature_creator.h" diff --git a/net/test/python_utils.cc b/net/test/python_utils.cc index 483aed7..209b50a 100644 --- a/net/test/python_utils.cc +++ b/net/test/python_utils.cc @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" const char kPythonPathEnv[] = "PYTHONPATH"; diff --git a/net/test/spawned_test_server/local_test_server_win.cc b/net/test/spawned_test_server/local_test_server_win.cc index 656c67b..6b7da93 100644 --- a/net/test/spawned_test_server/local_test_server_win.cc +++ b/net/test/spawned_test_server/local_test_server_win.cc @@ -16,9 +16,9 @@ #include "base/process_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/test/test_timeouts.h" #include "base/threading/thread.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_handle.h" #include "net/test/python_utils.h" diff --git a/net/tools/crash_cache/crash_cache.cc b/net/tools/crash_cache/crash_cache.cc index 9406233..97c28ce 100644 --- a/net/tools/crash_cache/crash_cache.cc +++ b/net/tools/crash_cache/crash_cache.cc @@ -18,8 +18,8 @@ #include "base/process_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" -#include "base/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/net_export.h" #include "net/base/test_completion_callback.h" diff --git a/net/tools/dump_cache/cache_dumper.cc b/net/tools/dump_cache/cache_dumper.cc index 272851c..e6bac0a 100644 --- a/net/tools/dump_cache/cache_dumper.cc +++ b/net/tools/dump_cache/cache_dumper.cc @@ -5,7 +5,7 @@ #include "net/tools/dump_cache/cache_dumper.h" #include "base/file_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/disk_cache/entry_impl.h" diff --git a/net/tools/get_server_time/get_server_time.cc b/net/tools/get_server_time/get_server_time.cc index de2035b..1fca24e 100644 --- a/net/tools/get_server_time/get_server_time.cc +++ b/net/tools/get_server_time/get_server_time.cc @@ -26,8 +26,8 @@ #include "base/message_loop.h" #include "base/single_thread_task_runner.h" #include "base/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "build/build_config.h" #include "googleurl/src/gurl.h" diff --git a/net/tools/testserver/run_testserver.cc b/net/tools/testserver/run_testserver.cc index 3622e7d..9f5f561 100644 --- a/net/tools/testserver/run_testserver.cc +++ b/net/tools/testserver/run_testserver.cc @@ -9,8 +9,8 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop.h" +#include "base/strings/utf_string_conversions.h" #include "base/test/test_timeouts.h" -#include "base/utf_string_conversions.h" #include "net/test/spawned_test_server/spawned_test_server.h" static void PrintUsage() { diff --git a/net/url_request/url_request_file_dir_job.cc b/net/url_request/url_request_file_dir_job.cc index ff1e780..cb10de4 100644 --- a/net/url_request/url_request_file_dir_job.cc +++ b/net/url_request/url_request_file_dir_job.cc @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/message_loop.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" #include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc index c92ae6c..2d117c5 100644 --- a/net/url_request/url_request_ftp_job.cc +++ b/net/url_request/url_request_ftp_job.cc @@ -6,7 +6,7 @@ #include "base/compiler_specific.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/auth.h" #include "net/base/host_port_pair.h" #include "net/base/load_flags.h" diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h index d0f06dc..158252f 100644 --- a/net/url_request/url_request_test_util.h +++ b/net/url_request/url_request_test_util.h @@ -18,8 +18,8 @@ #include "base/process_util.h" #include "base/string16.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "googleurl/src/url_util.h" #include "net/base/io_buffer.h" #include "net/base/load_timing_info.h" diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 4b2ef4a..9fe6c5a 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -26,7 +26,7 @@ #include "base/stringprintf.h" #include "base/strings/string_piece.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/capturing_net_log.h" #include "net/base/load_flags.h" #include "net/base/load_timing_info.h" |