Use a direct include of strings headers in base/.

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

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

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

30 files changed, 34 insertions, 34 deletions

diff --git a/base/json/json_value_converter.h b/base/json/json_value_converter.h
index 59778e5..cf3c74f 100644
--- a/base/json/json_value_converter.h
+++ b/base/json/json_value_converter.h
@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/stl_util.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "base/values.h"
 
diff --git a/base/json/json_value_serializer_unittest.cc b/base/json/json_value_serializer_unittest.cc
index 78e2f44..b428e2a 100644
--- a/base/json/json_value_serializer_unittest.cc
+++ b/base/json/json_value_serializer_unittest.cc
@@ -12,7 +12,7 @@
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/json/json_writer.cc b/base/json/json_writer.cc
index e97bd2d..6a9cc6a 100644
--- a/base/json/json_writer.cc
+++ b/base/json/json_writer.cc
@@ -8,8 +8,8 @@
 
 #include "base/json/string_escape.h"
 #include "base/logging.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 
diff --git a/base/json/string_escape.cc b/base/json/string_escape.cc
index 4f9f269..eaa73ce 100644
--- a/base/json/string_escape.cc
+++ b/base/json/string_escape.cc
@@ -6,8 +6,8 @@
 
 #include <string>
 
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 
 namespace base {
 
diff --git a/base/json/string_escape.h b/base/json/string_escape.h
index 088db62..5efc350 100644
--- a/base/json/string_escape.h
+++ b/base/json/string_escape.h
@@ -10,7 +10,7 @@
 #include <string>
 
 #include "base/base_export.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 
diff --git a/base/linux_util.cc b/base/linux_util.cc
index 84f2028..bb96a33 100644
--- a/base/linux_util.cc
+++ b/base/linux_util.cc
@@ -20,7 +20,7 @@
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/synchronization/lock.h"
 
 namespace {
diff --git a/base/location.cc b/base/location.cc
index fd28de4..b5da027 100644
--- a/base/location.cc
+++ b/base/location.cc
@@ -12,8 +12,8 @@ extern "C" {
 #endif
 
 #include "base/location.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
 
 namespace tracked_objects {
 
diff --git a/base/mac/authorization_util.mm b/base/mac/authorization_util.mm
index 9e8c354..c292589 100644
--- a/base/mac/authorization_util.mm
+++ b/base/mac/authorization_util.mm
@@ -16,8 +16,8 @@
 #import "base/mac/mac_util.h"
 #include "base/mac/scoped_authorizationref.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 
 namespace base {
 namespace mac {
diff --git a/base/mac/libdispatch_task_runner_unittest.cc b/base/mac/libdispatch_task_runner_unittest.cc
index 6d0445d..4c0a2b6 100644
--- a/base/mac/libdispatch_task_runner_unittest.cc
+++ b/base/mac/libdispatch_task_runner_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/message_loop.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class LibDispatchTaskRunnerTest : public testing::Test {
diff --git a/base/memory/linked_ptr_unittest.cc b/base/memory/linked_ptr_unittest.cc
index 4550350..8b938f2 100644
--- a/base/memory/linked_ptr_unittest.cc
+++ b/base/memory/linked_ptr_unittest.cc
@@ -5,7 +5,7 @@
 #include <string>
 
 #include "base/memory/linked_ptr.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/base/metrics/field_trial.cc b/base/metrics/field_trial.cc
index 5677190..cb1d81d 100644
--- a/base/metrics/field_trial.cc
+++ b/base/metrics/field_trial.cc
@@ -8,8 +8,8 @@
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/sha1.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 "base/sys_byteorder.h"
 
diff --git a/base/metrics/field_trial_unittest.cc b/base/metrics/field_trial_unittest.cc
index bb2c39f..8ab7132 100644
--- a/base/metrics/field_trial_unittest.cc
+++ b/base/metrics/field_trial_unittest.cc
@@ -7,8 +7,8 @@
 #include "base/message_loop.h"
 #include "base/rand_util.h"
 #include "base/run_loop.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
diff --git a/base/metrics/histogram.cc b/base/metrics/histogram.cc
index bb2ee9b..a3dd63a 100644
--- a/base/metrics/histogram.cc
+++ b/base/metrics/histogram.cc
@@ -20,8 +20,8 @@
 #include "base/metrics/sample_vector.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/pickle.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
 #include "base/values.h"
 
diff --git a/base/metrics/histogram_base.cc b/base/metrics/histogram_base.cc
index 8599f59..352c01f 100644
--- a/base/metrics/histogram_base.cc
+++ b/base/metrics/histogram_base.cc
@@ -6,15 +6,15 @@
 
 #include <climits>
 
-#include "base/logging.h"
 #include "base/json/json_string_value_serializer.h"
+#include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/pickle.h"
 #include "base/process_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/values.h"
 
 namespace base {
diff --git a/base/metrics/sparse_histogram.cc b/base/metrics/sparse_histogram.cc
index dd98e58..21dd2ab 100644
--- a/base/metrics/sparse_histogram.cc
+++ b/base/metrics/sparse_histogram.cc
@@ -7,7 +7,7 @@
 #include "base/metrics/sample_map.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/pickle.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
 
 using std::map;
diff --git a/base/metrics/sparse_histogram_unittest.cc b/base/metrics/sparse_histogram_unittest.cc
index d9db5d0..825381d 100644
--- a/base/metrics/sparse_histogram_unittest.cc
+++ b/base/metrics/sparse_histogram_unittest.cc
@@ -11,7 +11,7 @@
 #include "base/metrics/sparse_histogram.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/pickle.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
diff --git a/base/metrics/statistics_recorder.cc b/base/metrics/statistics_recorder.cc
index 2042ac4..f23c810 100644
--- a/base/metrics/statistics_recorder.cc
+++ b/base/metrics/statistics_recorder.cc
@@ -9,7 +9,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
 
 using std::list;
diff --git a/base/metrics/stats_table.cc b/base/metrics/stats_table.cc
index 465b446..69d69f4 100644
--- a/base/metrics/stats_table.cc
+++ b/base/metrics/stats_table.cc
@@ -8,8 +8,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/process_util.h"
 #include "base/shared_memory.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 "base/threading/platform_thread.h"
 #include "base/threading/thread_local_storage.h"
diff --git a/base/metrics/stats_table_unittest.cc b/base/metrics/stats_table_unittest.cc
index 3af7614..95cff2d 100644
--- a/base/metrics/stats_table_unittest.cc
+++ b/base/metrics/stats_table_unittest.cc
@@ -5,8 +5,8 @@
 #include "base/metrics/stats_counters.h"
 #include "base/metrics/stats_table.h"
 #include "base/shared_memory.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/multiprocess_test.h"
 #include "base/threading/platform_thread.h"
diff --git a/base/native_library.h b/base/native_library.h
index 27e603e..891f35b 100644
--- a/base/native_library.h
+++ b/base/native_library.h
@@ -17,7 +17,7 @@
 #import <CoreFoundation/CoreFoundation.h>
 #endif  // OS_*
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 // Macro useful for writing cross-platform function pointers.
 #if defined(OS_WIN) && !defined(CDECL)
diff --git a/base/native_library_mac.mm b/base/native_library_mac.mm
index a45f878..1134744 100644
--- a/base/native_library_mac.mm
+++ b/base/native_library_mac.mm
@@ -11,7 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 
diff --git a/base/nix/mime_util_xdg.cc b/base/nix/mime_util_xdg.cc
index 5794b6d..fe45b590 100644
--- a/base/nix/mime_util_xdg.cc
+++ b/base/nix/mime_util_xdg.cc
@@ -16,8 +16,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/nix/xdg_util.h"
-#include "base/string_util.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "base/synchronization/lock.h"
 #include "base/third_party/xdg_mime/xdgmime.h"
 #include "base/threading/thread_restrictions.h"
diff --git a/base/nullable_string16.h b/base/nullable_string16.h
index 6f07183..dbcd37c 100644
--- a/base/nullable_string16.h
+++ b/base/nullable_string16.h
@@ -5,7 +5,7 @@
 #ifndef BASE_NULLABLE_STRING16_H_
 #define BASE_NULLABLE_STRING16_H_
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 // This class is a simple wrapper for string16 which also contains a null
 // state.  This should be used only where the difference between null and
diff --git a/base/os_compat_android.cc b/base/os_compat_android.cc
index 2f5b4db..2643dc3 100644
--- a/base/os_compat_android.cc
+++ b/base/os_compat_android.cc
@@ -12,8 +12,8 @@
 #include <time64.h>
 
 #include "base/rand_util.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/stringprintf.h"
 
 extern "C" {
 // There is no futimes() avaiable in Bionic, so we provide our own
diff --git a/base/path_service_unittest.cc b/base/path_service_unittest.cc
index 5f281d1..68565cc 100644
--- a/base/path_service_unittest.cc
+++ b/base/path_service_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest-spi.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/pickle.h b/base/pickle.h
index 62dcd15..3de2886 100644
--- a/base/pickle.h
+++ b/base/pickle.h
@@ -12,7 +12,7 @@
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/logging.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 class Pickle;
 
diff --git a/base/pickle_unittest.cc b/base/pickle_unittest.cc
index d252dae..cc384c7 100644
--- a/base/pickle_unittest.cc
+++ b/base/pickle_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/base/prefs/json_pref_store_unittest.cc b/base/prefs/json_pref_store_unittest.cc
index 5e6797a..72b9ba4 100644
--- a/base/prefs/json_pref_store_unittest.cc
+++ b/base/prefs/json_pref_store_unittest.cc
@@ -10,8 +10,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/run_loop.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/threading/sequenced_worker_pool.h"
 #include "base/threading/thread.h"
diff --git a/base/prefs/pref_registry_simple.cc b/base/prefs/pref_registry_simple.cc
index cc3f1f0..c068b4b 100644
--- a/base/prefs/pref_registry_simple.cc
+++ b/base/prefs/pref_registry_simple.cc
@@ -5,7 +5,7 @@
 #include "base/prefs/pref_registry_simple.h"
 
 #include "base/files/file_path.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 
 PrefRegistrySimple::PrefRegistrySimple() {
diff --git a/base/prefs/pref_service.cc b/base/prefs/pref_service.cc
index 3e26fc6..086227a 100644
--- a/base/prefs/pref_service.cc
+++ b/base/prefs/pref_service.cc
@@ -16,8 +16,8 @@
 #include "base/prefs/pref_registry.h"
 #include "base/prefs/pref_value_store.h"
 #include "base/stl_util.h"
-#include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "base/value_conversions.h"
 #include "build/build_config.h"