Use a direct include of strings headers in ash/.

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

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

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

25 files changed, 28 insertions, 28 deletions

diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc
index f9374cd..bc1aeff 100644
--- a/ash/display/display_controller.cc
+++ b/ash/display/display_controller.cc
@@ -21,9 +21,9 @@
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/json/json_value_converter.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
 #include "ui/aura/client/activation_client.h"
diff --git a/ash/display/display_info.cc b/ash/display/display_info.cc
index 1052bf9..446a0ca 100644
--- a/ash/display/display_info.cc
+++ b/ash/display/display_info.cc
@@ -8,9 +8,9 @@
 
 #include "ash/display/display_info.h"
 #include "base/logging.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/size_f.h"
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
index 57441d7..980a3852 100644
--- a/ash/display/display_manager.cc
+++ b/ash/display/display_manager.cc
@@ -18,9 +18,9 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "ui/aura/client/screen_position_client.h"
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index 8b1516b..694b722 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -11,7 +11,7 @@
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/mirror_window_test_api.h"
 #include "base/format_macros.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc
index 616cf4b..739bac0 100644
--- a/ash/display/mirror_window_controller.cc
+++ b/ash/display/mirror_window_controller.cc
@@ -16,7 +16,7 @@
 #include "ash/display/root_window_transformers.h"
 #include "ash/host/root_window_host_factory.h"
 #include "ash/shell.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index d41f28a..2a780f3 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -14,7 +14,7 @@
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/focus_client.h"
diff --git a/ash/launcher/launcher_button_host.h b/ash/launcher/launcher_button_host.h
index c867a68c..46f2e59 100644
--- a/ash/launcher/launcher_button_host.h
+++ b/ash/launcher/launcher_button_host.h
@@ -6,7 +6,7 @@
 #define ASH_LAUNCHER_LAUNCHER_BUTTON_HOST_H_
 
 #include "ash/ash_export.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace ui {
 class LocatedEvent;
