Use a direct include of strings headers in net/android/, net/base/, n…

…et/cert/, net/cookies/. BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/15942015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205483 0039d316-1c4b-4281-b951-d872f2087c98
hylschwy · Jun 11, 2013 · 4b35521 · 4b35521
1 parent efadf73
commit 4b35521
Show file tree

Hide file tree

Showing 56 changed files with 72 additions and 72 deletions.
diff --git a/net/android/keystore_unittest.cc b/net/android/keystore_unittest.cc
@@ -22,8 +22,8 @@
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_handle.h"
-#include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "crypto/openssl_util.h"
 #include "jni/AndroidKeyStoreTestUtil_jni.h"
 #include "net/android/keystore.h"

diff --git a/net/base/address_list_unittest.cc b/net/base/address_list_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "net/base/address_list.h"
 
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/sys_byteorder.h"
 #include "net/base/net_util.h"
 #include "net/base/sys_addrinfo.h"

diff --git a/net/base/auth.h b/net/base/auth.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/memory/ref_counted.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_export.h"
 

diff --git a/net/base/data_url.cc b/net/base/data_url.cc
@@ -10,8 +10,8 @@
 
 #include "base/base64.h"
 #include "base/basictypes.h"
-#include "base/string_util.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 

diff --git a/net/base/directory_lister_unittest.cc b/net/base/directory_lister_unittest.cc
@@ -11,7 +11,7 @@
 #include "base/i18n/file_util_icu.h"
 #include "base/message_loop.h"
 #include "base/platform_file.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "net/base/directory_lister.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/net/base/escape.cc b/net/base/escape.cc
@@ -8,8 +8,8 @@
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string_util.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_offset_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 

