Use a direct include of strings headers in url/, win8/.

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

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

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

7 files changed, 7 insertions, 7 deletions

diff --git a/win8/metro_driver/chrome_app_view_ash.h b/win8/metro_driver/chrome_app_view_ash.h
index 35c283e..a8f388e 100644
--- a/win8/metro_driver/chrome_app_view_ash.h
+++ b/win8/metro_driver/chrome_app_view_ash.h
@@ -13,7 +13,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/base/events/event_constants.h"
 #include "win8/metro_driver/direct3d_helper.h"
 
diff --git a/win8/metro_driver/file_picker.cc b/win8/metro_driver/file_picker.cc
index 5016ecb..92fd987 100644
--- a/win8/metro_driver/file_picker.cc
+++ b/win8/metro_driver/file_picker.cc
@@ -11,7 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/win/metro.h"
 #include "base/win/scoped_comptr.h"
diff --git a/win8/metro_driver/file_picker_ash.cc b/win8/metro_driver/file_picker_ash.cc
index 5fb6a5a..0193e39 100644
--- a/win8/metro_driver/file_picker_ash.cc
+++ b/win8/metro_driver/file_picker_ash.cc
@@ -9,7 +9,7 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/win/metro.h"
 #include "base/win/scoped_comptr.h"
diff --git a/win8/metro_driver/file_picker_ash.h b/win8/metro_driver/file_picker_ash.h
index 977e239..c6d1c49 100644
--- a/win8/metro_driver/file_picker_ash.h
+++ b/win8/metro_driver/file_picker_ash.h
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 class ChromeAppViewAsh;
 struct MetroViewerHostMsg_SaveAsDialogParams;
diff --git a/win8/metro_driver/secondary_tile.h b/win8/metro_driver/secondary_tile.h
index 0fba5096..9740864 100644
--- a/win8/metro_driver/secondary_tile.h
+++ b/win8/metro_driver/secondary_tile.h
@@ -5,7 +5,7 @@
 #define CHROME_BROWSER_UI_METRO_DRIVER_SECONDARY_TILE_H_
 
 #include "base/files/file_path.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/win/metro.h"
 
 extern "C" __declspec(dllexport)
diff --git a/win8/metro_driver/toast_notification_handler.h b/win8/metro_driver/toast_notification_handler.h
index b1ef338..8f3587d 100644
--- a/win8/metro_driver/toast_notification_handler.h
+++ b/win8/metro_driver/toast_notification_handler.h
@@ -7,7 +7,7 @@
 
 #include <windows.ui.notifications.h>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/win/metro.h"
 
 // Provides functionality to display a metro style toast notification.
diff --git a/win8/metro_driver/winrt_utils.h b/win8/metro_driver/winrt_utils.h
index c3be1b1..3016c85 100644
--- a/win8/metro_driver/winrt_utils.h
+++ b/win8/metro_driver/winrt_utils.h
@@ -10,7 +10,7 @@
 #include <roapi.h>
 #include <windows.applicationmodel.core.h>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 void CheckHR(HRESULT hr, const char* str = nullptr);