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

31 files changed, 32 insertions, 32 deletions

diff --git a/url/gurl.h b/url/gurl.h
index 980bd55..6e58249 100644
--- a/url/gurl.h
+++ b/url/gurl.h
@@ -8,7 +8,7 @@
 #include <iosfwd>
 #include <string>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "url/url_canon.h"
 #include "url/url_canon_stdstring.h"
 #include "url/url_export.h"
diff --git a/url/url_canon.h b/url/url_canon.h
index b33d13a..e118f3a 100644
--- a/url/url_canon.h
+++ b/url/url_canon.h
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "url/url_export.h"
 #include "url/url_parse.h"
 
diff --git a/url/url_canon_ip.h b/url/url_canon_ip.h
index d5560f0..b2e4a7e 100644
--- a/url/url_canon_ip.h
+++ b/url/url_canon_ip.h
@@ -5,7 +5,7 @@
 #ifndef URL_URL_CANON_IP_H_
 #define URL_URL_CANON_IP_H_
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "url/url_canon.h"
 #include "url/url_export.h"
 #include "url/url_parse.h"
diff --git a/url/url_parse.h b/url/url_parse.h
index 4ab9e69..21033dd 100644
--- a/url/url_parse.h
+++ b/url/url_parse.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "url/url_export.h"
 
 namespace url_parse {
diff --git a/url/url_test_utils.h b/url/url_test_utils.h
index 3dea832..6efdeea 100644
--- a/url/url_test_utils.h
+++ b/url/url_test_utils.h
@@ -10,7 +10,7 @@
 
 #include <string>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/url_canon_internal.h"
 
diff --git a/url/url_util.h b/url/url_util.h
index 995aa9b..4494819 100644
--- a/url/url_util.h
+++ b/url/url_util.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "url/url_canon.h"
 #include "url/url_export.h"
 #include "url/url_parse.h"
diff --git a/url/url_util_internal.h b/url/url_util_internal.h
index 74a2000..af91389 100644
--- a/url/url_util_internal.h
+++ b/url/url_util_internal.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "url/url_parse.h"
 
 namespace url_util {
diff --git a/win8/delegate_execute/chrome_util.cc b/win8/delegate_execute/chrome_util.cc
index 30af215..894b5b3 100644
--- a/win8/delegate_execute/chrome_util.cc
+++ b/win8/delegate_execute/chrome_util.cc
@@ -16,7 +16,7 @@
 #include "base/files/file_path.h"
 #include "base/md5.h"
 #include "base/process_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
diff --git a/win8/delegate_execute/chrome_util.h b/win8/delegate_execute/chrome_util.h
index f65ec2f..8fe0a1f 100644
--- a/win8/delegate_execute/chrome_util.h
+++ b/win8/delegate_execute/chrome_util.h
@@ -5,7 +5,7 @@
 #ifndef WIN8_DELEGATE_EXECUTE_CHROME_UTIL_H_
 #define WIN8_DELEGATE_EXECUTE_CHROME_UTIL_H_
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 class FilePath;
diff --git a/win8/delegate_execute/delegate_execute.cc b/win8/delegate_execute/delegate_execute.cc
index 485cf25..9a4e83d 100644
--- a/win8/delegate_execute/delegate_execute.cc
+++ b/win8/delegate_execute/delegate_execute.cc
@@ -15,7 +15,7 @@
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process_util.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/win/scoped_com_initializer.h"
 #include "base/win/scoped_handle.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
diff --git a/win8/delegate_execute/delegate_execute_operation.cc b/win8/delegate_execute/delegate_execute_operation.cc
index 765c3d4..a733312 100644
--- a/win8/delegate_execute/delegate_execute_operation.cc
+++ b/win8/delegate_execute/delegate_execute_operation.cc
@@ -5,7 +5,7 @@
 #include "win8/delegate_execute/delegate_execute_operation.h"
 
 #include "base/command_line.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "chrome/common/chrome_switches.h"
 #include "win8/delegate_execute/delegate_execute_util.h"
diff --git a/win8/delegate_execute/delegate_execute_operation.h b/win8/delegate_execute/delegate_execute_operation.h
index 6492ac6..7d1456c 100644
--- a/win8/delegate_execute/delegate_execute_operation.h
+++ b/win8/delegate_execute/delegate_execute_operation.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 class CommandLine;
 
diff --git a/win8/delegate_execute/delegate_execute_util.cc b/win8/delegate_execute/delegate_execute_util.cc
index 6630fd6..6a3dc04 100644
--- a/win8/delegate_execute/delegate_execute_util.cc
+++ b/win8/delegate_execute/delegate_execute_util.cc
@@ -5,7 +5,7 @@
 #include "win8/delegate_execute/delegate_execute_util.h"
 
 #include "base/files/file_path.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 
 namespace delegate_execute {
 
diff --git a/win8/delegate_execute/delegate_execute_util.h b/win8/delegate_execute/delegate_execute_util.h
index 36f1556..adb2e7a 100644
--- a/win8/delegate_execute/delegate_execute_util.h
+++ b/win8/delegate_execute/delegate_execute_util.h
@@ -6,7 +6,7 @@
 #define WIN8_DELEGATE_EXECUTE_DELEGATE_EXECUTE_UTIL_H_
 
 #include "base/command_line.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 class FilePath;
diff --git a/win8/delegate_execute/delegate_execute_util_unittest.cc b/win8/delegate_execute/delegate_execute_util_unittest.cc
index 431ad39..f01b157 100644
--- a/win8/delegate_execute/delegate_execute_util_unittest.cc
+++ b/win8/delegate_execute/delegate_execute_util_unittest.cc
@@ -8,7 +8,7 @@
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
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);
 
diff --git a/win8/test/metro_registration_helper.cc b/win8/test/metro_registration_helper.cc
index 1d665dc..dd07cf6 100644
--- a/win8/test/metro_registration_helper.cc
+++ b/win8/test/metro_registration_helper.cc
@@ -15,7 +15,7 @@
 #include "base/path_service.h"
 #include "base/process.h"
 #include "base/process_util.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/win/scoped_co_mem.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_handle.h"
diff --git a/win8/test/metro_registration_helper.h b/win8/test/metro_registration_helper.h
index 754c87b1..58409db 100644
--- a/win8/test/metro_registration_helper.h
+++ b/win8/test/metro_registration_helper.h
@@ -5,7 +5,7 @@
 #ifndef WIN8_TEST_METRO_REGISTRATION_HELPER_H_
 #define WIN8_TEST_METRO_REGISTRATION_HELPER_H_
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace win8 {
 
diff --git a/win8/test/open_with_dialog_async.h b/win8/test/open_with_dialog_async.h
index dadc9ca..9f92645 100644
--- a/win8/test/open_with_dialog_async.h
+++ b/win8/test/open_with_dialog_async.h
@@ -8,7 +8,7 @@
 #include <windows.h>
 
 #include "base/callback_forward.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace win8 {
 
diff --git a/win8/test/open_with_dialog_controller.h b/win8/test/open_with_dialog_controller.h
index 55dd149..4354a56 100644
--- a/win8/test/open_with_dialog_controller.h
+++ b/win8/test/open_with_dialog_controller.h
@@ -12,7 +12,7 @@
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/weak_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace win8 {
 
diff --git a/win8/test/test_registrar.cc b/win8/test/test_registrar.cc
index 1588a21..25445c9 100644
--- a/win8/test/test_registrar.cc
+++ b/win8/test/test_registrar.cc
@@ -23,7 +23,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "win8/test/test_registrar_constants.h"
 #include "win8/test/test_registrar_resource.h"
 
diff --git a/win8/test/ui_automation_client.cc b/win8/test/ui_automation_client.cc
index 4d9605f..ef2d9ba 100644
--- a/win8/test/ui_automation_client.cc
+++ b/win8/test/ui_automation_client.cc
@@ -14,8 +14,8 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_variant.h"
diff --git a/win8/test/ui_automation_client.h b/win8/test/ui_automation_client.h
index c285c7b..7e98329 100644
--- a/win8/test/ui_automation_client.h
+++ b/win8/test/ui_automation_client.h
@@ -14,7 +14,7 @@
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/weak_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_checker.h"
 
diff --git a/win8/viewer/metro_viewer_process_host.cc b/win8/viewer/metro_viewer_process_host.cc
index 0e4c535..b04fa21 100644
--- a/win8/viewer/metro_viewer_process_host.cc
+++ b/win8/viewer/metro_viewer_process_host.cc
@@ -11,7 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/process.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"
 #include "base/win/scoped_comptr.h"
diff --git a/win8/viewer/metro_viewer_process_host.h b/win8/viewer/metro_viewer_process_host.h
index 5dfa5d3..288a320 100644
--- a/win8/viewer/metro_viewer_process_host.h
+++ b/win8/viewer/metro_viewer_process_host.h
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/threading/non_thread_safe.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_listener.h"