diff --git a/android_webview/browser/aw_form_database_service_unittest.cc b/android_webview/browser/aw_form_database_service_unittest.cc index 6f8e41006c04f9..bae9be3b2f3d94 100644 --- a/android_webview/browser/aw_form_database_service_unittest.cc +++ b/android_webview/browser/aw_form_database_service_unittest.cc @@ -9,7 +9,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "components/autofill/browser/webdata/autofill_webdata_service.h" #include "components/autofill/common/form_field_data.h" #include "content/public/test/test_browser_thread.h" diff --git a/android_webview/native/state_serializer_unittests.cc b/android_webview/native/state_serializer_unittests.cc index 539ee54d3196fa..7f4690e82146f6 100644 --- a/android_webview/native/state_serializer_unittests.cc +++ b/android_webview/native/state_serializer_unittests.cc @@ -8,8 +8,8 @@ #include "base/memory/scoped_ptr.h" #include "base/pickle.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/navigation_entry.h" #include "content/public/common/content_client.h" diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc index 854833461b853e..fc532f8d103e1d 100644 --- a/android_webview/renderer/aw_content_renderer_client.cc +++ b/android_webview/renderer/aw_content_renderer_client.cc @@ -9,7 +9,7 @@ #include "android_webview/renderer/aw_render_view_ext.h" #include "android_webview/renderer/view_renderer.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "components/visitedlink/renderer/visitedlink_slave.h" #include "content/public/renderer/render_thread.h" #include "googleurl/src/gurl.h" diff --git a/apps/shortcut_manager.cc b/apps/shortcut_manager.cc index 2176abcad22ccb..510eb0716e391a 100644 --- a/apps/shortcut_manager.cc +++ b/apps/shortcut_manager.cc @@ -8,7 +8,7 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/ui/web_applications/web_app_ui.h" #include "chrome/browser/web_applications/web_app.h" diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc index f851789b9d800f..141ad470384a2a 100644 --- a/ash/desktop_background/desktop_background_view.cc +++ b/ash/desktop_background/desktop_background_view.cc @@ -17,7 +17,7 @@ #include "ash/wm/property_util.h" #include "ash/wm/window_animations.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/aura/root_window.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc index e257cf8f0bd95e..28727a28c0e621 100644 --- a/ash/display/display_manager.cc +++ b/ash/display/display_manager.cc @@ -21,7 +21,7 @@ #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "grit/ash_strings.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h" diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index e27f19cee2197e..ea25e3822119f2 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -10,7 +10,7 @@ #include "ash/test/ash_test_base.h" #include "base/command_line.h" #include "base/location.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" diff --git a/ash/keyboard_overlay/keyboard_overlay_delegate.cc b/ash/keyboard_overlay/keyboard_overlay_delegate.cc index b3a925b6158cee..681efaf07ef71a 100644 --- a/ash/keyboard_overlay/keyboard_overlay_delegate.cc +++ b/ash/keyboard_overlay/keyboard_overlay_delegate.cc @@ -9,7 +9,7 @@ #include "ash/shell.h" #include "base/bind.h" #include "base/memory/weak_ptr.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/ash/keyboard_overlay/keyboard_overlay_delegate_unittest.cc b/ash/keyboard_overlay/keyboard_overlay_delegate_unittest.cc index c0c382532e675e..d7058f6cccbb4b 100644 --- a/ash/keyboard_overlay/keyboard_overlay_delegate_unittest.cc +++ b/ash/keyboard_overlay/keyboard_overlay_delegate_unittest.cc @@ -6,7 +6,7 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/aura/window.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" diff --git a/ash/keyboard_overlay/keyboard_overlay_view.cc b/ash/keyboard_overlay/keyboard_overlay_view.cc index 82c80916f0d151..2144caa4e80ce8 100644 --- a/ash/keyboard_overlay/keyboard_overlay_view.cc +++ b/ash/keyboard_overlay/keyboard_overlay_view.cc @@ -6,7 +6,7 @@ #include "ash/keyboard_overlay/keyboard_overlay_delegate.h" #include "ash/shell.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_context.h" #include "grit/ash_strings.h" #include "ui/base/events/event.h" diff --git a/ash/session_state_delegate_stub.cc b/ash/session_state_delegate_stub.cc index 5e610d72c496c1..3536800d35df7c 100644 --- a/ash/session_state_delegate_stub.cc +++ b/ash/session_state_delegate_stub.cc @@ -7,7 +7,7 @@ #include "ash/shell.h" #include "ash/shell/example_factory.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace ash { diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc index b8ae5dbed79bcd..524ddf70709561 100644 --- a/ash/shelf/shelf_layout_manager_unittest.cc +++ b/ash/shelf/shelf_layout_manager_unittest.cc @@ -24,7 +24,7 @@ #include "ash/test/ash_test_base.h" #include "ash/wm/window_util.h" #include "base/command_line.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc index 9c941e6b2c5d06..fc90bb16a2ef67 100644 --- a/ash/shell/app_list.cc +++ b/ash/shell/app_list.cc @@ -12,7 +12,7 @@ #include "base/i18n/case_conversion.h" #include "base/i18n/string_search.h" #include "base/string_util.h" -#include "base/utf_string_conversions.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" #include "ui/app_list/app_list_view_delegate.h" diff --git a/ash/shell/bubble.cc b/ash/shell/bubble.cc index 1442bef4579456..c39f76a60f0acf 100644 --- a/ash/shell/bubble.cc +++ b/ash/shell/bubble.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/views/bubble/bubble_border.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/label.h" diff --git a/ash/shell/lock_view.cc b/ash/shell/lock_view.cc index 5663032e5e475d..aee013328aae4c 100644 --- a/ash/shell/lock_view.cc +++ b/ash/shell/lock_view.cc @@ -6,7 +6,7 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/shell/example_factory.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/gfx/canvas.h" diff --git a/ash/shell/panel_window.cc b/ash/shell/panel_window.cc index 0517b2d14df0b9..886d0c1149d627 100644 --- a/ash/shell/panel_window.cc +++ b/ash/shell/panel_window.cc @@ -7,7 +7,7 @@ #include "ash/screen_ash.h" #include "ash/shell.h" #include "ash/wm/panels/panel_frame_view.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/gfx/canvas.h" diff --git a/ash/shell/toplevel_window.cc b/ash/shell/toplevel_window.cc index af18151ace6cd5..a65787abbdf0fa 100644 --- a/ash/shell/toplevel_window.cc +++ b/ash/shell/toplevel_window.cc @@ -8,7 +8,7 @@ #include "ash/display/display_manager.h" #include "ash/shell.h" #include "ash/wm/property_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/gfx/canvas.h" diff --git a/ash/shell/widgets.cc b/ash/shell/widgets.cc index 9790a0292da0c3..01654906fbc3ab 100644 --- a/ash/shell/widgets.cc +++ b/ash/shell/widgets.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "ash/shell.h" -#include "base/utf_string_conversions.h" // ASCIIToUTF16 +#include "base/strings/utf_string_conversions.h" // ASCIIToUTF16 #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/gfx/canvas.h" diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc index 3080f91c9a158a..2d6752119ae0cd 100644 --- a/ash/shell/window_type_launcher.cc +++ b/ash/shell/window_type_launcher.cc @@ -16,8 +16,8 @@ #include "ash/system/status_area_widget.h" #include "ash/system/web_notification/web_notification_tray.h" #include "base/bind.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "content/public/browser/browser_thread.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index d059091cc71c71..842eb5dcd2ee70 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -21,7 +21,7 @@ #include "ash/test/shell_test_api.h" #include "ash/wm/root_window_layout_manager.h" #include "ash/wm/window_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" diff --git a/ash/system/brightness/tray_brightness.cc b/ash/system/brightness/tray_brightness.cc index 9ad54e735c8c37..959f8b03074486 100644 --- a/ash/system/brightness/tray_brightness.cc +++ b/ash/system/brightness/tray_brightness.cc @@ -14,7 +14,7 @@ #include "ash/system/tray/tray_constants.h" #include "base/bind.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ash/system/chromeos/audio/tray_audio.cc b/ash/system/chromeos/audio/tray_audio.cc index 22c15d72d64949..742a6e55483c57 100644 --- a/ash/system/chromeos/audio/tray_audio.cc +++ b/ash/system/chromeos/audio/tray_audio.cc @@ -17,7 +17,7 @@ #include "ash/system/tray/system_tray_notifier.h" #include "ash/system/tray/tray_constants.h" #include "ash/volume_control_delegate.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chromeos/audio/cras_audio_handler.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" diff --git a/ash/system/chromeos/network/network_icon.cc b/ash/system/chromeos/network/network_icon.cc index 3446f6d06e708f..5bed70237a1909 100644 --- a/ash/system/chromeos/network/network_icon.cc +++ b/ash/system/chromeos/network/network_icon.cc @@ -7,7 +7,7 @@ #include "ash/shell.h" #include "ash/system/chromeos/network/network_icon_animation.h" #include "ash/system/chromeos/network/network_icon_animation_observer.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chromeos/network/device_state.h" #include "chromeos/network/network_connection_handler.h" #include "chromeos/network/network_state.h" diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.cc b/ash/system/chromeos/network/network_state_list_detailed_view.cc index 938662ef461711..009b4b59fad688 100644 --- a/ash/system/chromeos/network/network_state_list_detailed_view.cc +++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc @@ -21,8 +21,8 @@ #include "ash/system/tray/tray_popup_label_button.h" #include "base/command_line.h" #include "base/message_loop.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chromeos/chromeos_switches.h" #include "chromeos/network/device_state.h" #include "chromeos/network/network_state.h" diff --git a/ash/system/chromeos/network/network_state_notifier.cc b/ash/system/chromeos/network/network_state_notifier.cc index a00f7bc0502bfb..654eb4525c1b7e 100644 --- a/ash/system/chromeos/network/network_state_notifier.cc +++ b/ash/system/chromeos/network/network_state_notifier.cc @@ -9,7 +9,7 @@ #include "ash/system/tray/system_tray_notifier.h" #include "base/string16.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chromeos/network/network_connection_handler.h" #include "chromeos/network/network_event_log.h" #include "chromeos/network/network_state.h" diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc index 3d0328ea396635..fdaa4d8287e0b5 100644 --- a/ash/system/chromeos/network/tray_network.cc +++ b/ash/system/chromeos/network/tray_network.cc @@ -19,7 +19,7 @@ #include "ash/system/tray/tray_notification_view.h" #include "ash/system/tray/tray_utils.h" #include "base/command_line.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" #include "grit/ash_resources.h" diff --git a/ash/system/chromeos/network/tray_sms.cc b/ash/system/chromeos/network/tray_sms.cc index 5decbf126bbb37..982a56431817ac 100644 --- a/ash/system/chromeos/network/tray_sms.cc +++ b/ash/system/chromeos/network/tray_sms.cc @@ -15,7 +15,7 @@ #include "ash/system/tray/tray_item_view.h" #include "ash/system/tray/tray_notification_view.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ash/system/chromeos/power/power_status_view.cc b/ash/system/chromeos/power/power_status_view.cc index 9aa461c90cdcd8..4267010c42fff8 100644 --- a/ash/system/chromeos/power/power_status_view.cc +++ b/ash/system/chromeos/power/power_status_view.cc @@ -10,7 +10,7 @@ #include "ash/system/tray/fixed_sized_image_view.h" #include "ash/system/tray/tray_constants.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "grit/ash_strings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ash/system/chromeos/power/tray_power.cc b/ash/system/chromeos/power/tray_power.cc index 7206fbe2154c36..7bd35de868b128 100644 --- a/ash/system/chromeos/power/tray_power.cc +++ b/ash/system/chromeos/power/tray_power.cc @@ -15,7 +15,7 @@ #include "base/command_line.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chromeos/dbus/power_supply_status.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" diff --git a/ash/system/chromeos/settings/tray_settings.cc b/ash/system/chromeos/settings/tray_settings.cc index 0f16819ea2039e..a721299ceb6128 100644 --- a/ash/system/chromeos/settings/tray_settings.cc +++ b/ash/system/chromeos/settings/tray_settings.cc @@ -11,7 +11,7 @@ #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/tray_constants.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chromeos/dbus/power_manager_client.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc index 392f1dbf09285a..969fc1a19db0a4 100644 --- a/ash/system/chromeos/tray_display.cc +++ b/ash/system/chromeos/tray_display.cc @@ -13,7 +13,7 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_notification_view.h" #include "base/chromeos/chromeos_version.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ash/system/date/date_view.cc b/ash/system/date/date_view.cc index 4eabea88ddd47c..b0448977329734 100644 --- a/ash/system/date/date_view.cc +++ b/ash/system/date/date_view.cc @@ -9,8 +9,8 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_utils.h" #include "base/i18n/time_formatting.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "grit/ash_strings.h" #include "third_party/icu/public/i18n/unicode/datefmt.h" #include "third_party/icu/public/i18n/unicode/dtptngen.h" diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc index 34edabbe869188..43e80328e5d830 100644 --- a/ash/system/date/tray_date.cc +++ b/ash/system/date/tray_date.cc @@ -16,9 +16,9 @@ #include "ash/system/tray/tray_popup_header_button.h" #include "base/i18n/time_formatting.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" #include "base/timer.h" -#include "base/utf_string_conversions.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "third_party/icu/public/i18n/unicode/datefmt.h" diff --git a/ash/system/drive/tray_drive.cc b/ash/system/drive/tray_drive.cc index 317d215de2645f..028aa29bb58f4d 100644 --- a/ash/system/drive/tray_drive.cc +++ b/ash/system/drive/tray_drive.cc @@ -19,7 +19,7 @@ #include "base/logging.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc index f4c35536a47401..fac23a5a4c5036 100644 --- a/ash/system/ime/tray_ime.cc +++ b/ash/system/ime/tray_ime.cc @@ -20,7 +20,7 @@ #include "ash/system/tray/tray_notification_view.h" #include "ash/system/tray/tray_utils.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ash/system/monitor/tray_monitor.cc b/ash/system/monitor/tray_monitor.cc index cc46b0f0e98d39..69d1e0a36dbb96 100644 --- a/ash/system/monitor/tray_monitor.cc +++ b/ash/system/monitor/tray_monitor.cc @@ -7,11 +7,11 @@ #include "ash/system/tray/tray_item_view.h" #include "base/process_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/public/browser/gpu_data_manager.h" #include "ui/base/text/bytes_formatting.h" -#include "ui/views/controls/label.h" #include "ui/views/border.h" +#include "ui/views/controls/label.h" namespace { const int kRefreshTimeoutMs = 1000; diff --git a/ash/system/session_length_limit/tray_session_length_limit.cc b/ash/system/session_length_limit/tray_session_length_limit.cc index d80f652090c147..61426636e967c9 100644 --- a/ash/system/session_length_limit/tray_session_length_limit.cc +++ b/ash/system/session_length_limit/tray_session_length_limit.cc @@ -18,7 +18,7 @@ #include "base/logging.h" #include "base/string16.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/ash/system/status_area_widget_delegate.cc b/ash/system/status_area_widget_delegate.cc index 009d41c1cff38e..77d3cbf0f3f28a 100644 --- a/ash/system/status_area_widget_delegate.cc +++ b/ash/system/status_area_widget_delegate.cc @@ -9,7 +9,7 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/system/tray/tray_constants.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/aura/root_window.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc index f75a3077f9f446..16930581df14a7 100644 --- a/ash/system/tray/system_tray.cc +++ b/ash/system/tray/system_tray.cc @@ -30,8 +30,8 @@ #include "ash/system/user/tray_user.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/strings/utf_string_conversions.h" #include "base/timer.h" -#include "base/utf_string_conversions.h" #include "grit/ash_strings.h" #include "ui/aura/root_window.h" #include "ui/base/events/event_constants.h" diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc index 6d363290b778bb..936b29e29f8802 100644 --- a/ash/system/tray/system_tray_unittest.cc +++ b/ash/system/tray/system_tray_unittest.cc @@ -12,7 +12,7 @@ #include "ash/system/status_area_widget.h" #include "ash/system/tray/system_tray_item.h" #include "ash/test/ash_test_base.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/views/controls/label.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/view.h" diff --git a/ash/system/user/login_status.cc b/ash/system/user/login_status.cc index acaaf08ee807c0..ea35ee270429a6 100644 --- a/ash/system/user/login_status.cc +++ b/ash/system/user/login_status.cc @@ -7,7 +7,7 @@ #include "ash/session_state_delegate.h" #include "ash/shell.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "grit/ash_strings.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc index 965a24853eeb17..8134485c63c54b 100644 --- a/ash/system/user/tray_user.cc +++ b/ash/system/user/tray_user.cc @@ -25,7 +25,7 @@ #include "base/memory/scoped_vector.h" #include "base/string16.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "skia/ext/image_operations.h" diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc index 4565ef08b0f32f..c428bead4606cb 100644 --- a/ash/system/web_notification/web_notification_tray.cc +++ b/ash/system/web_notification/web_notification_tray.cc @@ -16,7 +16,7 @@ #include "ash/system/tray/tray_utils.h" #include "base/auto_reset.h" #include "base/i18n/number_formatting.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "grit/ui_strings.h" diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc index 5b593129230d45..ccd4d4dfbb547a 100644 --- a/ash/system/web_notification/web_notification_tray_unittest.cc +++ b/ash/system/web_notification/web_notification_tray_unittest.cc @@ -13,7 +13,7 @@ #include "ash/system/tray/system_tray_item.h" #include "ash/test/ash_test_base.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/message_center/message_center_style.h" #include "ui/message_center/message_center_tray.h" #include "ui/message_center/message_center_util.h" diff --git a/ash/test/test_launcher_delegate.cc b/ash/test/test_launcher_delegate.cc index e71fd3443dc9cb..a22ccb73d4a0fc 100644 --- a/ash/test/test_launcher_delegate.cc +++ b/ash/test/test_launcher_delegate.cc @@ -7,7 +7,7 @@ #include "ash/launcher/launcher_model.h" #include "ash/launcher/launcher_util.h" #include "ash/wm/window_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "grit/ash_resources.h" #include "ui/aura/window.h" diff --git a/ash/test/test_session_state_delegate.cc b/ash/test/test_session_state_delegate.cc index 1fdfef62945ee9..e1df9a72137616 100644 --- a/ash/test/test_session_state_delegate.cc +++ b/ash/test/test_session_state_delegate.cc @@ -5,7 +5,7 @@ #include "ash/test/test_session_state_delegate.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace ash { namespace test { diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc index 18ceb178fa93bb..4e560e4b831050 100644 --- a/ash/tooltips/tooltip_controller_unittest.cc +++ b/ash/tooltips/tooltip_controller_unittest.cc @@ -5,7 +5,7 @@ #include "ash/display/display_controller.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/aura/client/tooltip_client.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc index 98d48bfe0a7222..f480c9c9a290df 100644 --- a/ash/touch/touch_observer_hud.cc +++ b/ash/touch/touch_observer_hud.cc @@ -12,7 +12,7 @@ #include "base/json/json_string_value_serializer.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "third_party/skia/include/core/SkPath.h" #include "third_party/skia/include/core/SkXfermode.h" #include "third_party/skia/include/effects/SkGradientShader.h" diff --git a/base/android/jni_string.cc b/base/android/jni_string.cc index ac3975fa32c795..d25fed822bc3db 100644 --- a/base/android/jni_string.cc +++ b/base/android/jni_string.cc @@ -6,7 +6,7 @@ #include "base/android/jni_android.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace { diff --git a/base/android/jni_string_unittest.cc b/base/android/jni_string_unittest.cc index 59a847e06ad286..abd0683170e514 100644 --- a/base/android/jni_string_unittest.cc +++ b/base/android/jni_string_unittest.cc @@ -6,7 +6,7 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { diff --git a/base/command_line.cc b/base/command_line.cc index 9aa68be7969e61..295f41de6c632e 100644 --- a/base/command_line.cc +++ b/base/command_line.cc @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #if defined(OS_WIN) diff --git a/base/command_line_unittest.cc b/base/command_line_unittest.cc index ca7c9fbe16365e..2c947fc39ad8a4 100644 --- a/base/command_line_unittest.cc +++ b/base/command_line_unittest.cc @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/files/file_path.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" using base::FilePath; diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc index 6e3516e2c2bfac..deda5f1cb9c69c 100644 --- a/base/debug/trace_event_impl.cc +++ b/base/debug/trace_event_impl.cc @@ -18,6 +18,7 @@ #include "base/stringprintf.h" #include "base/strings/string_split.h" #include "base/strings/string_tokenizer.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/cancellation_flag.h" #include "base/synchronization/waitable_event.h" #include "base/sys_info.h" @@ -26,7 +27,6 @@ #include "base/threading/thread_id_name_manager.h" #include "base/threading/thread_local.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #if defined(OS_WIN) #include "base/debug/trace_event_win.h" diff --git a/base/environment.cc b/base/environment.cc index 6849fef88cb248..5e4d9dddeda553 100644 --- a/base/environment.cc +++ b/base/environment.cc @@ -14,7 +14,7 @@ #if defined(OS_WIN) #include "base/memory/scoped_ptr.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #endif namespace { diff --git a/base/file_util.cc b/base/file_util.cc index 58dbd795d34f54..7425717a921e00 100644 --- a/base/file_util.cc +++ b/base/file_util.cc @@ -16,7 +16,7 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" using base::FilePath; diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc index 7ef09a200de29c..149b9729efb70b 100644 --- a/base/file_util_posix.cc +++ b/base/file_util_posix.cc @@ -42,9 +42,9 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #if defined(OS_ANDROID) #include "base/os_compat_android.h" diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc index 5cfc677ec95081..d002bc52697060 100644 --- a/base/file_util_unittest.cc +++ b/base/file_util_unittest.cc @@ -21,9 +21,9 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/strings/utf_string_conversions.h" #include "base/test/test_file_util.h" #include "base/threading/platform_thread.h" -#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/base/file_util_win.cc b/base/file_util_win.cc index 47c59cf344f92f..188f377cd39438 100644 --- a/base/file_util_win.cc +++ b/base/file_util_win.cc @@ -20,9 +20,9 @@ #include "base/process_util.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" diff --git a/base/files/file_path.cc b/base/files/file_path.cc index a9e4be25df6785..74469b2905848d 100644 --- a/base/files/file_path.cc +++ b/base/files/file_path.cc @@ -16,7 +16,7 @@ #include "base/string_util.h" #include "base/strings/string_piece.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #if defined(OS_MACOSX) #include "base/mac/scoped_cftyperef.h" diff --git a/base/files/file_path_unittest.cc b/base/files/file_path_unittest.cc index 50befdf529889e..8b2fcf531c96e6 100644 --- a/base/files/file_path_unittest.cc +++ b/base/files/file_path_unittest.cc @@ -4,7 +4,7 @@ #include "base/basictypes.h" #include "base/files/file_path.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/base/guid_win.cc b/base/guid_win.cc index 1cddff88968585..06378e3bc04c4e 100644 --- a/base/guid_win.cc +++ b/base/guid_win.cc @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace base { diff --git a/base/i18n/break_iterator_unittest.cc b/base/i18n/break_iterator_unittest.cc index cf2bf225dd3aa3..136b5dd45feee6 100644 --- a/base/i18n/break_iterator_unittest.cc +++ b/base/i18n/break_iterator_unittest.cc @@ -6,7 +6,7 @@ #include "base/stringprintf.h" #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { diff --git a/base/i18n/case_conversion_unittest.cc b/base/i18n/case_conversion_unittest.cc index 63900ec9464255..2139bbe7b38ff6 100644 --- a/base/i18n/case_conversion_unittest.cc +++ b/base/i18n/case_conversion_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/i18n/case_conversion.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/base/i18n/char_iterator_unittest.cc b/base/i18n/char_iterator_unittest.cc index 509e27c54b088a..0cf8e6c07d4efa 100644 --- a/base/i18n/char_iterator_unittest.cc +++ b/base/i18n/char_iterator_unittest.cc @@ -4,7 +4,7 @@ #include "base/i18n/char_iterator.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { diff --git a/base/i18n/file_util_icu.cc b/base/i18n/file_util_icu.cc index a29eb4b0068510..ca6fe515e28d31 100644 --- a/base/i18n/file_util_icu.cc +++ b/base/i18n/file_util_icu.cc @@ -14,7 +14,7 @@ #include "base/memory/singleton.h" #include "base/string_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "third_party/icu/public/common/unicode/uniset.h" #include "third_party/icu/public/i18n/unicode/coll.h" diff --git a/base/i18n/file_util_icu_unittest.cc b/base/i18n/file_util_icu_unittest.cc index f49ac5a47c2f9a..e3af9adf9469cc 100644 --- a/base/i18n/file_util_icu_unittest.cc +++ b/base/i18n/file_util_icu_unittest.cc @@ -5,7 +5,7 @@ #include "base/i18n/file_util_icu.h" #include "base/file_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/base/i18n/icu_string_conversions.cc b/base/i18n/icu_string_conversions.cc index 292d614d62796c..a11f3bb33e7710 100644 --- a/base/i18n/icu_string_conversions.cc +++ b/base/i18n/icu_string_conversions.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "third_party/icu/public/common/unicode/ucnv.h" #include "third_party/icu/public/common/unicode/ucnv_cb.h" #include "third_party/icu/public/common/unicode/ucnv_err.h" diff --git a/base/i18n/icu_string_conversions_unittest.cc b/base/i18n/icu_string_conversions_unittest.cc index 4b534353e0570b..605d6dc43c5b9f 100644 --- a/base/i18n/icu_string_conversions_unittest.cc +++ b/base/i18n/icu_string_conversions_unittest.cc @@ -14,7 +14,7 @@ #include "base/logging.h" #include "base/stringprintf.h" #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { diff --git a/base/i18n/number_formatting.cc b/base/i18n/number_formatting.cc index 95eea1b7ac72d3..9f365a39dbf296 100644 --- a/base/i18n/number_formatting.cc +++ b/base/i18n/number_formatting.cc @@ -5,12 +5,12 @@ #include "base/i18n/number_formatting.h" #include "base/format_macros.h" -#include "base/logging.h" #include "base/lazy_instance.h" +#include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stringprintf.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "third_party/icu/public/common/unicode/ustring.h" #include "third_party/icu/public/i18n/unicode/numfmt.h" diff --git a/base/i18n/number_formatting_unittest.cc b/base/i18n/number_formatting_unittest.cc index c40ab34954c117..da6397df8aabc0 100644 --- a/base/i18n/number_formatting_unittest.cc +++ b/base/i18n/number_formatting_unittest.cc @@ -6,7 +6,7 @@ #include "base/i18n/number_formatting.h" #include "base/i18n/rtl.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { diff --git a/base/i18n/rtl.cc b/base/i18n/rtl.cc index 9da29d8d242485..555fb11f43412a 100644 --- a/base/i18n/rtl.cc +++ b/base/i18n/rtl.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "third_party/icu/public/common/unicode/locid.h" #include "third_party/icu/public/common/unicode/uchar.h" #include "third_party/icu/public/common/unicode/uscript.h" diff --git a/base/i18n/rtl_unittest.cc b/base/i18n/rtl_unittest.cc index b1047c6e5f34b4..b170c35d2d68b6 100644 --- a/base/i18n/rtl_unittest.cc +++ b/base/i18n/rtl_unittest.cc @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/string_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "third_party/icu/public/i18n/unicode/usearch.h" diff --git a/base/i18n/string_compare.cc b/base/i18n/string_compare.cc index 41d19d84fc1262..1ac7284359ca7a 100644 --- a/base/i18n/string_compare.cc +++ b/base/i18n/string_compare.cc @@ -5,7 +5,7 @@ #include "base/i18n/string_compare.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace base { namespace i18n { diff --git a/base/i18n/string_search_unittest.cc b/base/i18n/string_search_unittest.cc index 8a4aa78a7cf3a7..326f01884f76a6 100644 --- a/base/i18n/string_search_unittest.cc +++ b/base/i18n/string_search_unittest.cc @@ -7,7 +7,7 @@ #include "base/i18n/rtl.h" #include "base/i18n/string_search.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/icu/public/i18n/unicode/usearch.h" diff --git a/base/i18n/time_formatting.cc b/base/i18n/time_formatting.cc index e60acd1866c136..dbe74d886a6858 100644 --- a/base/i18n/time_formatting.cc +++ b/base/i18n/time_formatting.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" #include "third_party/icu/public/i18n/unicode/datefmt.h" #include "third_party/icu/public/i18n/unicode/dtptngen.h" diff --git a/base/i18n/time_formatting_unittest.cc b/base/i18n/time_formatting_unittest.cc index 3c4bf021a906bc..655d73506c7350 100644 --- a/base/i18n/time_formatting_unittest.cc +++ b/base/i18n/time_formatting_unittest.cc @@ -5,8 +5,8 @@ #include "base/i18n/time_formatting.h" #include "base/i18n/rtl.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/icu/public/common/unicode/uversion.h" diff --git a/base/json/json_parser.cc b/base/json/json_parser.cc index 3f5bc1c6cbfb8f..1d44e4f72d050d 100644 --- a/base/json/json_parser.cc +++ b/base/json/json_parser.cc @@ -12,8 +12,8 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversion_utils.h" +#include "base/strings/utf_string_conversions.h" #include "base/third_party/icu/icu_utf.h" -#include "base/utf_string_conversions.h" #include "base/values.h" namespace base { diff --git a/base/json/json_reader_unittest.cc b/base/json/json_reader_unittest.cc index ab38b044d94817..0180f48a031312 100644 --- a/base/json/json_reader_unittest.cc +++ b/base/json/json_reader_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/json/json_value_serializer_unittest.cc b/base/json/json_value_serializer_unittest.cc index 9df04352ac8f73..78e2f44cec339c 100644 --- a/base/json/json_value_serializer_unittest.cc +++ b/base/json/json_value_serializer_unittest.cc @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/json/json_writer.cc b/base/json/json_writer.cc index f479e50ea94a59..e97bd2d8520a26 100644 --- a/base/json/json_writer.cc +++ b/base/json/json_writer.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" namespace base { diff --git a/base/json/string_escape_unittest.cc b/base/json/string_escape_unittest.cc index c550ca383f97fb..8952ee76d287f7 100644 --- a/base/json/string_escape_unittest.cc +++ b/base/json/string_escape_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/json/string_escape.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { diff --git a/base/logging.cc b/base/logging.cc index 4800f82e203125..49623bf555abfa 100644 --- a/base/logging.cc +++ b/base/logging.cc @@ -51,9 +51,9 @@ typedef pthread_mutex_t* MutexHandle; #include "base/debug/stack_trace.h" #include "base/posix/eintr_wrapper.h" #include "base/strings/string_piece.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock_impl.h" #include "base/threading/platform_thread.h" -#include "base/utf_string_conversions.h" #include "base/vlog.h" #if defined(OS_POSIX) #include "base/safe_strerror_posix.h" diff --git a/base/memory/shared_memory_posix.cc b/base/memory/shared_memory_posix.cc index 63b20f3b648529..66f58487ab3ecc 100644 --- a/base/memory/shared_memory_posix.cc +++ b/base/memory/shared_memory_posix.cc @@ -15,10 +15,10 @@ #include "base/logging.h" #include "base/process_util.h" #include "base/safe_strerror_posix.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_restrictions.h" -#include "base/utf_string_conversions.h" #if defined(OS_MACOSX) #include "base/mac/foundation_util.h" diff --git a/base/memory/shared_memory_win.cc b/base/memory/shared_memory_win.cc index 8f92c357196148..42e0b046b96e58 100644 --- a/base/memory/shared_memory_win.cc +++ b/base/memory/shared_memory_win.cc @@ -5,7 +5,7 @@ #include "base/memory/shared_memory.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace { diff --git a/base/metrics/field_trial.cc b/base/metrics/field_trial.cc index c87935ed864f1b..56771903ecfbb8 100644 --- a/base/metrics/field_trial.cc +++ b/base/metrics/field_trial.cc @@ -8,10 +8,10 @@ #include "base/logging.h" #include "base/rand_util.h" #include "base/sha1.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/sys_byteorder.h" -#include "base/utf_string_conversions.h" namespace base { diff --git a/base/metrics/stats_table.cc b/base/metrics/stats_table.cc index 9b7f293f2dcbb9..465b44654b8008 100644 --- a/base/metrics/stats_table.cc +++ b/base/metrics/stats_table.cc @@ -10,9 +10,9 @@ #include "base/shared_memory.h" #include "base/string_util.h" #include "base/strings/string_piece.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_local_storage.h" -#include "base/utf_string_conversions.h" #if defined(OS_POSIX) #include "errno.h" diff --git a/base/metrics/stats_table_unittest.cc b/base/metrics/stats_table_unittest.cc index 713fff05d30b28..3af76144d5ac49 100644 --- a/base/metrics/stats_table_unittest.cc +++ b/base/metrics/stats_table_unittest.cc @@ -7,10 +7,10 @@ #include "base/shared_memory.h" #include "base/stringprintf.h" #include "base/strings/string_piece.h" +#include "base/strings/utf_string_conversions.h" #include "base/test/multiprocess_test.h" #include "base/threading/platform_thread.h" #include "base/threading/simple_thread.h" -#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/multiprocess_func_list.h" diff --git a/base/native_library_mac.mm b/base/native_library_mac.mm index 4a0947561c8929..a45f878295b8ee 100644 --- a/base/native_library_mac.mm +++ b/base/native_library_mac.mm @@ -12,8 +12,8 @@ #include "base/logging.h" #include "base/mac/scoped_cftyperef.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" -#include "base/utf_string_conversions.h" namespace base { diff --git a/base/native_library_posix.cc b/base/native_library_posix.cc index 9b694e1f031a47..dfa20fc01cf78e 100644 --- a/base/native_library_posix.cc +++ b/base/native_library_posix.cc @@ -8,8 +8,8 @@ #include "base/files/file_path.h" #include "base/logging.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" -#include "base/utf_string_conversions.h" namespace base { diff --git a/base/native_library_win.cc b/base/native_library_win.cc index af00cd1133d579..2d437fa2a581fb 100644 --- a/base/native_library_win.cc +++ b/base/native_library_win.cc @@ -7,8 +7,8 @@ #include #include "base/file_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" -#include "base/utf_string_conversions.h" namespace base { diff --git a/base/platform_file_posix.cc b/base/platform_file_posix.cc index beae804c629c86..e4d529368d758c 100644 --- a/base/platform_file_posix.cc +++ b/base/platform_file_posix.cc @@ -13,8 +13,8 @@ #include "base/logging.h" #include "base/metrics/sparse_histogram.h" #include "base/posix/eintr_wrapper.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" -#include "base/utf_string_conversions.h" #if defined(OS_ANDROID) #include "base/os_compat_android.h" diff --git a/base/prefs/json_pref_store_unittest.cc b/base/prefs/json_pref_store_unittest.cc index ac6a187679a8ca..5e6797ae2647b4 100644 --- a/base/prefs/json_pref_store_unittest.cc +++ b/base/prefs/json_pref_store_unittest.cc @@ -12,9 +12,9 @@ #include "base/run_loop.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/thread.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc index 2d286ca9881417..99e9f3f8916a66 100644 --- a/base/process_util_unittest.cc +++ b/base/process_util_unittest.cc @@ -15,12 +15,12 @@ #include "base/path_service.h" #include "base/posix/eintr_wrapper.h" #include "base/process_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/test/multiprocess_test.h" #include "base/test/test_timeouts.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" -#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/multiprocess_func_list.h" diff --git a/base/string16.cc b/base/string16.cc index 54d00fb001e1ca..a473786a37adb3 100644 --- a/base/string16.cc +++ b/base/string16.cc @@ -15,7 +15,7 @@ #include -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace base { diff --git a/base/string16_unittest.cc b/base/string16_unittest.cc index e833ed2436520c..cd8f4f647a7039 100644 --- a/base/string16_unittest.cc +++ b/base/string16_unittest.cc @@ -5,7 +5,7 @@ #include #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(WCHAR_T_IS_UTF32) diff --git a/base/string_util.cc b/base/string_util.cc index 4e96ba8bc5f95d..bbded5737445be 100644 --- a/base/string_util.cc +++ b/base/string_util.cc @@ -24,7 +24,7 @@ #include "base/logging.h" #include "base/memory/singleton.h" #include "base/strings/utf_string_conversion_utils.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/third_party/icu/icu_utf.h" namespace { diff --git a/base/string_util_unittest.cc b/base/string_util_unittest.cc index d580fba117cd7a..6478eae9cdd2b7 100644 --- a/base/string_util_unittest.cc +++ b/base/string_util_unittest.cc @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/string16.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/stringprintf.cc b/base/stringprintf.cc index 814fe9955e62c4..946ec726644a76 100644 --- a/base/stringprintf.cc +++ b/base/stringprintf.cc @@ -8,7 +8,7 @@ #include "base/scoped_clear_errno.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace base { diff --git a/base/strings/string_number_conversions.cc b/base/strings/string_number_conversions.cc index 39daecec9d9c39..b9412d93131d6a 100644 --- a/base/strings/string_number_conversions.cc +++ b/base/strings/string_number_conversions.cc @@ -13,8 +13,8 @@ #include "base/logging.h" #include "base/scoped_clear_errno.h" +#include "base/strings/utf_string_conversions.h" #include "base/third_party/dmg_fp/dmg_fp.h" -#include "base/utf_string_conversions.h" namespace base { diff --git a/base/strings/string_number_conversions_unittest.cc b/base/strings/string_number_conversions_unittest.cc index 5ae59d304108a8..1c8d99fc4cb3b2 100644 --- a/base/strings/string_number_conversions_unittest.cc +++ b/base/strings/string_number_conversions_unittest.cc @@ -8,7 +8,7 @@ #include #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { diff --git a/base/strings/string_piece_unittest.cc b/base/strings/string_piece_unittest.cc index 6265888f1d220b..4a5548f3e4041d 100644 --- a/base/strings/string_piece_unittest.cc +++ b/base/strings/string_piece_unittest.cc @@ -6,7 +6,7 @@ #include "base/string16.h" #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { diff --git a/base/strings/string_split.cc b/base/strings/string_split.cc index 819fdbadcad568..59736379586d43 100644 --- a/base/strings/string_split.cc +++ b/base/strings/string_split.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/third_party/icu/icu_utf.h" -#include "base/utf_string_conversions.h" namespace base { diff --git a/base/strings/string_split_unittest.cc b/base/strings/string_split_unittest.cc index 6729497c735951..eb69b68fcbd67f 100644 --- a/base/strings/string_split_unittest.cc +++ b/base/strings/string_split_unittest.cc @@ -4,7 +4,7 @@ #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/strings/sys_string_conversions_posix.cc b/base/strings/sys_string_conversions_posix.cc index d58026c0444dba..1e926bb5490764 100644 --- a/base/strings/sys_string_conversions_posix.cc +++ b/base/strings/sys_string_conversions_posix.cc @@ -7,7 +7,7 @@ #include #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace base { diff --git a/base/strings/sys_string_conversions_unittest.cc b/base/strings/sys_string_conversions_unittest.cc index 5c15a760610fe8..d2d38e40cc41ad 100644 --- a/base/strings/sys_string_conversions_unittest.cc +++ b/base/strings/sys_string_conversions_unittest.cc @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/strings/string_piece.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/test/scoped_locale.h" -#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #ifdef WCHAR_T_IS_UTF32 diff --git a/base/sys_info_posix.cc b/base/sys_info_posix.cc index ca188947d6c20d..bbb16625590631 100644 --- a/base/sys_info_posix.cc +++ b/base/sys_info_posix.cc @@ -13,8 +13,8 @@ #include "base/basictypes.h" #include "base/file_util.h" #include "base/logging.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" -#include "base/utf_string_conversions.h" #if defined(OS_ANDROID) #include diff --git a/base/test/test_file_util_posix.cc b/base/test/test_file_util_posix.cc index 7c16cb1835e6cb..fe5b0ff2649131 100644 --- a/base/test/test_file_util_posix.cc +++ b/base/test/test_file_util_posix.cc @@ -15,7 +15,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" using base::MakeAbsoluteFilePath; diff --git a/base/test/test_shortcut_win.cc b/base/test/test_shortcut_win.cc index ec6300af019020..43a94ada29a44b 100644 --- a/base/test/test_shortcut_win.cc +++ b/base/test/test_shortcut_win.cc @@ -10,7 +10,7 @@ #include "base/files/file_path.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_propvariant.h" #include "base/win/windows_version.h" diff --git a/base/values.cc b/base/values.cc index 66998853435687..75db8c7a3af8c8 100644 --- a/base/values.cc +++ b/base/values.cc @@ -11,7 +11,7 @@ #include "base/json/json_writer.h" #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace { diff --git a/base/values_unittest.cc b/base/values_unittest.cc index b3459abc92c9d3..74642c55370171 100644 --- a/base/values_unittest.cc +++ b/base/values_unittest.cc @@ -6,7 +6,7 @@ #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/win/windows_version.cc b/base/win/windows_version.cc index c130e0e397d765..9564d0bed8f870 100644 --- a/base/win/windows_version.cc +++ b/base/win/windows_version.cc @@ -7,7 +7,7 @@ #include #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/registry.h" namespace base {