diff --git a/net/base/escape.h b/net/base/escape.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "net/base/net_export.h"
 
 namespace net {

diff --git a/net/base/escape_unittest.cc b/net/base/escape_unittest.cc
@@ -9,8 +9,8 @@
 
 #include "base/basictypes.h"
 #include "base/i18n/icu_string_conversions.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

diff --git a/net/base/expiring_cache_unittest.cc b/net/base/expiring_cache_unittest.cc
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/stl_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/time.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/net/base/filter.cc b/net/base/filter.cc
@@ -5,7 +5,7 @@
 #include "net/base/filter.h"
 
 #include "base/files/file_path.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "net/base/gzip_filter.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_util.h"

diff --git a/net/base/hash_value.cc b/net/base/hash_value.cc
@@ -7,8 +7,8 @@
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/sha1.h"
-#include "base/string_util.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 
 namespace net {
 

diff --git a/net/base/host_mapping_rules.cc b/net/base/host_mapping_rules.cc
@@ -5,9 +5,9 @@
 #include "net/base/host_mapping_rules.h"
 
 #include "base/logging.h"
-#include "base/string_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
+#include "base/strings/string_util.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_util.h"
 

diff --git a/net/base/host_port_pair.cc b/net/base/host_port_pair.cc
@@ -4,10 +4,10 @@
 
 #include "net/base/host_port_pair.h"
 
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/ip_endpoint.h"
 

diff --git a/net/base/ip_endpoint.cc b/net/base/ip_endpoint.cc
@@ -5,7 +5,7 @@
 #include "net/base/ip_endpoint.h"
 
 #include "base/logging.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/sys_byteorder.h"
 #if defined(OS_WIN)
 #include <winsock2.h>

diff --git a/net/base/ip_endpoint_unittest.cc b/net/base/ip_endpoint_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "net/base/ip_endpoint.h"
 
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"

diff --git a/net/base/keygen_handler_mac.cc b/net/base/keygen_handler_mac.cc
@@ -12,7 +12,7 @@
 #include "base/logging.h"
 #include "base/mac/mac_logging.h"
 #include "base/mac/scoped_cftyperef.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "crypto/cssm_init.h"

diff --git a/net/base/keygen_handler_win.cc b/net/base/keygen_handler_win.cc
@@ -17,8 +17,8 @@
 #include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "base/string_util.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "crypto/capi_util.h"
 #include "crypto/scoped_capi_types.h"

diff --git a/net/base/load_states.h b/net/base/load_states.h
@@ -5,7 +5,7 @@
 #ifndef NET_BASE_LOAD_STATES_H__
 #define NET_BASE_LOAD_STATES_H__
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace net {
 

diff --git a/net/base/mime_sniffer.cc b/net/base/mime_sniffer.cc
@@ -99,7 +99,7 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/mime_util.h"
 

diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
@@ -13,8 +13,8 @@
 #include "base/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "base/string_util.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 
 using std::string;

diff --git a/net/base/net_errors_posix.cc b/net/base/net_errors_posix.cc
@@ -10,7 +10,7 @@
 #include <unistd.h>
 
 #include "base/logging.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 
 namespace net {
 

diff --git a/net/base/net_log.cc b/net/base/net_log.cc
@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
 #include "base/values.h"

diff --git a/net/base/net_log.h b/net/base/net_log.h
@@ -12,7 +12,7 @@
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "net/base/net_export.h"

diff --git a/net/base/net_util.cc b/net/base/net_util.cc
@@ -39,12 +39,12 @@
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_offset_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"

diff --git a/net/base/net_util.h b/net/base/net_util.h
@@ -16,12 +16,12 @@
 #endif
 
 #include <list>
-#include <string>
 #include <set>
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "net/base/address_family.h"
 #include "net/base/escape.h"
 #include "net/base/net_export.h"

diff --git a/net/base/net_util_posix.cc b/net/base/net_util_posix.cc
@@ -9,8 +9,8 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/string_util.h"
 #include "base/strings/string_tokenizer.h"
+#include "base/strings/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"

diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc
@@ -10,9 +10,9 @@
 
 #include "base/files/file_path.h"
 #include "base/format_macros.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_byteorder.h"

diff --git a/net/base/net_util_win.cc b/net/base/net_util_win.cc
@@ -12,8 +12,8 @@
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string_util.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"

diff --git a/net/base/network_delegate.h b/net/base/network_delegate.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/callback.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/threading/non_thread_safe.h"
 #include "net/base/auth.h"
 #include "net/base/completion_callback.h"

diff --git a/net/base/registry_controlled_domains/registry_controlled_domain.cc b/net/base/registry_controlled_domains/registry_controlled_domain.cc
@@ -46,7 +46,7 @@
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_parse.h"

diff --git a/net/base/sdch_manager.cc b/net/base/sdch_manager.cc
@@ -7,8 +7,8 @@
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "crypto/sha2.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/url_request/url_request_http_job.h"

diff --git a/net/base/zap.h b/net/base/zap.h
@@ -6,7 +6,7 @@
 #define NET_BASE_ZAP_H_
 
 #include <string>
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace net {
 

diff --git a/net/cert/cert_verify_proc_unittest.cc b/net/cert/cert_verify_proc_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/sha1.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "crypto/sha2.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_data_directory.h"

diff --git a/net/cert/cert_verify_proc_win.cc b/net/cert/cert_verify_proc_win.cc
@@ -9,7 +9,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/sha1.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "crypto/capi_util.h"
 #include "crypto/scoped_capi_types.h"

diff --git a/net/cert/crl_set.cc b/net/cert/crl_set.cc
@@ -7,8 +7,8 @@
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "crypto/sha2.h"

diff --git a/net/cert/mock_cert_verifier.cc b/net/cert/mock_cert_verifier.cc
@@ -5,7 +5,7 @@
 #include "net/cert/mock_cert_verifier.h"
 
 #include "base/memory/ref_counted.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "net/base/net_errors.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/cert_verify_result.h"

diff --git a/net/cert/multi_threaded_cert_verifier_unittest.cc b/net/cert/multi_threaded_cert_verifier_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/format_macros.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/base/test_completion_callback.h"

diff --git a/net/cert/nss_cert_database.h b/net/cert/nss_cert_database.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "net/base/net_export.h"
 #include "net/cert/cert_type.h"
 #include "net/cert/x509_certificate.h"

diff --git a/net/cert/nss_cert_database_unittest.cc b/net/cert/nss_cert_database_unittest.cc
@@ -13,8 +13,8 @@
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
-#include "base/string16.h"
-#include "base/string_util.h"
+#include "base/strings/string16.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "crypto/nss_util.h"
 #include "crypto/nss_util_internal.h"