diff --git a/ash/launcher/launcher_delegate.h b/ash/launcher/launcher_delegate.h
index a5c1842..cb80588 100644
--- a/ash/launcher/launcher_delegate.h
+++ b/ash/launcher/launcher_delegate.h
@@ -7,7 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/launcher/launcher_types.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/base/models/simple_menu_model.h"
 
 namespace aura {
diff --git a/ash/launcher/launcher_model_unittest.cc b/ash/launcher/launcher_model_unittest.cc
index 0491ccd..382f224 100644
--- a/ash/launcher/launcher_model_unittest.cc
+++ b/ash/launcher/launcher_model_unittest.cc
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "ash/launcher/launcher_model_observer.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ash {
diff --git a/ash/launcher/launcher_tooltip_manager.h b/ash/launcher/launcher_tooltip_manager.h
index b4cd20b..852c30cb 100644
--- a/ash/launcher/launcher_tooltip_manager.h
+++ b/ash/launcher/launcher_tooltip_manager.h
@@ -9,7 +9,7 @@
 #include "ash/shelf/shelf_layout_manager_observer.h"
 #include "ash/shelf/shelf_types.h"
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/base/events/event_handler.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/bubble/bubble_border.h"
diff --git a/ash/launcher/launcher_tooltip_manager_unittest.cc b/ash/launcher/launcher_tooltip_manager_unittest.cc
index 4ceef35..6a38d09 100644
--- a/ash/launcher/launcher_tooltip_manager_unittest.cc
+++ b/ash/launcher/launcher_tooltip_manager_unittest.cc
@@ -11,7 +11,7 @@
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/time.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/events/event.h"
diff --git a/ash/magnifier/magnification_controller_unittest.cc b/ash/magnifier/magnification_controller_unittest.cc
index 31f2be0..701c1f4 100644
--- a/ash/magnifier/magnification_controller_unittest.cc
+++ b/ash/magnifier/magnification_controller_unittest.cc
@@ -7,7 +7,7 @@
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
diff --git a/ash/popup_message.h b/ash/popup_message.h
index 76257cb..040b9fe 100644
--- a/ash/popup_message.h
+++ b/ash/popup_message.h
@@ -7,7 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/bubble/bubble_border.h"
 
diff --git a/ash/session_state_delegate.h b/ash/session_state_delegate.h
index 2688c18..d3ecac8 100644
--- a/ash/session_state_delegate.h
+++ b/ash/session_state_delegate.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace gfx {
 class ImageSkia;
diff --git a/ash/session_state_delegate_stub.cc b/ash/session_state_delegate_stub.cc
index 3536800..a05b5bf 100644
--- a/ash/session_state_delegate_stub.cc
+++ b/ash/session_state_delegate_stub.cc
@@ -6,7 +6,7 @@
 
 #include "ash/shell.h"
 #include "ash/shell/example_factory.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 
 namespace ash {
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
index 4481e44..28818ca 100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/shelf/shelf_layout_manager.cc
@@ -33,8 +33,8 @@
 #include "base/command_line.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.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 "ui/aura/client/activation_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/events/event.h"
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
index fc90bb1..1f6fc49 100644
--- a/ash/shell/app_list.cc
+++ b/ash/shell/app_list.cc
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/string_search.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/app_list/app_list_item_model.h"
 #include "ui/app_list/app_list_model.h"
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index f9f6bf8..8660c2f 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -11,7 +11,7 @@
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/shell.h"
 #include "base/callback.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/time.h"
 
 namespace app_list {
diff --git a/ash/system/chromeos/label_tray_view.h b/ash/system/chromeos/label_tray_view.h
index 402f5c3..b29c37b 100644
--- a/ash/system/chromeos/label_tray_view.h
+++ b/ash/system/chromeos/label_tray_view.h
@@ -5,7 +5,7 @@
 #ifndef ASH_SYSTEM_CHROMEOS_LABEL_TRAY_VIEW_H_
 #define ASH_SYSTEM_CHROMEOS_LABEL_TRAY_VIEW_H_
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/views/view.h"
 
 namespace ash {
diff --git a/ash/system/chromeos/network/network_icon.h b/ash/system/chromeos/network/network_icon.h
index a986aaa..6d72e1b 100644
--- a/ash/system/chromeos/network/network_icon.h
+++ b/ash/system/chromeos/network/network_icon.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "ash/ash_export.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace chromeos {
diff --git a/ash/system/chromeos/network/network_observer.h b/ash/system/chromeos/network/network_observer.h
index f0b1115..cff0c69 100644
--- a/ash/system/chromeos/network/network_observer.h
+++ b/ash/system/chromeos/network/network_observer.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace chromeos {
 class NetworkState;
diff --git a/ash/system/chromeos/network/network_state_notifier.cc b/ash/system/chromeos/network/network_state_notifier.cc
index 398aceb..5ece100 100644
--- a/ash/system/chromeos/network/network_state_notifier.cc
+++ b/ash/system/chromeos/network/network_state_notifier.cc
@@ -7,8 +7,8 @@
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/network_observer.h"
 #include "ash/system/tray/system_tray_notifier.h"
-#include "base/string16.h"
-#include "base/string_util.h"
+#include "base/strings/string16.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/network/network_connection_handler.h"
 #include "chromeos/network/network_event_log.h"
diff --git a/ash/system/chromeos/power/tray_power.cc b/ash/system/chromeos/power/tray_power.cc
index 7bd35de..e54a954 100644
--- a/ash/system/chromeos/power/tray_power.cc
+++ b/ash/system/chromeos/power/tray_power.cc
@@ -13,8 +13,8 @@
 #include "ash/system/tray/tray_notification_view.h"
 #include "ash/system/tray/tray_utils.h"
 #include "base/command_line.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/dbus/power_supply_status.h"
 #include "grit/ash_resources.h"
diff --git a/ash/system/chromeos/screen_security/screen_capture_observer.h b/ash/system/chromeos/screen_security/screen_capture_observer.h
index f6e4d6d..6fca492 100644
--- a/ash/system/chromeos/screen_security/screen_capture_observer.h
+++ b/ash/system/chromeos/screen_security/screen_capture_observer.h
@@ -6,7 +6,7 @@
 #define ASH_SYSTEM_CHROMEOS_SCREEN_CAPTURE_SCREEN_CAPTURE_OBSERVER_H_
 
 #include "base/callback.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace ash {
 
diff --git a/ash/system/chromeos/screen_security/screen_share_observer.h b/ash/system/chromeos/screen_security/screen_share_observer.h
index 23fdcd4..fb6a556 100644
--- a/ash/system/chromeos/screen_security/screen_share_observer.h
+++ b/ash/system/chromeos/screen_security/screen_share_observer.h
@@ -6,7 +6,7 @@
 #define ASH_SYSTEM_CHROMEOS_SCREEN_SHARE_SCREEN_SHARE_OBSERVER_H_
 
 #include "base/callback.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace ash {