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

11 files changed, 12 insertions, 12 deletions

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 {