Use a direct include of strings headers in base/.

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

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

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

43 files changed, 47 insertions, 47 deletions

diff --git a/base/rand_util.cc b/base/rand_util.cc
index a9bc961..da6de87 100644
--- a/base/rand_util.cc
+++ b/base/rand_util.cc
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 
 namespace base {
 
diff --git a/base/strings/latin1_string_conversions.h b/base/strings/latin1_string_conversions.h
index b79c455..387cb65 100644
--- a/base/strings/latin1_string_conversions.h
+++ b/base/strings/latin1_string_conversions.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/base_export.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 
diff --git a/base/strings/string_number_conversions.h b/base/strings/string_number_conversions.h
index 2a75741..b199bb5 100644
--- a/base/strings/string_number_conversions.h
+++ b/base/strings/string_number_conversions.h
@@ -10,7 +10,7 @@
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 
 // ----------------------------------------------------------------------------
diff --git a/base/strings/string_piece.h b/base/strings/string_piece.h
index 13ca009..a433a44 100644
--- a/base/strings/string_piece.h
+++ b/base/strings/string_piece.h
@@ -31,7 +31,7 @@
 #include "base/base_export.h"
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 
diff --git a/base/strings/string_piece_unittest.cc b/base/strings/string_piece_unittest.cc
index 4a5548f..84ed9ef 100644
--- a/base/strings/string_piece_unittest.cc
+++ b/base/strings/string_piece_unittest.cc
@@ -4,7 +4,7 @@
 
 #include <string>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/strings/string_split.cc b/base/strings/string_split.cc
index 5973637..d959fd0 100644
--- a/base/strings/string_split.cc
+++ b/base/strings/string_split.cc
@@ -5,7 +5,7 @@
 #include "base/strings/string_split.h"
 
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/third_party/icu/icu_utf.h"
 
diff --git a/base/strings/string_split.h b/base/strings/string_split.h
index 2ce2585..2803752d 100644
--- a/base/strings/string_split.h
+++ b/base/strings/string_split.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/base_export.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 
diff --git a/base/strings/string_util.h b/base/strings/string_util.h
index 7b4af7d..d2a216e 100644
--- a/base/strings/string_util.h
+++ b/base/strings/string_util.h
@@ -16,7 +16,7 @@
 #include "base/base_export.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_piece.h"  // For implicit conversions.
 
 // Safe standard library wrappers for all platforms.
@@ -146,9 +146,9 @@ template<typename Char> struct CaseInsensitiveCompareASCII {
 }  // namespace base
 
 #if defined(OS_WIN)
-#include "base/string_util_win.h"
+#include "base/strings/string_util_win.h"
 #elif defined(OS_POSIX)
-#include "base/string_util_posix.h"
+#include "base/strings/string_util_posix.h"
 #else
 #error Define string operations appropriately for your platform
 #endif
diff --git a/base/strings/sys_string_conversions.h b/base/strings/sys_string_conversions.h
index 9cdb7a4..42f2389 100644
--- a/base/strings/sys_string_conversions.h
+++ b/base/strings/sys_string_conversions.h
@@ -13,7 +13,7 @@
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 
 #if defined(OS_MACOSX)
diff --git a/base/strings/sys_string_conversions_mac_unittest.mm b/base/strings/sys_string_conversions_mac_unittest.mm
index 99ff7f2..4750a9a8 100644
--- a/base/strings/sys_string_conversions_mac_unittest.mm
+++ b/base/strings/sys_string_conversions_mac_unittest.mm
@@ -4,7 +4,7 @@
 
 #import <Foundation/Foundation.h>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/base/strings/utf_offset_string_conversions.h b/base/strings/utf_offset_string_conversions.h
index 618cebd..1b615f4 100644
--- a/base/strings/utf_offset_string_conversions.h
+++ b/base/strings/utf_offset_string_conversions.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/base_export.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 
 namespace base {
diff --git a/base/strings/utf_string_conversion_utils.h b/base/strings/utf_string_conversion_utils.h
index 8832369..22abbbc9 100644
--- a/base/strings/utf_string_conversion_utils.h
+++ b/base/strings/utf_string_conversion_utils.h
@@ -8,7 +8,7 @@
 // This should only be used by the various UTF string conversion files.
 
 #include "base/base_export.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 
diff --git a/base/strings/utf_string_conversions.cc b/base/strings/utf_string_conversions.cc
index b75ed0c..c3ea4f2 100644
--- a/base/strings/utf_string_conversions.cc
+++ b/base/strings/utf_string_conversions.cc
@@ -4,8 +4,8 @@
 
 #include "base/strings/utf_string_conversions.h"
 
-#include "base/string_util.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversion_utils.h"
 
 namespace base {
diff --git a/base/strings/utf_string_conversions.h b/base/strings/utf_string_conversions.h
index ec6a87f..3461aa4 100644
--- a/base/strings/utf_string_conversions.h
+++ b/base/strings/utf_string_conversions.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/base_export.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 
 namespace base {
diff --git a/base/strings/utf_string_conversions_unittest.cc b/base/strings/utf_string_conversions_unittest.cc
index 974184e..08009c4 100644
--- a/base/strings/utf_string_conversions_unittest.cc
+++ b/base/strings/utf_string_conversions_unittest.cc
@@ -4,8 +4,8 @@
 
 #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 "testing/gtest/include/gtest/gtest.h"
 
diff --git a/base/sys_info_android.cc b/base/sys_info_android.cc
index ec6b849..1e0b002 100644
--- a/base/sys_info_android.cc
+++ b/base/sys_info_android.cc
@@ -7,9 +7,9 @@
 #include <sys/system_properties.h>
 
 #include "base/logging.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/stringprintf.h"
 
 namespace {
 
diff --git a/base/sys_info_mac.cc b/base/sys_info_mac.cc
index b444565..2911c7c 100644
--- a/base/sys_info_mac.cc
+++ b/base/sys_info_mac.cc
@@ -13,7 +13,7 @@
 
 #include "base/logging.h"
 #include "base/mac/scoped_mach_port.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 
 namespace base {
 
diff --git a/base/sys_info_win.cc b/base/sys_info_win.cc
index 1d15b62..191fd94 100644
--- a/base/sys_info_win.cc
+++ b/base/sys_info_win.cc
@@ -9,7 +9,7 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/win/windows_version.h"
 
diff --git a/base/test/expectations/parser.cc b/base/test/expectations/parser.cc
index 05678a5..c7132e5 100644
--- a/base/test/expectations/parser.cc
+++ b/base/test/expectations/parser.cc
@@ -4,7 +4,7 @@
 
 #include "base/test/expectations/parser.h"
 
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 
 namespace test_expectations {
 
diff --git a/base/test/perf_test_suite.cc b/base/test/perf_test_suite.cc
index 7276c14..7a2d1c9 100644
--- a/base/test/perf_test_suite.cc
+++ b/base/test/perf_test_suite.cc
@@ -10,7 +10,7 @@
 #include "base/path_service.h"
 #include "base/perftimer.h"
 #include "base/process_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
diff --git a/base/test/test_file_util_posix.cc b/base/test/test_file_util_posix.cc
index fe5b0ff..aa3e9a0 100644
--- a/base/test/test_file_util_posix.cc
+++ b/base/test/test_file_util_posix.cc
@@ -14,7 +14,7 @@
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 
 using base::MakeAbsoluteFilePath;
diff --git a/base/test/test_process_killer_win.cc b/base/test/test_process_killer_win.cc
index df8d44e..bcc2d5b 100644
--- a/base/test/test_process_killer_win.cc
+++ b/base/test/test_process_killer_win.cc
@@ -11,7 +11,7 @@
 
 #include "base/logging.h"
 #include "base/process_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/win/scoped_handle.h"
 
 namespace {
diff --git a/base/test/test_process_killer_win.h b/base/test/test_process_killer_win.h
index 30aab8e..08ef21b 100644
--- a/base/test/test_process_killer_win.h
+++ b/base/test/test_process_killer_win.h
@@ -5,7 +5,7 @@
 #ifndef BASE_TEST_TEST_PROCESS_KILLER_WIN_H_
 #define BASE_TEST_TEST_PROCESS_KILLER_WIN_H_
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 
diff --git a/base/test/test_shortcut_win.cc b/base/test/test_shortcut_win.cc
index 43a94ad..e22e374 100644
--- a/base/test/test_shortcut_win.cc
+++ b/base/test/test_shortcut_win.cc
@@ -9,7 +9,7 @@
 #include <propkey.h>
 
 #include "base/files/file_path.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_propvariant.h"
diff --git a/base/threading/sequenced_worker_pool.cc b/base/threading/sequenced_worker_pool.cc
index e35242e..bc69d5c 100644
--- a/base/threading/sequenced_worker_pool.cc
+++ b/base/threading/sequenced_worker_pool.cc
@@ -20,7 +20,7 @@
 #include "base/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/platform_thread.h"
diff --git a/base/threading/thread_id_name_manager.cc b/base/threading/thread_id_name_manager.cc
index a4d24da..ef08548 100644
--- a/base/threading/thread_id_name_manager.cc
+++ b/base/threading/thread_id_name_manager.cc
@@ -9,7 +9,7 @@
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 
 namespace base {
 namespace {
diff --git a/base/threading/worker_pool_posix.cc b/base/threading/worker_pool_posix.cc
index 2ad3925..243e50a 100644
--- a/base/threading/worker_pool_posix.cc
+++ b/base/threading/worker_pool_posix.cc
@@ -10,7 +10,7 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_local.h"
 #include "base/threading/worker_pool.h"
diff --git a/base/tracked_objects.cc b/base/tracked_objects.cc
index 4449d720..c45276b 100644
--- a/base/tracked_objects.cc
+++ b/base/tracked_objects.cc
@@ -11,12 +11,12 @@
 #include "base/debug/leak_annotations.h"
 #include "base/format_macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/port.h"
 #include "base/process_util.h"
 #include "base/profiler/alternate_timer.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/third_party/valgrind/memcheck.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/port.h"
 
 using base::TimeDelta;
 
diff --git a/base/values.cc b/base/values.cc
index 75db8c7..275a042 100644
--- a/base/values.cc
+++ b/base/values.cc
@@ -10,7 +10,7 @@
 #include "base/float_util.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 
 namespace {
diff --git a/base/values.h b/base/values.h
index 150b874..8f559b8 100644
--- a/base/values.h
+++ b/base/values.h
@@ -30,7 +30,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 // This file declares "using base::Value", etc. at the bottom, so that
 // current code can use these classes without the base namespace. In
diff --git a/base/values_unittest.cc b/base/values_unittest.cc
index 74642c5..8776c10 100644
--- a/base/values_unittest.cc
+++ b/base/values_unittest.cc
@@ -5,7 +5,7 @@
 #include <limits>
 
 #include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/version.cc b/base/version.cc
index eb1806e..79693f7 100644
--- a/base/version.cc
+++ b/base/version.cc
@@ -7,9 +7,9 @@
 #include <algorithm>
 
 #include "base/logging.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"
 
 namespace base {
 
diff --git a/base/win/event_trace_consumer_unittest.cc b/base/win/event_trace_consumer_unittest.cc
index be8e5f4..dbf6eed 100644
--- a/base/win/event_trace_consumer_unittest.cc
+++ b/base/win/event_trace_consumer_unittest.cc
@@ -15,7 +15,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/process.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/win/event_trace_controller.h"
 #include "base/win/event_trace_provider.h"
 #include "base/win/scoped_handle.h"
diff --git a/base/win/event_trace_controller_unittest.cc b/base/win/event_trace_controller_unittest.cc
index 2ab9ef0..7b2e99e 100644
--- a/base/win/event_trace_controller_unittest.cc
+++ b/base/win/event_trace_controller_unittest.cc
@@ -12,7 +12,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/process.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "base/win/event_trace_controller.h"
 #include "base/win/event_trace_provider.h"
diff --git a/base/win/metro.cc b/base/win/metro.cc
index 2e02f01..acf530f 100644
--- a/base/win/metro.cc
+++ b/base/win/metro.cc
@@ -5,7 +5,7 @@
 #include "base/win/metro.h"
 
 #include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 
diff --git a/base/win/metro.h b/base/win/metro.h
index 1aa07fb..5f69fac 100644
--- a/base/win/metro.h
+++ b/base/win/metro.h
@@ -11,7 +11,7 @@
 #include "base/base_export.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 namespace win {
diff --git a/base/win/registry.cc b/base/win/registry.cc
index 83eb590..588bd27 100644
--- a/base/win/registry.cc
+++ b/base/win/registry.cc
@@ -8,7 +8,7 @@
 #include <algorithm>
 
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/threading/thread_restrictions.h"
 
 #pragma comment(lib, "shlwapi.lib")  // for SHDeleteKey
diff --git a/base/win/scoped_bstr.h b/base/win/scoped_bstr.h
index ed46d63..d703f62 100644
--- a/base/win/scoped_bstr.h
+++ b/base/win/scoped_bstr.h
@@ -10,7 +10,7 @@
 
 #include "base/base_export.h"
 #include "base/logging.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 namespace win {
diff --git a/base/win/shortcut.h b/base/win/shortcut.h
index 3ecd84c..c68edb9 100644
--- a/base/win/shortcut.h
+++ b/base/win/shortcut.h
@@ -9,7 +9,7 @@
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 namespace win {
diff --git a/base/win/win_util.cc b/base/win/win_util.cc
index 3d12f77..cdfff8f 100644
--- a/base/win/win_util.cc
+++ b/base/win/win_util.cc
@@ -18,8 +18,8 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.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 "base/win/registry.h"
 #include "base/win/scoped_co_mem.h"
diff --git a/base/win/win_util.h b/base/win/win_util.h
index 78390be0..7577ab8 100644
--- a/base/win/win_util.h
+++ b/base/win/win_util.h
@@ -27,7 +27,7 @@
 #include <string>
 
 #include "base/base_export.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 struct IPropertyStore;
 struct _tagpropertykey;
diff --git a/base/win/win_util_unittest.cc b/base/win/win_util_unittest.cc
index b79ed56..11536a9 100644
--- a/base/win/win_util_unittest.cc
+++ b/base/win/win_util_unittest.cc
@@ -5,7 +5,7 @@
 #include <windows.h>
 
 #include "base/basictypes.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/win/wrapped_window_proc.h b/base/win/wrapped_window_proc.h
index b5793f2..d464a9c 100644
--- a/base/win/wrapped_window_proc.h
+++ b/base/win/wrapped_window_proc.h
@@ -13,7 +13,7 @@
 #include <windows.h>
 
 #include "base/base_export.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 namespace win {