Use a direct include of strings headers in base/.
BUG=247723
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16745002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205530 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 251cd6e5ad67c1054e0e82d0a27c59ce4d0d4666
diff --git a/base/android/jni_array.h b/base/android/jni_array.h
index 668a1ed..efa6aa8 100644
--- a/base/android/jni_array.h
+++ b/base/android/jni_array.h
@@ -11,7 +11,7 @@
#include "base/android/scoped_java_ref.h"
#include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
namespace base {
namespace android {
diff --git a/base/command_line.cc b/base/command_line.cc
index 295f41d..b743d51 100644
--- a/base/command_line.cc
+++ b/base/command_line.cc
@@ -10,8 +10,8 @@
#include "base/basictypes.h"
#include "base/files/file_path.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"
#include "build/build_config.h"
diff --git a/base/containers/hash_tables.h b/base/containers/hash_tables.h
index f5efc0f..13d413b 100644
--- a/base/containers/hash_tables.h
+++ b/base/containers/hash_tables.h
@@ -21,7 +21,7 @@
#ifndef BASE_CONTAINERS_HASH_TABLES_H_
#define BASE_CONTAINERS_HASH_TABLES_H_
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "build/build_config.h"
#if defined(COMPILER_MSVC)
diff --git a/base/containers/stack_container.h b/base/containers/stack_container.h
index 347c6b3..f0106d7 100644
--- a/base/containers/stack_container.h
+++ b/base/containers/stack_container.h
@@ -9,9 +9,9 @@
#include <vector>
#include "base/basictypes.h"
-#include "build/build_config.h"
#include "base/memory/aligned_memory.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
+#include "build/build_config.h"
namespace base {
diff --git a/base/debug/crash_logging.cc b/base/debug/crash_logging.cc
index b21eae5..6a36a91 100644
--- a/base/debug/crash_logging.cc
+++ b/base/debug/crash_logging.cc
@@ -10,8 +10,8 @@
#include "base/debug/stack_trace.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"
namespace base {
namespace debug {
diff --git a/base/debug/debugger_posix.cc b/base/debug/debugger_posix.cc
index ce40700..066c592 100644
--- a/base/debug/debugger_posix.cc
+++ b/base/debug/debugger_posix.cc
@@ -40,8 +40,8 @@
#include "base/memory/scoped_ptr.h"
#include "base/posix/eintr_wrapper.h"
#include "base/safe_strerror_posix.h"
-#include "base/stringprintf.h"
#include "base/strings/string_piece.h"
+#include "base/strings/stringprintf.h"
#if defined(USE_SYMBOLIZE)
#include "base/third_party/symbolize/symbolize.h"
diff --git a/base/debug/profiler.cc b/base/debug/profiler.cc
index de79124..b141204 100644
--- a/base/debug/profiler.cc
+++ b/base/debug/profiler.cc
@@ -7,8 +7,8 @@
#include <string>
#include "base/process_util.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
#if defined(OS_WIN)
#include "base/win/pe_image.h"
diff --git a/base/debug/trace_event_android.cc b/base/debug/trace_event_android.cc
index 2869416..7a9ad30 100644
--- a/base/debug/trace_event_android.cc
+++ b/base/debug/trace_event_android.cc
@@ -9,7 +9,7 @@
#include "base/debug/trace_event.h"
#include "base/format_macros.h"
#include "base/logging.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
namespace {
diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc
index deda5f1..ab282e7 100644
--- a/base/debug/trace_event_impl.cc
+++ b/base/debug/trace_event_impl.cc
@@ -14,10 +14,10 @@
#include "base/memory/singleton.h"
#include "base/process_util.h"
#include "base/stl_util.h"
-#include "base/string_util.h"
-#include "base/stringprintf.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/utf_string_conversions.h"
#include "base/synchronization/cancellation_flag.h"
#include "base/synchronization/waitable_event.h"
diff --git a/base/debug/trace_event_impl.h b/base/debug/trace_event_impl.h
index b3be02a..68eb6c5 100644
--- a/base/debug/trace_event_impl.h
+++ b/base/debug/trace_event_impl.h
@@ -16,7 +16,7 @@
#include "base/memory/ref_counted_memory.h"
#include "base/memory/scoped_vector.h"
#include "base/observer_list.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread.h"
diff --git a/base/debug/trace_event_unittest.cc b/base/debug/trace_event_unittest.cc
index 02bb899..d2d38c7 100644
--- a/base/debug/trace_event_unittest.cc
+++ b/base/debug/trace_event_unittest.cc
@@ -15,7 +15,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
#include "base/process_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/platform_thread.h"
#include "base/threading/thread.h"
diff --git a/base/environment.cc b/base/environment.cc
index 5e4d9dd..c1f2008 100644
--- a/base/environment.cc
+++ b/base/environment.cc
@@ -10,7 +10,7 @@
#include <windows.h>
#endif
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#if defined(OS_WIN)
#include "base/memory/scoped_ptr.h"
diff --git a/base/file_util.cc b/base/file_util.cc
index 0d53162..8e0fbb6 100644
--- a/base/file_util.cc
+++ b/base/file_util.cc
@@ -14,9 +14,9 @@
#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/logging.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
#include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
using base::FileEnumerator;
diff --git a/base/file_util.h b/base/file_util.h
index b75a18d..ac8649f 100644
--- a/base/file_util.h
+++ b/base/file_util.h
@@ -28,7 +28,7 @@
#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
#include "base/platform_file.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#if defined(OS_POSIX)
#include "base/file_descriptor_posix.h"
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index 5d037bf..340a42f 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -39,8 +39,8 @@
#include "base/path_service.h"
#include "base/posix/eintr_wrapper.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/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_restrictions.h"
diff --git a/base/file_version_info.h b/base/file_version_info.h
index bffa322..59cd45d 100644
--- a/base/file_version_info.h
+++ b/base/file_version_info.h
@@ -16,7 +16,7 @@
#include <string>
#include "base/base_export.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
namespace base {
class FilePath;
diff --git a/base/files/file_path.cc b/base/files/file_path.cc
index 74469b2..743cbb5 100644
--- a/base/files/file_path.cc
+++ b/base/files/file_path.cc
@@ -13,8 +13,8 @@
// These includes are just for the *Hack functions, and should be removed
// when those functions are removed.
-#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"
diff --git a/base/files/file_path.h b/base/files/file_path.h
index d7e134e..876cf03 100644
--- a/base/files/file_path.h
+++ b/base/files/file_path.h
@@ -109,7 +109,7 @@
#include "base/base_export.h"
#include "base/compiler_specific.h"
#include "base/hash_tables.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "base/strings/string_piece.h" // For implicit conversions.
#include "build/build_config.h"
diff --git a/base/files/file_path_watcher_browsertest.cc b/base/files/file_path_watcher_browsertest.cc
index 62ffab9..7c37432 100644
--- a/base/files/file_path_watcher_browsertest.cc
+++ b/base/files/file_path_watcher_browsertest.cc
@@ -24,7 +24,7 @@
#include "base/message_loop/message_loop_proxy.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/test_file_util.h"
#include "base/test/test_timeouts.h"
diff --git a/base/files/file_path_watcher_kqueue.cc b/base/files/file_path_watcher_kqueue.cc
index cb856b1..be29fa8 100644
--- a/base/files/file_path_watcher_kqueue.cc
+++ b/base/files/file_path_watcher_kqueue.cc
@@ -15,7 +15,7 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
// On some platforms these are not defined.
#if !defined(EV_RECEIPT)
diff --git a/base/guid.cc b/base/guid.cc
index 920dae5..657383f 100644
--- a/base/guid.cc
+++ b/base/guid.cc
@@ -5,7 +5,7 @@
#include "base/guid.h"
#include "base/rand_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
namespace base {
diff --git a/base/guid_posix.cc b/base/guid_posix.cc
index 89811d0..1b6d56f 100644
--- a/base/guid_posix.cc
+++ b/base/guid_posix.cc
@@ -5,7 +5,7 @@
#include "base/guid.h"
#include "base/rand_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
namespace base {