Use a direct include of strings headers in net/http/.

BUG=247723
TEST=none
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/15906017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205594 0039d316-1c4b-4281-b951-d872f2087c98

diff --git a/net/http/http_auth.cc b/net/http/http_auth.cc
index 9e9410b..3cc9db1 100644
--- a/net/http/http_auth.cc
+++ b/net/http/http_auth.cc

@@ -7,8 +7,8 @@
 #include <algorithm>
 
 #include "base/basictypes.h"
-#include "base/string_util.h"
 #include "base/strings/string_tokenizer.h"
+#include "base/strings/string_util.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_auth_handler.h"
 #include "net/http/http_auth_handler_factory.h"

diff --git a/net/http/http_auth_cache.cc b/net/http/http_auth_cache.cc
index fdd106a3..79ea7fd6 100644
--- a/net/http/http_auth_cache.cc
+++ b/net/http/http_auth_cache.cc

@@ -5,7 +5,7 @@
 #include "net/http/http_auth_cache.h"
 
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 
 namespace {
 

diff --git a/net/http/http_auth_cache_unittest.cc b/net/http/http_auth_cache_unittest.cc
index 30cf4652..a4ea1c6d 100644
--- a/net/http/http_auth_cache_unittest.cc
+++ b/net/http/http_auth_cache_unittest.cc

@@ -4,9 +4,9 @@
 
 #include <string>
 
-#include "base/string16.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string16.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_auth_cache.h"

diff --git a/net/http/http_auth_controller.cc b/net/http/http_auth_controller.cc
index fe32d4e..e9d6171 100644
--- a/net/http/http_auth_controller.cc
+++ b/net/http/http_auth_controller.cc

@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "net/base/auth.h"

diff --git a/net/http/http_auth_filter.cc b/net/http/http_auth_filter.cc
index 78e662e..11313ab 100644
--- a/net/http/http_auth_filter.cc
+++ b/net/http/http_auth_filter.cc

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "net/http/http_auth_filter.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "googleurl/src/gurl.h"
 
 namespace net {

diff --git a/net/http/http_auth_filter_win.h b/net/http/http_auth_filter_win.h
index e6cd2a7..24305b5 100644
--- a/net/http/http_auth_filter_win.h
+++ b/net/http/http_auth_filter_win.h

@@ -8,7 +8,7 @@
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace net {
 

diff --git a/net/http/http_auth_gssapi_posix.cc b/net/http/http_auth_gssapi_posix.cc
index b6f1bd4..4d7bf07 100644
--- a/net/http/http_auth_gssapi_posix.cc
+++ b/net/http/http_auth_gssapi_posix.cc

@@ -11,8 +11,8 @@
 #include "base/files/file_path.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"

diff --git a/net/http/http_auth_handler_basic.cc b/net/http/http_auth_handler_basic.cc
index ecd0b4f..af5f188 100644
--- a/net/http/http_auth_handler_basic.cc
+++ b/net/http/http_auth_handler_basic.cc

@@ -8,7 +8,7 @@
 
 #include "base/base64.h"
 #include "base/i18n/icu_string_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.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 7a30647..5e05b76d 100644
--- a/net/http/http_auth_handler_basic_unittest.cc
+++ b/net/http/http_auth_handler_basic_unittest.cc

@@ -6,7 +6,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_auth_handler_basic.h"

diff --git a/net/http/http_auth_handler_digest.cc b/net/http/http_auth_handler_digest.cc
index 030fc21c..904430ec 100644
--- a/net/http/http_auth_handler_digest.cc
+++ b/net/http/http_auth_handler_digest.cc

@@ -10,8 +10,8 @@
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/rand_util.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 "net/base/net_errors.h"
 #include "net/base/net_util.h"

diff --git a/net/http/http_auth_handler_digest_unittest.cc b/net/http/http_auth_handler_digest_unittest.cc
index da89a81..dee44eb 100644
--- a/net/http/http_auth_handler_digest_unittest.cc
+++ b/net/http/http_auth_handler_digest_unittest.cc

@@ -5,7 +5,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"

diff --git a/net/http/http_auth_handler_factory.cc b/net/http/http_auth_handler_factory.cc
index 6a6b574..f94bd33d 100644
--- a/net/http/http_auth_handler_factory.cc
+++ b/net/http/http_auth_handler_factory.cc

@@ -5,7 +5,7 @@
 #include "net/http/http_auth_handler_factory.h"
 
 #include "base/stl_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_auth_filter.h"
 #include "net/http/http_auth_handler_basic.h"

diff --git a/net/http/http_auth_handler_mock.cc b/net/http/http_auth_handler_mock.cc
index fb2d524..f78de645b 100644
--- a/net/http/http_auth_handler_mock.cc
+++ b/net/http/http_auth_handler_mock.cc

@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_request_info.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/net/http/http_auth_handler_negotiate.cc b/net/http/http_auth_handler_negotiate.cc
index 0d26ed2..85454fb 100644
--- a/net/http/http_auth_handler_negotiate.cc
+++ b/net/http/http_auth_handler_negotiate.cc

@@ -7,8 +7,8 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.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 "net/base/address_family.h"
 #include "net/base/net_errors.h"

diff --git a/net/http/http_auth_handler_negotiate_unittest.cc b/net/http/http_auth_handler_negotiate_unittest.cc
index 097e4597d..809f58e1 100644
--- a/net/http/http_auth_handler_negotiate_unittest.cc
+++ b/net/http/http_auth_handler_negotiate_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "net/http/http_auth_handler_negotiate.h"
 
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"

diff --git a/net/http/http_auth_handler_ntlm.cc b/net/http/http_auth_handler_ntlm.cc
index fdc5ca2..b55581e 100644
--- a/net/http/http_auth_handler_ntlm.cc
+++ b/net/http/http_auth_handler_ntlm.cc

@@ -8,7 +8,7 @@
 #include "base/base64.h"
 #endif
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.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.h b/net/http/http_auth_handler_ntlm.h
index 71534b9..971dd1f 100644
--- a/net/http/http_auth_handler_ntlm.h
+++ b/net/http/http_auth_handler_ntlm.h

@@ -25,7 +25,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "net/http/http_auth_handler.h"
 #include "net/http/http_auth_handler_factory.h"
 

diff --git a/net/http/http_auth_handler_ntlm_portable.cc b/net/http/http_auth_handler_ntlm_portable.cc
index 9a249f7..d1fbf23c 100644
--- a/net/http/http_auth_handler_ntlm_portable.cc
+++ b/net/http/http_auth_handler_ntlm_portable.cc

@@ -14,7 +14,7 @@
 
 #include "base/md5.h"
 #include "base/rand_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/net_errors.h"

diff --git a/net/http/http_auth_handler_ntlm_win.cc b/net/http/http_auth_handler_ntlm_win.cc
index d624f12..955c55d 100644
--- a/net/http/http_auth_handler_ntlm_win.cc
+++ b/net/http/http_auth_handler_ntlm_win.cc

@@ -9,7 +9,7 @@
 
 #include "net/http/http_auth_handler_ntlm.h"
 
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/http/http_auth_sspi_win.h"

diff --git a/net/http/http_auth_handler_unittest.cc b/net/http/http_auth_handler_unittest.cc
index 89ddf2b..f8928fc 100644
--- a/net/http/http_auth_handler_unittest.cc
+++ b/net/http/http_auth_handler_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "net/http/http_auth_handler.h"
 
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/capturing_net_log.h"
 #include "net/base/net_errors.h"

diff --git a/net/http/http_auth_sspi_win.cc b/net/http/http_auth_sspi_win.cc
index 1a4d836..abc8050 100644
--- a/net/http/http_auth_sspi_win.cc
+++ b/net/http/http_auth_sspi_win.cc

@@ -9,7 +9,7 @@
 
 #include "base/base64.h"
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.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_sspi_win.h b/net/http/http_auth_sspi_win.h
index cc34c8f..57a3daacf 100644
--- a/net/http/http_auth_sspi_win.h
+++ b/net/http/http_auth_sspi_win.h

@@ -16,7 +16,7 @@
 
 #include <string>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "net/base/net_export.h"
 #include "net/http/http_auth.h"
 

diff --git a/net/http/http_auth_unittest.cc b/net/http/http_auth_unittest.cc
index ff63c9b1..6f1471d 100644
--- a/net/http/http_auth_unittest.cc
+++ b/net/http/http_auth_unittest.cc

@@ -7,7 +7,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "net/base/net_errors.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/http/http_auth.h"

diff --git a/net/http/http_basic_stream.cc b/net/http/http_basic_stream.cc
index 3eb3f988..d70ac02b 100644
--- a/net/http/http_basic_stream.cc
+++ b/net/http/http_basic_stream.cc

@@ -4,7 +4,7 @@
 
 #include "net/http/http_basic_stream.h"
 
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_request_headers.h"

diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index 6fe5a814..db008b8 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc

@@ -23,9 +23,9 @@
 #include "base/metrics/field_trial.h"
 #include "base/pickle.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_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/threading/worker_pool.h"
 #include "net/base/cache_type.h"
 #include "net/base/io_buffer.h"

diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc
index 8105f7c..bf2e0f3 100644
--- a/net/http/http_cache_transaction.cc
+++ b/net/http/http_cache_transaction.cc

@@ -20,8 +20,8 @@
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/rand_util.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 "base/time.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"

diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc
index 2a686f24..14099c7 100644
--- a/net/http/http_cache_unittest.cc
+++ b/net/http/http_cache_unittest.cc

@@ -8,8 +8,8 @@
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "net/base/cache_type.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/load_flags.h"

diff --git a/net/http/http_chunked_decoder.cc b/net/http/http_chunked_decoder.cc
index 770f232..ca07f24 100644
--- a/net/http/http_chunked_decoder.cc
+++ b/net/http/http_chunked_decoder.cc

@@ -45,9 +45,9 @@
 #include "net/http/http_chunked_decoder.h"
 
 #include "base/logging.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
 #include "net/base/net_errors.h"
 
 namespace net {

diff --git a/net/http/http_content_disposition.cc b/net/http/http_content_disposition.cc
index c14fae56..758b176 100644
--- a/net/http/http_content_disposition.cc
+++ b/net/http/http_content_disposition.cc

@@ -7,8 +7,8 @@
 #include "base/base64.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
-#include "base/string_util.h"
 #include "base/strings/string_tokenizer.h"
+#include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/net_util.h"

diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index 5fa5c81..e4d082e 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc

@@ -5,9 +5,9 @@
 #include "net/http/http_network_layer.h"
 
 #include "base/logging.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_network_transaction.h"
 #include "net/http/http_server_properties_impl.h"

diff --git a/net/http/http_network_layer_unittest.cc b/net/http/http_network_layer_unittest.cc
index dde37bc..36598b0 100644
--- a/net/http/http_network_layer_unittest.cc
+++ b/net/http/http_network_layer_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "net/http/http_network_layer.h"
 
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "net/base/net_log.h"
 #include "net/cert/mock_cert_verifier.h"
 #include "net/dns/mock_host_resolver.h"

diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 1c76f7e..0ea7d94 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc

@@ -10,7 +10,7 @@
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/values.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_response_body_drainer.h"

diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 1c55202..efdd310 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc

@@ -16,9 +16,9 @@
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.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_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "googleurl/src/gurl.h"

diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc
index d9cbb0a..6e03d84 100644
--- a/net/http/http_network_transaction_spdy2_unittest.cc
+++ b/net/http/http_network_transaction_spdy2_unittest.cc

@@ -15,7 +15,7 @@
 #include "base/files/file_path.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_file_util.h"
 #include "net/base/auth.h"

diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc
index 74308085d..ee98333d 100644
--- a/net/http/http_network_transaction_spdy3_unittest.cc
+++ b/net/http/http_network_transaction_spdy3_unittest.cc

@@ -15,7 +15,7 @@
 #include "base/files/file_path.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_file_util.h"
 #include "net/base/auth.h"

diff --git a/net/http/http_pipelined_network_transaction_unittest.cc b/net/http/http_pipelined_network_transaction_unittest.cc
index fdc5ab3..af620b31 100644
--- a/net/http/http_pipelined_network_transaction_unittest.cc
+++ b/net/http/http_pipelined_network_transaction_unittest.cc

@@ -7,7 +7,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/address_list.h"
 #include "net/base/io_buffer.h"

diff --git a/net/http/http_pipelined_stream.cc b/net/http/http_pipelined_stream.cc
index 23154dd6..951c2f9 100644
--- a/net/http/http_pipelined_stream.cc
+++ b/net/http/http_pipelined_stream.cc

@@ -5,7 +5,7 @@
 #include "net/http/http_pipelined_stream.h"
 
 #include "base/logging.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_pipelined_connection_impl.h"
 #include "net/http/http_request_headers.h"

diff --git a/net/http/http_proxy_client_socket.cc b/net/http/http_proxy_client_socket.cc
index fc9c2b3..9352312 100644
--- a/net/http/http_proxy_client_socket.cc
+++ b/net/http/http_proxy_client_socket.cc

@@ -6,8 +6,8 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/auth.h"
 #include "net/base/host_port_pair.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 630693f..60e39bd 100644
--- a/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc
+++ b/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc

@@ -6,7 +6,7 @@
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.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 f408915..883f0cf 100644
--- a/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc
+++ b/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc

@@ -6,7 +6,7 @@
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"

diff --git a/net/http/http_request_headers.cc b/net/http/http_request_headers.cc
index 298c5e4..15eee0c 100644
--- a/net/http/http_request_headers.cc
+++ b/net/http/http_request_headers.cc

@@ -5,9 +5,9 @@
 #include "net/http/http_request_headers.h"
 
 #include "base/logging.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "net/http/http_util.h"
 

diff --git a/net/http/http_response_headers.cc b/net/http/http_response_headers.cc
index 9e71393..279149f5 100644
--- a/net/http/http_response_headers.cc
+++ b/net/http/http_response_headers.cc

@@ -14,10 +14,10 @@
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/pickle.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_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "net/base/escape.h"

diff --git a/net/http/http_security_headers.cc b/net/http/http_security_headers.cc
index e808713..0540bc72 100644
--- a/net/http/http_security_headers.cc
+++ b/net/http/http_security_headers.cc

@@ -4,9 +4,9 @@
 
 #include "base/base64.h"
 #include "base/basictypes.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_tokenizer.h"
+#include "base/strings/string_util.h"
 #include "net/http/http_security_headers.h"
 #include "net/http/http_util.h"
 

diff --git a/net/http/http_server_properties.cc b/net/http/http_server_properties.cc
index 81a0e98..1c94f848 100644
--- a/net/http/http_server_properties.cc
+++ b/net/http/http_server_properties.cc

@@ -5,7 +5,7 @@
 #include "net/http/http_server_properties.h"
 
 #include "base/logging.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 
 namespace net {
 

diff --git a/net/http/http_server_properties_impl.cc b/net/http/http_server_properties_impl.cc
index 9e2a2fa..12f9847b 100644
--- a/net/http/http_server_properties_impl.cc
+++ b/net/http/http_server_properties_impl.cc

@@ -7,7 +7,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "net/http/http_pipelined_host_capability.h"
 
 namespace net {

diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc
index 05114ba..a48fcb6c 100644
--- a/net/http/http_stream_factory.cc
+++ b/net/http/http_stream_factory.cc

@@ -5,7 +5,7 @@
 #include "net/http/http_stream_factory.h"
 
 #include "base/logging.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/host_mapping_rules.h"

diff --git a/net/http/http_stream_factory.h b/net/http/http_stream_factory.h
index eaadcc72..4d8afac 100644
--- a/net/http/http_stream_factory.h
+++ b/net/http/http_stream_factory.h

@@ -11,7 +11,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "net/base/completion_callback.h"
 #include "net/base/load_states.h"
 #include "net/base/net_export.h"

diff --git a/net/http/http_stream_factory_impl.cc b/net/http/http_stream_factory_impl.cc
index 47110dfd..c31ba44 100644
--- a/net/http/http_stream_factory_impl.cc
+++ b/net/http/http_stream_factory_impl.cc

@@ -4,8 +4,8 @@
 
 #include "net/http/http_stream_factory_impl.h"
 
-#include "base/string_number_conversions.h"
 #include "base/stl_util.h"
+#include "base/strings/string_number_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_log.h"
 #include "net/base/net_util.h"

diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index fa7eba5..6bfef1e 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc

@@ -8,8 +8,8 @@
 #include "base/bind_helpers.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/values.h"
 #include "build/build_config.h"
 #include "net/base/connection_type_histograms.h"

diff --git a/net/http/http_stream_parser.cc b/net/http/http_stream_parser.cc
index 17b5c6e..2737eee0f 100644
--- a/net/http/http_stream_parser.cc
+++ b/net/http/http_stream_parser.cc

@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/values.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
@@ -16,8 +16,8 @@
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
-#include "net/socket/ssl_client_socket.h"
 #include "net/socket/client_socket_handle.h"
+#include "net/socket/ssl_client_socket.h"
 
 namespace {
 

diff --git a/net/http/http_stream_parser_unittest.cc b/net/http/http_stream_parser_unittest.cc
index 99a0803..cf5fa4140 100644
--- a/net/http/http_stream_parser_unittest.cc
+++ b/net/http/http_stream_parser_unittest.cc

@@ -8,8 +8,8 @@
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/stringprintf.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"

diff --git a/net/http/http_transaction_unittest.cc b/net/http/http_transaction_unittest.cc
index 40d733b6..c28903a 100644
--- a/net/http/http_transaction_unittest.cc
+++ b/net/http/http_transaction_unittest.cc

@@ -8,11 +8,11 @@
 
 #include "base/bind.h"
 #include "base/message_loop.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/time.h"
-#include "net/base/net_errors.h"
 #include "net/base/load_flags.h"
 #include "net/base/load_timing_info.h"
+#include "net/base/net_errors.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_request_info.h"

diff --git a/net/http/http_transaction_unittest.h b/net/http/http_transaction_unittest.h
index a84c86be..50efa44 100644
--- a/net/http/http_transaction_unittest.h
+++ b/net/http/http_transaction_unittest.h

@@ -12,7 +12,7 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"

diff --git a/net/http/http_util.cc b/net/http/http_util.cc
index 4a3b754..6fb5bd18 100644
--- a/net/http/http_util.cc
+++ b/net/http/http_util.cc

@@ -11,11 +11,11 @@
 
 #include "base/basictypes.h"
 #include "base/logging.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_tokenizer.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/time.h"
 
 using std::string;

diff --git a/net/http/http_util_unittest.cc b/net/http/http_util_unittest.cc
index f86821c..fe2d8b4 100644
--- a/net/http/http_util_unittest.cc
+++ b/net/http/http_util_unittest.cc

@@ -5,7 +5,7 @@
 #include <algorithm>
 
 #include "base/basictypes.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "net/http/http_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

diff --git a/net/http/http_vary_data.cc b/net/http/http_vary_data.cc
index 51b74a4..f102058 100644
--- a/net/http/http_vary_data.cc
+++ b/net/http/http_vary_data.cc

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 
 #include "base/pickle.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_headers.h"

diff --git a/net/http/mock_gssapi_library_posix.cc b/net/http/mock_gssapi_library_posix.cc
index 6d44729..b4d6514 100644
--- a/net/http/mock_gssapi_library_posix.cc
+++ b/net/http/mock_gssapi_library_posix.cc

@@ -5,8 +5,8 @@
 #include "net/http/mock_gssapi_library_posix.h"
 
 #include "base/logging.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {

diff --git a/net/http/partial_data.cc b/net/http/partial_data.cc
index 0e095ad..02fda6c 100644
--- a/net/http/partial_data.cc
+++ b/net/http/partial_data.cc

@@ -8,9 +8,9 @@
 #include "base/bind_helpers.h"
 #include "base/format_macros.h"
 #include "base/logging.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 "net/base/net_errors.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_response_headers.h"

diff --git a/net/http/proxy_client_socket.cc b/net/http/proxy_client_socket.cc
index 4caab08..ed8b3c9 100644
--- a/net/http/proxy_client_socket.cc
+++ b/net/http/proxy_client_socket.cc

@@ -5,7 +5,7 @@
 #include "net/http/proxy_client_socket.h"
 
 #include "base/metrics/histogram.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_errors.h"

diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc
index f4d5916..579c2f29 100644
--- a/net/http/transport_security_state.cc
+++ b/net/http/transport_security_state.cc

@@ -23,8 +23,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/sha1.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 "base/strings/utf_string_conversions.h"
 #include "base/time.h"
 #include "base/values.h"

diff --git a/net/http/url_security_manager_win.cc b/net/http/url_security_manager_win.cc
index dbf9353..6d43db08 100644
--- a/net/http/url_security_manager_win.cc
+++ b/net/http/url_security_manager_win.cc

@@ -7,7 +7,7 @@
 #include <urlmon.h>
 #pragma comment(lib, "urlmon.lib")
 
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_comptr.h"
 #include "googleurl/src/gurl.h"