diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-08 16:02:12 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-08 16:02:12 +0000 |
commit | 5846d586eb27ff30cfe7d2a1098169b373e149c5 (patch) | |
tree | 8213dbbfc2239ac8b3fbe9f9be44ca66756a196f | |
parent | c10e43176b94575aa519c0e8a514f462513adf2b (diff) | |
download | chromium_src-5846d586eb27ff30cfe7d2a1098169b373e149c5.zip chromium_src-5846d586eb27ff30cfe7d2a1098169b373e149c5.tar.gz chromium_src-5846d586eb27ff30cfe7d2a1098169b373e149c5.tar.bz2 |
Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 1.
BUG=none
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16525009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205063 0039d316-1c4b-4281-b951-d872f2087c98
240 files changed, 252 insertions, 252 deletions
diff --git a/chrome/browser/ui/android/autofill/autofill_dialog_view_android.cc b/chrome/browser/ui/android/autofill/autofill_dialog_view_android.cc index f2a1d61..72deb9f 100644 --- a/chrome/browser/ui/android/autofill/autofill_dialog_view_android.cc +++ b/chrome/browser/ui/android/autofill/autofill_dialog_view_android.cc @@ -7,7 +7,7 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/android/window_android_helper.h" #include "chrome/browser/ui/autofill/data_model_wrapper.h" diff --git a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc index d023691..5d6242c 100644 --- a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc +++ b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc @@ -6,7 +6,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" diff --git a/chrome/browser/ui/android/login_prompt_android.cc b/chrome/browser/ui/android/login_prompt_android.cc index 19c588f..1346ecf 100644 --- a/chrome/browser/ui/android/login_prompt_android.cc +++ b/chrome/browser/ui/android/login_prompt_android.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/android/tab_android.h" #include "chrome/browser/ui/android/chrome_http_auth_handler.h" #include "chrome/browser/ui/login/login_prompt.h" diff --git a/chrome/browser/ui/app_list/search/app_search_provider.cc b/chrome/browser/ui/app_list/search/app_search_provider.cc index 3a7d5db..b976f56 100644 --- a/chrome/browser/ui/app_list/search/app_search_provider.cc +++ b/chrome/browser/ui/app_list/search/app_search_provider.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc b/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc index 8f9d0a7..4e0d064 100644 --- a/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc +++ b/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service_unittest.h" #include "chrome/browser/ui/app_list/search/app_search_provider.h" #include "chrome/browser/ui/app_list/search/chrome_search_result.h" diff --git a/chrome/browser/ui/app_list/search/history.cc b/chrome/browser/ui/app_list/search/history.cc index 66cf5d4..dcda647 100644 --- a/chrome/browser/ui/app_list/search/history.cc +++ b/chrome/browser/ui/app_list/search/history.cc @@ -6,7 +6,7 @@ #include "base/files/file_path.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/app_list/search/history_data.h" #include "chrome/browser/ui/app_list/search/history_data_store.h" #include "chrome/browser/ui/app_list/search/tokenized_string.h" diff --git a/chrome/browser/ui/app_list/search/mixer_unittest.cc b/chrome/browser/ui/app_list/search/mixer_unittest.cc index 4e49ac7..61a2896 100644 --- a/chrome/browser/ui/app_list/search/mixer_unittest.cc +++ b/chrome/browser/ui/app_list/search/mixer_unittest.cc @@ -7,7 +7,7 @@ #include "base/memory/scoped_vector.h" #include "base/string16.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/app_list/search/chrome_search_result.h" #include "chrome/browser/ui/app_list/search/history_types.h" #include "chrome/browser/ui/app_list/search/mixer.h" diff --git a/chrome/browser/ui/app_list/search/search_controller.cc b/chrome/browser/ui/app_list/search/search_controller.cc index 5144a8a..dfe0ffc 100644 --- a/chrome/browser/ui/app_list/search/search_controller.cc +++ b/chrome/browser/ui/app_list/search/search_controller.cc @@ -11,7 +11,7 @@ #include "base/command_line.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 "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/search/app_search_provider.h" #include "chrome/browser/ui/app_list/search/chrome_search_result.h" diff --git a/chrome/browser/ui/app_list/search/search_webstore_result.cc b/chrome/browser/ui/app_list/search/search_webstore_result.cc index 864667c..bfdda46 100644 --- a/chrome/browser/ui/app_list/search/search_webstore_result.cc +++ b/chrome/browser/ui/app_list/search/search_webstore_result.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/app_list/search/search_webstore_result.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/common/extensions/extension_constants.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/app_list/search/term_break_iterator_unittest.cc b/chrome/browser/ui/app_list/search/term_break_iterator_unittest.cc index 1e722fa..05d0cc0 100644 --- a/chrome/browser/ui/app_list/search/term_break_iterator_unittest.cc +++ b/chrome/browser/ui/app_list/search/term_break_iterator_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/app_list/search/term_break_iterator.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace app_list { diff --git a/chrome/browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc b/chrome/browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc index 7bf4ca9f..6d73b14 100644 --- a/chrome/browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc +++ b/chrome/browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc @@ -9,7 +9,7 @@ #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace app_list { diff --git a/chrome/browser/ui/app_list/search/tokenized_string_match_unittest.cc b/chrome/browser/ui/app_list/search/tokenized_string_match_unittest.cc index f088b33..cabe609 100644 --- a/chrome/browser/ui/app_list/search/tokenized_string_match_unittest.cc +++ b/chrome/browser/ui/app_list/search/tokenized_string_match_unittest.cc @@ -5,7 +5,7 @@ #include <string> #include "base/basictypes.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/app_list/search/tokenized_string_match.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/app_list/search/tokenized_string_unittest.cc b/chrome/browser/ui/app_list/search/tokenized_string_unittest.cc index 6cbd808..dfccfce 100644 --- a/chrome/browser/ui/app_list/search/tokenized_string_unittest.cc +++ b/chrome/browser/ui/app_list/search/tokenized_string_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/app_list/search/tokenized_string.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace app_list { diff --git a/chrome/browser/ui/app_list/search/webstore_provider.cc b/chrome/browser/ui/app_list/search/webstore_provider.cc index 2abc732..7f0cad1 100644 --- a/chrome/browser/ui/app_list/search/webstore_provider.cc +++ b/chrome/browser/ui/app_list/search/webstore_provider.cc @@ -7,7 +7,7 @@ #include <string> #include "base/bind.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/app_list/search/webstore_provider_browsertest.cc b/chrome/browser/ui/app_list/search/webstore_provider_browsertest.cc index 865f18f..9caf949 100644 --- a/chrome/browser/ui/app_list/search/webstore_provider_browsertest.cc +++ b/chrome/browser/ui/app_list/search/webstore_provider_browsertest.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/app_list/search/chrome_search_result.h" #include "chrome/browser/ui/app_list/search/webstore_provider.h" diff --git a/chrome/browser/ui/app_list/search/webstore_result.cc b/chrome/browser/ui/app_list/search/webstore_result.cc index bab1903..b7f55fc 100644 --- a/chrome/browser/ui/app_list/search/webstore_result.cc +++ b/chrome/browser/ui/app_list/search/webstore_result.cc @@ -7,7 +7,7 @@ #include <vector> #include "base/bind.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/search/webstore_result_icon_source.h" #include "chrome/browser/ui/browser_navigator.h" diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc index 32308a4..8c3f76c 100644 --- a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc +++ b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/i18n/rtl.h" #include "base/memory/singleton.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc index 1741639..5b7cecc 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc @@ -16,7 +16,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/extensions/shell_window_registry.h" #include "chrome/browser/lifetime/application_lifetime.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc index 9997a6b..11aaebb 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc @@ -13,7 +13,7 @@ #include "ash/wm/window_util.h" #include "base/command_line.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/automation/automation_util.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_browsertest.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc index e30e37c..d8efacc 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc @@ -17,7 +17,7 @@ #include "ash/wm/window_util.h" #include "base/command_line.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" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/defaults.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc index 46ce412..b31c8a7 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc @@ -14,7 +14,7 @@ #include "ash/test/launcher_view_test_api.h" #include "ash/test/shell_test_api.h" #include "ash/wm/window_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/automation/automation_util.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_browsertest.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc index 7ba89b3..8e6b3a9 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc @@ -15,7 +15,7 @@ #include "base/files/file_path.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 "base/values.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/test_extension_system.h" diff --git a/chrome/browser/ui/ash/launcher/launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/launcher_item_controller.cc index 1cb9c33..d0cb781 100644 --- a/chrome/browser/ui/ash/launcher/launcher_item_controller.cc +++ b/chrome/browser/ui/ash/launcher/launcher_item_controller.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" #include "base/basictypes.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" diff --git a/chrome/browser/ui/ash/screenshot_taker.cc b/chrome/browser/ui/ash/screenshot_taker.cc index 3ae8748..3588ee0 100644 --- a/chrome/browser/ui/ash/screenshot_taker.cc +++ b/chrome/browser/ui/ash/screenshot_taker.cc @@ -13,9 +13,9 @@ #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/notifications/notification_ui_manager.h" diff --git a/chrome/browser/ui/ash/session_state_delegate_views.cc b/chrome/browser/ui/ash/session_state_delegate_views.cc index 4aa773a..421fa19 100644 --- a/chrome/browser/ui/ash/session_state_delegate_views.cc +++ b/chrome/browser/ui/ash/session_state_delegate_views.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/gfx/image/image_skia.h" namespace { diff --git a/chrome/browser/ui/ash/shelf_browsertest.cc b/chrome/browser/ui/ash/shelf_browsertest.cc index ff3170b..72c66c6 100644 --- a/chrome/browser/ui/ash/shelf_browsertest.cc +++ b/chrome/browser/ui/ash/shelf_browsertest.cc @@ -6,7 +6,7 @@ #include "ash/shelf/shelf_layout_manager.h" #include "ash/shell.h" #include "ash/wm/workspace_controller.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/status_bubble.h" diff --git a/chrome/browser/ui/auto_login_infobar_delegate.cc b/chrome/browser/ui/auto_login_infobar_delegate.cc index a48e060..e075c7a 100644 --- a/chrome/browser/ui/auto_login_infobar_delegate.cc +++ b/chrome/browser/ui/auto_login_infobar_delegate.cc @@ -9,7 +9,7 @@ #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" diff --git a/chrome/browser/ui/autofill/account_chooser_model.cc b/chrome/browser/ui/autofill/account_chooser_model.cc index 299ad40..48249e3 100644 --- a/chrome/browser/ui/autofill/account_chooser_model.cc +++ b/chrome/browser/ui/autofill/account_chooser_model.cc @@ -8,8 +8,8 @@ #include "base/prefs/pref_service.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/common/pref_names.h" #include "components/autofill/browser/autofill_metrics.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/autofill/account_chooser_model_unittest.cc b/chrome/browser/ui/autofill/account_chooser_model_unittest.cc index 4bf62be..1110e3c 100644 --- a/chrome/browser/ui/autofill/account_chooser_model_unittest.cc +++ b/chrome/browser/ui/autofill/account_chooser_model_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/autofill/account_chooser_model.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc index 759b6d6..0c65489 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc @@ -6,8 +6,8 @@ #include "base/command_line.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h" #include "chrome/browser/ui/autofill/autofill_dialog_view.h" #include "chrome/browser/ui/autofill/data_model_wrapper.h" diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc index 72f966e..c537b1a 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc @@ -15,8 +15,8 @@ #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/shell_window_registry.h" diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc index 8b2b724..24e4dd3 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "base/prefs/pref_service.h" #include "base/run_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h" #include "chrome/browser/ui/autofill/autofill_dialog_view.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/autofill/autofill_dialog_models.cc b/chrome/browser/ui/autofill/autofill_dialog_models.cc index 004d1fe..0d445dc 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_models.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_models.cc @@ -8,8 +8,8 @@ #include "base/prefs/pref_service.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/common/pref_names.h" #include "components/autofill/browser/autofill_country.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc index b4fcaf7..b87fb40 100644 --- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc @@ -8,7 +8,7 @@ #include <utility> #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/autofill/autofill_popup_view.h" #include "components/autofill/browser/autofill_popup_delegate.h" #include "content/public/browser/native_web_keyboard_event.h" diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc index 0688350..c3c3fe1 100644 --- a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc +++ b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc @@ -5,7 +5,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/prefs/testing_pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h" #include "chrome/browser/ui/autofill/autofill_popup_view.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" diff --git a/chrome/browser/ui/autofill/country_combobox_model.cc b/chrome/browser/ui/autofill/country_combobox_model.cc index 4829efa..fe2eab2 100644 --- a/chrome/browser/ui/autofill/country_combobox_model.cc +++ b/chrome/browser/ui/autofill/country_combobox_model.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/autofill/country_combobox_model.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "components/autofill/browser/autofill_country.h" #include "ui/base/l10n/l10n_util_collator.h" diff --git a/chrome/browser/ui/autofill/data_model_wrapper.cc b/chrome/browser/ui/autofill/data_model_wrapper.cc index 76674b5..1781677 100644 --- a/chrome/browser/ui/autofill/data_model_wrapper.cc +++ b/chrome/browser/ui/autofill/data_model_wrapper.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/autofill/data_model_wrapper.h" #include "base/callback.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/autofill/autofill_dialog_models.h" #include "components/autofill/browser/autofill_data_model.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc index ac56bbc..7fc4004 100644 --- a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/strings/utf_string_conversions.h" #include "base/timer.h" -#include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc index cac914b..ef95d4b 100644 --- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc @@ -7,7 +7,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc index 00a4fc1..dbe485a 100644 --- a/chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/bookmarks/bookmark_utils.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/test/base/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc index 60e4a66..234be33 100644 --- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc +++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h" #include "base/memory/scoped_ptr.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 602a1d1..c184599 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -23,10 +23,10 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 22baafd..8e5cbfe 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -8,8 +8,8 @@ #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/prefs/pref_service.h" +#include "base/strings/utf_string_conversions.h" #include "base/sys_info.h" -#include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/chrome_content_browser_client.h" #include "chrome/browser/command_updater.h" diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc index e5ee6e8a..b020353 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc index ec434e6..5ff7dc5 100644 --- a/chrome/browser/ui/browser_focus_uitest.cc +++ b/chrome/browser/ui/browser_focus_uitest.cc @@ -11,7 +11,7 @@ #include "base/path_service.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 "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_tabstrip.h" diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc index 4c6b399..4ec35f27 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/prefs/pref_service.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_about_handler.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/tab_helper.h" diff --git a/chrome/browser/ui/browser_win.cc b/chrome/browser/ui/browser_win.cc index db2316f..929573d 100644 --- a/chrome/browser/ui/browser_win.cc +++ b/chrome/browser/ui/browser_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/browser.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/metro.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm b/chrome/browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm index f16bfbd..e6ce376 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm @@ -6,7 +6,7 @@ #import <Cocoa/Cocoa.h> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/autofill/mock_autofill_dialog_controller.h" #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h" #import "chrome/browser/ui/cocoa/menu_button.h" diff --git a/chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm b/chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm index 1c35e87..651d0c05 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm @@ -6,7 +6,7 @@ #include "base/mac/foundation_util.h" #include "base/memory/scoped_nsobject.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/autofill/autofill_dialog_models.h" #include "chrome/browser/ui/autofill/mock_autofill_dialog_controller.h" #import "chrome/browser/ui/cocoa/autofill/layout_view.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm index be1ea13..1e0a3ab 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm @@ -6,7 +6,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm index 04ac0a8..af3789d 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm @@ -10,7 +10,7 @@ #include "base/string16.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 "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm index 64702cd..3999e7a 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm @@ -4,7 +4,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_nsobject.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" @@ -16,10 +16,10 @@ #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/view_resizer_pong.h" #include "chrome/test/base/model_test_utils.h" -#include "ui/base/cocoa/animation_utils.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" #include "testing/platform_test.h" +#include "ui/base/cocoa/animation_utils.h" namespace { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm index fa886dd..57e9faf 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm @@ -4,7 +4,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm index 473f71e5..e7e2770 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm @@ -4,7 +4,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm index 33f0816..4b065a0 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_nsobject.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h" #include "chrome/browser/ui/cocoa/browser_window_controller.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm index fc74f5e..baeccef 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/memory/scoped_nsobject.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm index f78e54c..6e0b5d3 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/memory/scoped_nsobject.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm index 782412e..c66f651 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm @@ -6,7 +6,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm index 95fe47c..fd4e764 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm @@ -6,7 +6,7 @@ #include "base/string16.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm index 9b57ca5..4a9c948 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm @@ -7,7 +7,7 @@ #import "base/memory/scoped_nsobject.h" #include "base/string16.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm index 70ed450..c781af2 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm @@ -6,7 +6,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" #import "chrome/browser/ui/cocoa/cocoa_profile_test.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm index f2eaf55..eb78e7a 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/memory/scoped_nsobject.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" diff --git a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm index b4dd723..45863ed 100644 --- a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm @@ -6,7 +6,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/message_pump_mac.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/avatar_menu_model.h" #include "chrome/browser/profiles/avatar_menu_model_observer.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm index 7ecc985..2315cfc 100644 --- a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h" #include "base/memory/scoped_nsobject.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index 9acdf72..232a119 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -12,7 +12,7 @@ #include "base/mac/mac_util.h" #import "base/memory/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" // IDC_* #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm index 4531f3c..7fc40f2 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm @@ -6,7 +6,7 @@ #import "base/mac/mac_util.h" #include "base/run_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar_service.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm index 7166621..ce77ea0 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm @@ -8,7 +8,7 @@ #import "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/signin/fake_auth_status_provider.h" #include "chrome/browser/signin/fake_signin_manager.h" diff --git a/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm index 5e64744..42bd9e0 100644 --- a/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm @@ -6,7 +6,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/confirm_bubble_cocoa.h" #import "chrome/browser/ui/cocoa/confirm_bubble_controller.h" diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm index fa699e3..d1abbb2 100644 --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm @@ -8,15 +8,15 @@ #include "base/logging.h" #include "base/stl_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/plugins/plugin_finder.h" #include "chrome/browser/plugins/plugin_metadata.h" -#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" -#include "chrome/browser/ui/content_settings/content_setting_media_menu_model.h" #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" #import "chrome/browser/ui/cocoa/l10n_util.h" +#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" +#include "chrome/browser/ui/content_settings/content_setting_media_menu_model.h" #include "content/public/browser/plugin_service.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_mac.h" diff --git a/chrome/browser/ui/cocoa/download/download_item_controller.mm b/chrome/browser/ui/cocoa/download/download_item_controller.mm index 9487cd4..c9e3d76 100644 --- a/chrome/browser/ui/cocoa/download/download_item_controller.mm +++ b/chrome/browser/ui/cocoa/download/download_item_controller.mm @@ -10,7 +10,7 @@ #include "base/string16.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 "chrome/browser/download/chrome_download_manager_delegate.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_shelf_context_menu.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm index e2cdbb4..2d096e7 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm @@ -10,7 +10,7 @@ #include "base/mac/mac_util.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 "chrome/browser/extensions/bundle_installer.h" #import "chrome/browser/ui/chrome_style.h" #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm index d2cfad8..ed72350 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm @@ -6,7 +6,7 @@ #import "base/memory/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #import "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm index db6aaa8..883ea76 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm @@ -8,7 +8,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/api/commands/command_service.h" #include "chrome/browser/extensions/bundle_installer.h" #include "chrome/browser/extensions/extension_action.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm b/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm index 0bcbb32..1e301e0 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm @@ -9,7 +9,7 @@ #include <string> #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/common/extensions/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm index f2a41a4..7217e04 100644 --- a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/media_galleries/media_galleries_dialog_controller_mock.h" #include "chrome/browser/storage_monitor/storage_info.h" #include "chrome/browser/storage_monitor/test_storage_monitor.h" diff --git a/chrome/browser/ui/cocoa/external_protocol_dialog.mm b/chrome/browser/ui/cocoa/external_protocol_dialog.mm index 094daa6..6e5d214 100644 --- a/chrome/browser/ui/cocoa/external_protocol_dialog.mm +++ b/chrome/browser/ui/cocoa/external_protocol_dialog.mm @@ -8,7 +8,7 @@ #include "base/metrics/histogram.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 "chrome/browser/external_protocol/external_protocol_handler.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/cocoa/first_run_bubble_controller.mm b/chrome/browser/ui/cocoa/first_run_bubble_controller.mm index e050dcd..6d9317c 100644 --- a/chrome/browser/ui/cocoa/first_run_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/first_run_bubble_controller.mm @@ -5,12 +5,12 @@ #import "chrome/browser/ui/cocoa/first_run_bubble_controller.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/search_engines/util.h" #include "chrome/browser/ui/chrome_pages.h" -#import "chrome/browser/ui/cocoa/l10n_util.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" +#import "chrome/browser/ui/cocoa/l10n_util.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm index cc87db3..d6986c0 100644 --- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm @@ -8,7 +8,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm index c8b5d3b..235e2b6 100644 --- a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm @@ -8,13 +8,13 @@ #include "base/memory/scoped_nsobject.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 "chrome/browser/search_engines/util.h" #import "chrome/browser/ui/browser.h" #import "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" -#import "chrome/browser/ui/cocoa/l10n_util.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" +#import "chrome/browser/ui/cocoa/l10n_util.h" #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #include "chrome/browser/ui/global_error/global_error.h" #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h" diff --git a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm index fc32b24..236f2a5 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.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 "chrome/app/chrome_command_ids.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/favicon/favicon_types.h" diff --git a/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc b/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc index 5ca0dc9..da5f1a6 100644 --- a/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc +++ b/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" const char MockConfirmInfoBarDelegate::kMessage[] = "MockConfirmInfoBarMessage"; diff --git a/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm b/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm index 91327c3..529b33d 100644 --- a/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm +++ b/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm @@ -6,7 +6,7 @@ #import "base/memory/scoped_nsobject.h" #import "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #import "chrome/app/chrome_command_ids.h" // For translate menu command ids. #include "chrome/browser/infobars/infobar_service.h" #import "chrome/browser/translate/translate_infobar_delegate.h" diff --git a/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller_unittest.mm index fe0af80..7139ed6 100644 --- a/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller_unittest.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.h" #include "base/command_line.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm index 45b1d49..508badf 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/memory/scoped_nsobject.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h" #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm index 90626a9..897ae0c 100644 --- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm @@ -8,7 +8,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" diff --git a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration_unittest.mm b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration_unittest.mm index 2affe5c..81127f2 100644 --- a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration_unittest.mm @@ -6,7 +6,7 @@ #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 95f979e8..0032d0c 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -11,7 +11,7 @@ #include "base/stl_util.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 "chrome/app/chrome_command_ids.h" #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/command_updater.h" diff --git a/chrome/browser/ui/cocoa/location_bar/search_token_decoration_unittest.mm b/chrome/browser/ui/cocoa/location_bar/search_token_decoration_unittest.mm index 287d9dd..fcc309c 100644 --- a/chrome/browser/ui/cocoa/location_bar/search_token_decoration_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/search_token_decoration_unittest.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/location_bar/search_token_decoration.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm index 7415c20..8541fc4 100644 --- a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/login_prompt_cocoa.mm b/chrome/browser/ui/cocoa/login_prompt_cocoa.mm index 74e9dd3..deeb584 100644 --- a/chrome/browser/ui/cocoa/login_prompt_cocoa.mm +++ b/chrome/browser/ui/cocoa/login_prompt_cocoa.mm @@ -10,7 +10,7 @@ #include "base/string16.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 "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/tab_contents/tab_util.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h" diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm index f7f9953..4ee0669 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm @@ -7,7 +7,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #import "base/memory/scoped_nsobject.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/desktop_notification_service_factory.h" diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm index 0c8f809..854e39a 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/memory/scoped_nsobject.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/balloon_collection.h" #include "chrome/browser/notifications/notification.h" diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm index 55b4664..de68daf 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm @@ -6,7 +6,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/platform_test.h" #include "ui/base/text/text_elider.h" diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm index 648cbbb..ae41b2a 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm @@ -9,7 +9,7 @@ #include "base/mac/foundation_util.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 "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm b/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm index 09fd3f8..e6d6d77 100644 --- a/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm +++ b/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm @@ -10,15 +10,15 @@ #include "base/callback_helpers.h" #include "base/mac/bundle_locations.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_navigator.h" -#include "chrome/browser/ui/host_desktop.h" #import "chrome/browser/ui/chrome_style.h" +#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_utils.h" #import "chrome/browser/ui/cocoa/hover_close_button.h" #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h" #import "chrome/browser/ui/cocoa/hyperlink_text_view.h" -#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_utils.h" +#include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h" #include "chrome/common/url_constants.h" #include "google_apis/gaia/gaia_auth_util.h" diff --git a/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller_browsertest.mm b/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller_browsertest.mm index 29db9ce..939875d 100644 --- a/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller_browsertest.mm +++ b/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller_browsertest.mm @@ -8,7 +8,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm index 0330879..9582e0f 100644 --- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm +++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm @@ -10,7 +10,7 @@ #include "base/mac/foundation_util.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 "chrome/browser/ssl/ssl_client_auth_observer.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.mm b/chrome/browser/ui/cocoa/status_bubble_mac.mm index b2ff8ac..4e93e8c 100644 --- a/chrome/browser/ui/cocoa/status_bubble_mac.mm +++ b/chrome/browser/ui/cocoa/status_bubble_mac.mm @@ -12,7 +12,7 @@ #include "base/message_loop.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" #import "chrome/browser/ui/cocoa/bubble_view.h" #include "net/base/net_util.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" diff --git a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm index e2b4b30..b25225f 100644 --- a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm @@ -7,7 +7,7 @@ #include "base/memory/scoped_nsobject.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" #import "chrome/browser/ui/cocoa/bubble_view.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/status_bubble_mac.h" diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm b/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm index d846f8a..c48187d 100644 --- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm @@ -4,7 +4,7 @@ #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" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/status_icons/status_icon_mac.h" #include "grit/chrome_unscaled_resources.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm index 1094259..f039c3b 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #import "base/memory/scoped_nsobject.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/tabs/tab_controller.h" #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h" diff --git a/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm b/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm index 7891272..6a548e4 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm @@ -6,10 +6,10 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_nsobject.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/task_manager/resource_provider.h" -#import "chrome/browser/ui/cocoa/task_manager_mac.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" +#import "chrome/browser/ui/cocoa/task_manager_mac.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index 7ffcf8f..4ef8db2 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -12,7 +12,7 @@ #include "base/prefs/pref_service.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 "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" diff --git a/chrome/browser/ui/cocoa/validation_message_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/validation_message_bubble_controller_unittest.mm index b05662a..207188b 100644 --- a/chrome/browser/ui/cocoa/validation_message_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/validation_message_bubble_controller_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/memory/scoped_nsobject.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/validation_message_bubble_controller.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm index 094667b..3cf0dc9 100644 --- a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm +++ b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm @@ -5,7 +5,7 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/ui/cocoa/web_dialog_window_controller_unittest.mm b/chrome/browser/ui/cocoa/web_dialog_window_controller_unittest.mm index c7fd5eb..0f8ebef 100644 --- a/chrome/browser/ui/cocoa/web_dialog_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/web_dialog_window_controller_unittest.mm @@ -11,7 +11,7 @@ #import "base/mac/scoped_nsautorelease_pool.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/test/base/browser_with_test_window_test.h" diff --git a/chrome/browser/ui/cocoa/website_settings_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/website_settings_bubble_controller_unittest.mm index 3534ae1..1ecdfc6 100644 --- a/chrome/browser/ui/cocoa/website_settings_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/website_settings_bubble_controller_unittest.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/website_settings_bubble_controller.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest_mac.h" diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm index 6c16807..0d08c3c 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm @@ -4,7 +4,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/search/search.h" #include "chrome/browser/sync/glue/session_model_associator.h" diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc index e69de75..809f1a34 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc index d3a3345..f04cee0 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc @@ -4,7 +4,7 @@ #include "base/auto_reset.h" #include "base/command_line.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc index 97256a3..6843f84 100644 --- a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc @@ -2,15 +2,15 @@ // 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 "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/content_settings/content_setting_image_model.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/test/base/testing_profile.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" +#include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/ui/content_settings/content_setting_media_menu_model.cc b/chrome/browser/ui/content_settings/content_setting_media_menu_model.cc index 397c9cf..cdd4886 100644 --- a/chrome/browser/ui/content_settings/content_setting_media_menu_model.cc +++ b/chrome/browser/ui/content_settings/content_setting_media_menu_model.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/content_settings/content_setting_media_menu_model.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/media/media_capture_devices_dispatcher.h" #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" diff --git a/chrome/browser/ui/crypto_module_password_dialog.cc b/chrome/browser/ui/crypto_module_password_dialog.cc index fcd6f4b..c98d1d8 100644 --- a/chrome/browser/ui/crypto_module_password_dialog.cc +++ b/chrome/browser/ui/crypto_module_password_dialog.cc @@ -6,10 +6,10 @@ #include "base/basictypes.h" #include "base/bind.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/utf_string_conversions.h" -#include "crypto/crypto_module_blocking_password_delegate.h" #include "content/public/browser/browser_thread.h" +#include "crypto/crypto_module_blocking_password_delegate.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/extensions/extension_install_ui_default.cc b/chrome/browser/ui/extensions/extension_install_ui_default.cc index 81986cb..92389c3 100644 --- a/chrome/browser/ui/extensions/extension_install_ui_default.cc +++ b/chrome/browser/ui/extensions/extension_install_ui_default.cc @@ -7,7 +7,7 @@ #include "apps/app_launcher.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/theme_installed_infobar_delegate.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" diff --git a/chrome/browser/ui/extensions/shell_window.cc b/chrome/browser/ui/extensions/shell_window.cc index 87b9690..6e30846 100644 --- a/chrome/browser/ui/extensions/shell_window.cc +++ b/chrome/browser/ui/extensions/shell_window.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/extensions/shell_window.h" #include "apps/shell_window_geometry_cache.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/app_window_contents.h" #include "chrome/browser/extensions/extension_process_manager.h" diff --git a/chrome/browser/ui/external_protocol_dialog_delegate.cc b/chrome/browser/ui/external_protocol_dialog_delegate.cc index 5fa4e38..aa36808 100644 --- a/chrome/browser/ui/external_protocol_dialog_delegate.cc +++ b/chrome/browser/ui/external_protocol_dialog_delegate.cc @@ -6,9 +6,9 @@ #include <string> +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/external_protocol/external_protocol_handler.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/find_bar/find_backend_unittest.cc b/chrome/browser/ui/find_bar/find_backend_unittest.cc index 8244933..0b2d73e 100644 --- a/chrome/browser/ui/find_bar/find_backend_unittest.cc +++ b/chrome/browser/ui/find_bar/find_backend_unittest.cc @@ -4,7 +4,7 @@ #include "base/string16.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/find_bar/find_bar_state.h" #include "chrome/browser/ui/find_bar/find_bar_state_factory.h" #include "chrome/browser/ui/find_bar/find_tab_helper.h" diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index f77fe6a..599b1e2 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -6,7 +6,7 @@ #include "base/message_loop.h" #include "base/string16.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc index 30a8c20..84f7081 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/compiler_specific.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_tabstrip.h" diff --git a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc index 8ab302d..a83bdef 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc index c1a2a6e..6c06423 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" diff --git a/chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.cc b/chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.cc index ad18bef..9668609 100644 --- a/chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.cc +++ b/chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.cc @@ -8,7 +8,7 @@ #include "base/i18n/rtl.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/autofill/autofill_popup_controller.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/ui_resources.h" diff --git a/chrome/browser/ui/gtk/avatar_menu_bubble_gtk.cc b/chrome/browser/ui/gtk/avatar_menu_bubble_gtk.cc index d9e4120..96e0e4e 100644 --- a/chrome/browser/ui/gtk/avatar_menu_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/avatar_menu_bubble_gtk.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/gtk/avatar_menu_bubble_gtk.h" #include "base/i18n/rtl.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/avatar_menu_model.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc b/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc index c05bb6f..6571988 100644 --- a/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc +++ b/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" #include "chrome/browser/ui/gtk/gtk_util.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc index b8aa6e7..cc2443d 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc @@ -11,7 +11,7 @@ #include "base/metrics/histogram.h" #include "base/pickle.h" #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc index a91d142..debbce87 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc @@ -6,7 +6,7 @@ #include "base/compiler_specific.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc index 78c6eb2..2764311 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc index 6f3af45..66a76ab 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/prefs/pref_service.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_expanded_state_tracker.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc index cb8fe19..2b1f293 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc index 0aa1609..67b938a 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc @@ -7,7 +7,7 @@ #include <gtk/gtk.h> #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc index ebfcae1..350088a 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc @@ -6,7 +6,7 @@ #include "base/stl_util.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc index 8e796dd..bc05629 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc @@ -7,7 +7,7 @@ #include <gtk/gtk.h> #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc index a4d0a2b..fded95d 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc @@ -7,7 +7,7 @@ #include "base/pickle.h" #include "base/string16.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk_unittest.cc index 568fe67..81b30f1 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include <string> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc index 2e97e0e..5ebfaf7 100644 --- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/api/commands/command_service.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_icon_factory.h" diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc index 899dead..0cd9a4c 100644 --- a/chrome/browser/ui/gtk/browser_titlebar.cc +++ b/chrome/browser/ui/gtk/browser_titlebar.cc @@ -16,7 +16,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/string_piece.h" #include "base/strings/string_tokenizer.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/managed_mode/managed_user_service.h" diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 9c95a2e..ce8827d 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -23,8 +23,8 @@ #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_item_model.h" diff --git a/chrome/browser/ui/gtk/certificate_viewer_gtk.cc b/chrome/browser/ui/gtk/certificate_viewer_gtk.cc index 8f56047..b76b660 100644 --- a/chrome/browser/ui/gtk/certificate_viewer_gtk.cc +++ b/chrome/browser/ui/gtk/certificate_viewer_gtk.cc @@ -11,8 +11,8 @@ #include "base/i18n/time_formatting.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/ui/certificate_dialogs.h" #include "chrome/browser/ui/gtk/gtk_util.h" diff --git a/chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.cc b/chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.cc index 4cb4ef8..3e7d968 100644 --- a/chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.cc @@ -14,7 +14,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chrome_to_mobile_service_factory.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/gtk/confirm_bubble_gtk.cc b/chrome/browser/ui/gtk/confirm_bubble_gtk.cc index c00463d..17df9ba 100644 --- a/chrome/browser/ui/gtk/confirm_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/confirm_bubble_gtk.cc @@ -7,7 +7,7 @@ #include <gtk/gtk.h> #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/confirm_bubble.h" #include "chrome/browser/ui/confirm_bubble_model.h" diff --git a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc b/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc index 7212fed..74d97810 100644 --- a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/i18n/rtl.h" #include "base/stl_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/plugins/plugin_finder.h" #include "chrome/browser/plugins/plugin_metadata.h" diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc index 9ff501a..d8fdd0f 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/environment.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/shell_integration_linux.h" diff --git a/chrome/browser/ui/gtk/crypto_module_password_dialog_gtk.cc b/chrome/browser/ui/gtk/crypto_module_password_dialog_gtk.cc index becece9..e6afbd1 100644 --- a/chrome/browser/ui/gtk/crypto_module_password_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/crypto_module_password_dialog_gtk.cc @@ -7,7 +7,7 @@ #include <gtk/gtk.h> #include "base/basictypes.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "crypto/crypto_module_blocking_password_delegate.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ui/gtk/custom_drag.cc b/chrome/browser/ui/gtk/custom_drag.cc index f813ba2..f590c34 100644 --- a/chrome/browser/ui/gtk/custom_drag.cc +++ b/chrome/browser/ui/gtk/custom_drag.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/gtk/custom_drag.h" #include "base/files/file_path.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" #include "content/public/browser/download_item.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ui/gtk/download/download_item_gtk.cc b/chrome/browser/ui/gtk/download/download_item_gtk.cc index ab51e23..960a5a7 100644 --- a/chrome/browser/ui/gtk/download/download_item_gtk.cc +++ b/chrome/browser/ui/gtk/download/download_item_gtk.cc @@ -9,8 +9,8 @@ #include "base/debug/trace_event.h" #include "base/metrics/histogram.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/chrome_download_manager_delegate.h" #include "chrome/browser/download/download_item_model.h" diff --git a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc index 2fe2d37..fdbd29e 100644 --- a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc @@ -9,7 +9,7 @@ #include "base/i18n/case_conversion.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" diff --git a/chrome/browser/ui/gtk/extensions/bundle_installed_bubble_gtk.cc b/chrome/browser/ui/gtk/extensions/bundle_installed_bubble_gtk.cc index cf1406e..c9fab01 100644 --- a/chrome/browser/ui/gtk/extensions/bundle_installed_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/bundle_installed_bubble_gtk.cc @@ -10,7 +10,7 @@ #include "base/bind_helpers.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h" #include "chrome/browser/ui/gtk/browser_window_gtk.h" diff --git a/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc index d8d544a..a1d00ef 100644 --- a/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc @@ -6,7 +6,7 @@ #include "base/i18n/rtl.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/bundle_installer.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc index b65c486..927f167 100644 --- a/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc @@ -10,7 +10,7 @@ #include "base/bind_helpers.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/api/commands/command_service.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" diff --git a/chrome/browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc index 7a0bf1f..156bb40 100644 --- a/chrome/browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc @@ -10,7 +10,7 @@ #include <gtk/gtk.h> #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/gtk/browser_window_gtk.h" diff --git a/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk.cc b/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk.cc index 9049a87..b5fd2d8 100644 --- a/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk.h" #include "base/auto_reset.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" diff --git a/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk_unittest.cc b/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk_unittest.cc index c411601..5490cecd 100644 --- a/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/media_galleries/media_galleries_dialog_controller_mock.h" #include "chrome/browser/storage_monitor/storage_info.h" #include "chrome/browser/storage_monitor/test_storage_monitor.h" diff --git a/chrome/browser/ui/gtk/extensions/native_app_window_gtk.cc b/chrome/browser/ui/gtk/extensions/native_app_window_gtk.cc index 60c13a4..b715652 100644 --- a/chrome/browser/ui/gtk/extensions/native_app_window_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/native_app_window_gtk.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/gtk/extensions/native_app_window_gtk.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h" #include "chrome/browser/ui/gtk/gtk_util.h" diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc index 2047ac2..455ca59 100644 --- a/chrome/browser/ui/gtk/find_bar_gtk.cc +++ b/chrome/browser/ui/gtk/find_bar_gtk.cc @@ -14,7 +14,7 @@ #include "base/i18n/rtl.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/gtk/first_run_bubble.cc b/chrome/browser/ui/gtk/first_run_bubble.cc index 70bf245..06fa46dd 100644 --- a/chrome/browser/ui/gtk/first_run_bubble.cc +++ b/chrome/browser/ui/gtk/first_run_bubble.cc @@ -7,7 +7,7 @@ #include <gtk/gtk.h> #include "base/i18n/rtl.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/search_engines/util.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/gtk/first_run_dialog.cc b/chrome/browser/ui/gtk/first_run_dialog.cc index 85e1b76..a5b7a02 100644 --- a/chrome/browser/ui/gtk/first_run_dialog.cc +++ b/chrome/browser/ui/gtk/first_run_dialog.cc @@ -9,7 +9,7 @@ #include "base/i18n/rtl.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/first_run/first_run_dialog.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/process_singleton.h" diff --git a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc index 120750e..a56a35d 100644 --- a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" diff --git a/chrome/browser/ui/gtk/global_error_bubble.cc b/chrome/browser/ui/gtk/global_error_bubble.cc index d5203a7..562e9b3 100644 --- a/chrome/browser/ui/gtk/global_error_bubble.cc +++ b/chrome/browser/ui/gtk/global_error_bubble.cc @@ -7,7 +7,7 @@ #include <gtk/gtk.h> #include "base/i18n/rtl.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/global_error/global_error.h" #include "chrome/browser/ui/global_error/global_error_service.h" diff --git a/chrome/browser/ui/gtk/global_history_menu.cc b/chrome/browser/ui/gtk/global_history_menu.cc index 3bd840b..b944665 100644 --- a/chrome/browser/ui/gtk/global_history_menu.cc +++ b/chrome/browser/ui/gtk/global_history_menu.cc @@ -11,7 +11,7 @@ #include "base/memory/weak_ptr.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 "chrome/browser/history/top_sites.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/tab_restore_service.h" diff --git a/chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc b/chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc index cd9bb0b..dfd582d 100644 --- a/chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc +++ b/chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/gtk/gtk_chrome_cookie_view.h" #include "base/i18n/time_formatting.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/public/browser/indexed_db_context.h" #include "grit/generated_resources.h" #include "net/cookies/canonical_cookie.h" diff --git a/chrome/browser/ui/gtk/gtk_tree.cc b/chrome/browser/ui/gtk/gtk_tree.cc index 292a637..d2698bf 100644 --- a/chrome/browser/ui/gtk/gtk_tree.cc +++ b/chrome/browser/ui/gtk/gtk_tree.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/gtk/gtk_tree.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/models/table_model.h" diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc index cf7272b..0e5a902 100644 --- a/chrome/browser/ui/gtk/gtk_util.cc +++ b/chrome/browser/ui/gtk/gtk_util.cc @@ -15,7 +15,7 @@ #include "base/logging.h" #include "base/nix/xdg_util.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/autocomplete/autocomplete_match.h" diff --git a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc index 36be922..bf703d6 100644 --- a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc @@ -7,7 +7,7 @@ #include <gtk/gtk.h> #include "base/process_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/tab_contents/core_tab_helper.h" diff --git a/chrome/browser/ui/gtk/infobars/after_translate_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/after_translate_infobar_gtk.cc index db73edb9..29753a5 100644 --- a/chrome/browser/ui/gtk/infobars/after_translate_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/infobars/after_translate_infobar_gtk.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/gtk/infobars/before_translate_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/before_translate_infobar_gtk.cc index cd2bef3..fadc923 100644 --- a/chrome/browser/ui/gtk/infobars/before_translate_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/infobars/before_translate_infobar_gtk.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/gtk/infobars/before_translate_infobar_gtk.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/gtk/infobars/confirm_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/confirm_infobar_gtk.cc index 964b459..dfab270 100644 --- a/chrome/browser/ui/gtk/infobars/confirm_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/infobars/confirm_infobar_gtk.cc @@ -6,7 +6,7 @@ #include <gtk/gtk.h> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/gtk/event_utils.h" #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" #include "chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.h" diff --git a/chrome/browser/ui/gtk/infobars/infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/infobar_gtk.cc index a8b77bc..80e83d0 100644 --- a/chrome/browser/ui/gtk/infobars/infobar_gtk.cc +++ b/chrome/browser/ui/gtk/infobars/infobar_gtk.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/gtk/infobars/infobar_gtk.h" #include "base/debug/trace_event.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_properties.h" diff --git a/chrome/browser/ui/gtk/infobars/translate_infobar_base_gtk.cc b/chrome/browser/ui/gtk/infobars/translate_infobar_base_gtk.cc index dd89b7e..519b119 100644 --- a/chrome/browser/ui/gtk/infobars/translate_infobar_base_gtk.cc +++ b/chrome/browser/ui/gtk/infobars/translate_infobar_base_gtk.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/gtk/infobars/translate_infobar_base_gtk.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/translate/options_menu_model.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/ui/gtk/gtk_util.h" diff --git a/chrome/browser/ui/gtk/infobars/translate_message_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/translate_message_infobar_gtk.cc index dde9919..541fe15 100644 --- a/chrome/browser/ui/gtk/infobars/translate_message_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/infobars/translate_message_infobar_gtk.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/gtk/infobars/translate_message_infobar_gtk.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "ui/base/gtk/gtk_hig_constants.h" diff --git a/chrome/browser/ui/gtk/javascript_app_modal_dialog_gtk.cc b/chrome/browser/ui/gtk/javascript_app_modal_dialog_gtk.cc index 2b78234..dfdb928 100644 --- a/chrome/browser/ui/gtk/javascript_app_modal_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/javascript_app_modal_dialog_gtk.cc @@ -7,7 +7,7 @@ #include <gtk/gtk.h> #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc index b601390..a2de6b2 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc @@ -18,7 +18,7 @@ #include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/accessibility/accessibility_events.h" #include "chrome/browser/command_updater.h" diff --git a/chrome/browser/ui/gtk/login_prompt_gtk.cc b/chrome/browser/ui/gtk/login_prompt_gtk.cc index a9de90c..5a5deeb 100644 --- a/chrome/browser/ui/gtk/login_prompt_gtk.cc +++ b/chrome/browser/ui/gtk/login_prompt_gtk.cc @@ -7,7 +7,7 @@ #include <gtk/gtk.h> #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/gtk/constrained_window_gtk.h" diff --git a/chrome/browser/ui/gtk/menu_gtk.cc b/chrome/browser/ui/gtk/menu_gtk.cc index b7a8b25..791fceb 100644 --- a/chrome/browser/ui/gtk/menu_gtk.cc +++ b/chrome/browser/ui/gtk/menu_gtk.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/stl_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/gtk/event_utils.h" #include "chrome/browser/ui/gtk/gtk_custom_menu.h" diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc index cf1c4ce..1647273 100644 --- a/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc +++ b/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc @@ -13,7 +13,7 @@ #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/stl_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/autocomplete_result.h" #include "chrome/browser/defaults.h" diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk_unittest.cc b/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk_unittest.cc index 26a963f..729ad949 100644 --- a/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk_unittest.cc @@ -6,7 +6,7 @@ #include <gtk/gtk.h> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "testing/platform_test.h" #include "ui/base/gtk/gtk_hig_constants.h" diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc index 67006a9..6bffc73 100644 --- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc +++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/strings/utf_string_conversion_utils.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/autocomplete/autocomplete_match.h" diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk_unittest.cc b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk_unittest.cc index d33ed9f..a77871a 100644 --- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk_unittest.cc @@ -6,7 +6,7 @@ #include <gtk/gtk.h> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" diff --git a/chrome/browser/ui/gtk/one_click_signin_bubble_gtk.cc b/chrome/browser/ui/gtk/one_click_signin_bubble_gtk.cc index f3e6938..9f4571a 100644 --- a/chrome/browser/ui/gtk/one_click_signin_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/one_click_signin_bubble_gtk.cc @@ -10,7 +10,7 @@ #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h" diff --git a/chrome/browser/ui/gtk/panels/panel_gtk.cc b/chrome/browser/ui/gtk/panels/panel_gtk.cc index 6e8ded6..4361cf9 100644 --- a/chrome/browser/ui/gtk/panels/panel_gtk.cc +++ b/chrome/browser/ui/gtk/panels/panel_gtk.cc @@ -12,14 +12,14 @@ #include "base/debug/trace_event.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" #include "chrome/browser/ui/gtk/custom_button.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/gtk_window_util.h" -#include "chrome/browser/ui/gtk/panels/panel_titlebar_gtk.h" #include "chrome/browser/ui/gtk/panels/panel_drag_gtk.h" +#include "chrome/browser/ui/gtk/panels/panel_titlebar_gtk.h" #include "chrome/browser/ui/panels/panel.h" #include "chrome/browser/ui/panels/panel_constants.h" #include "chrome/browser/ui/panels/panel_manager.h" diff --git a/chrome/browser/ui/gtk/panels/panel_stack_window_gtk.cc b/chrome/browser/ui/gtk/panels/panel_stack_window_gtk.cc index cccadf4..395a9af 100644 --- a/chrome/browser/ui/gtk/panels/panel_stack_window_gtk.cc +++ b/chrome/browser/ui/gtk/panels/panel_stack_window_gtk.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/gtk/panels/panel_stack_window_gtk.h" #include <gdk/gdkkeysyms.h> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/panels/panel.h" #include "chrome/browser/ui/panels/stacked_panel_collection.h" #include "ui/base/x/active_window_watcher_x.h" diff --git a/chrome/browser/ui/gtk/panels/panel_titlebar_gtk.cc b/chrome/browser/ui/gtk/panels/panel_titlebar_gtk.cc index f143e7b..96a32a3 100644 --- a/chrome/browser/ui/gtk/panels/panel_titlebar_gtk.cc +++ b/chrome/browser/ui/gtk/panels/panel_titlebar_gtk.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/gtk/panels/panel_titlebar_gtk.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/ui/gtk/custom_button.h" #include "chrome/browser/ui/gtk/gtk_util.h" diff --git a/chrome/browser/ui/gtk/password_generation_bubble_gtk.cc b/chrome/browser/ui/gtk/password_generation_bubble_gtk.cc index 87fb8d4..63b9834 100644 --- a/chrome/browser/ui/gtk/password_generation_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/password_generation_bubble_gtk.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/gtk/password_generation_bubble_gtk.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/gtk/protocol_dialog_gtk.cc b/chrome/browser/ui/gtk/protocol_dialog_gtk.cc index 468e16d..1b34389 100644 --- a/chrome/browser/ui/gtk/protocol_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/protocol_dialog_gtk.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "base/metrics/histogram.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/external_protocol/external_protocol_handler.h" #include "chrome/browser/ui/external_protocol_dialog_delegate.h" #include "chrome/browser/ui/gtk/gtk_util.h" diff --git a/chrome/browser/ui/gtk/sad_tab_gtk.cc b/chrome/browser/ui/gtk/sad_tab_gtk.cc index 62732b9..06ce444 100644 --- a/chrome/browser/ui/gtk/sad_tab_gtk.cc +++ b/chrome/browser/ui/gtk/sad_tab_gtk.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/gtk/sad_tab_gtk.h" #include "base/metrics/histogram.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" #include "chrome/browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/gtk/screen_capture_notification_ui_gtk.cc b/chrome/browser/ui/gtk/screen_capture_notification_ui_gtk.cc index 680d9e3..11c2237 100644 --- a/chrome/browser/ui/gtk/screen_capture_notification_ui_gtk.cc +++ b/chrome/browser/ui/gtk/screen_capture_notification_ui_gtk.cc @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "grit/generated_resources.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/simple_message_box_gtk.cc b/chrome/browser/ui/gtk/simple_message_box_gtk.cc index 1c1b82d..8926c87 100644 --- a/chrome/browser/ui/gtk/simple_message_box_gtk.cc +++ b/chrome/browser/ui/gtk/simple_message_box_gtk.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/simple_message_box.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/gtk/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc b/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc index 903b555..e48a7041 100644 --- a/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc @@ -4,7 +4,7 @@ #include "chrome/browser/speech/speech_recognition_bubble.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" diff --git a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc index 884d8e8..418d567 100644 --- a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/i18n/time_formatting.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/ssl/ssl_client_auth_observer.h" #include "chrome/browser/ui/crypto_module_password_dialog.h" diff --git a/chrome/browser/ui/gtk/status_bubble_gtk.cc b/chrome/browser/ui/gtk/status_bubble_gtk.cc index 782b587..ba04015 100644 --- a/chrome/browser/ui/gtk/status_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/status_bubble_gtk.cc @@ -10,7 +10,7 @@ #include "base/i18n/rtl.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" #include "chrome/browser/ui/gtk/gtk_util.h" diff --git a/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc b/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc index cd57b1f..77958dc 100644 --- a/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc +++ b/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/gtk/status_icons/status_icon_gtk.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/gtk/menu_gtk.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/gtk_util.h" diff --git a/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc b/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc index 3f6277f..7431da7 100644 --- a/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/gtk/status_icons/status_tray_gtk.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/status_icons/status_icon_observer.h" #include "chrome/browser/ui/gtk/status_icons/status_icon_gtk.h" #include "grit/chrome_unscaled_resources.h" diff --git a/chrome/browser/ui/gtk/tab_contents/render_view_context_menu_gtk.cc b/chrome/browser/ui/gtk/tab_contents/render_view_context_menu_gtk.cc index 2c43f2b..cf40227 100644 --- a/chrome/browser/ui/gtk/tab_contents/render_view_context_menu_gtk.cc +++ b/chrome/browser/ui/gtk/tab_contents/render_view_context_menu_gtk.cc @@ -7,7 +7,7 @@ #include <gtk/gtk.h> #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "content/public/browser/render_widget_host_view.h" diff --git a/chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc b/chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc index 134df68..ff4b261 100644 --- a/chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" diff --git a/chrome/browser/ui/gtk/tabs/tab_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_gtk.cc index 94eae7c..d4a6e94 100644 --- a/chrome/browser/ui/gtk/tabs/tab_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_gtk.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/debug/trace_event.h" #include "base/memory/singleton.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/gtk/accelerators_gtk.h" #include "chrome/browser/ui/gtk/gtk_input_event_box.h" diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc index 3405d5f..02ef069 100644 --- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc @@ -8,7 +8,7 @@ #include <utility> #include "base/debug/trace_event.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/favicon/favicon_tab_helper.h" diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc index 4e6c352..23af8e6 100644 --- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc @@ -14,7 +14,7 @@ #include "base/i18n/rtl.h" #include "base/metrics/histogram.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/autocomplete/autocomplete_match.h" diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc index fb92023..c765e3e 100644 --- a/chrome/browser/ui/gtk/task_manager_gtk.cc +++ b/chrome/browser/ui/gtk/task_manager_gtk.cc @@ -15,7 +15,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/defaults.h" #include "chrome/browser/memory_purger.h" diff --git a/chrome/browser/ui/gtk/validation_message_bubble_gtk.cc b/chrome/browser/ui/gtk/validation_message_bubble_gtk.cc index 582c66e..edebf2c 100644 --- a/chrome/browser/ui/gtk/validation_message_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/validation_message_bubble_gtk.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/validation_message_bubble.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" diff --git a/chrome/browser/ui/gtk/web_dialog_gtk.cc b/chrome/browser/ui/gtk/web_dialog_gtk.cc index 663a6e3..153a787 100644 --- a/chrome/browser/ui/gtk/web_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/web_dialog_gtk.cc @@ -6,7 +6,7 @@ #include <gtk/gtk.h> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/webui/chrome_web_contents_handler.h" diff --git a/chrome/browser/ui/gtk/website_settings/permission_selector.cc b/chrome/browser/ui/gtk/website_settings/permission_selector.cc index 891a7e3..89e23ad 100644 --- a/chrome/browser/ui/gtk/website_settings/permission_selector.cc +++ b/chrome/browser/ui/gtk/website_settings/permission_selector.cc @@ -6,7 +6,7 @@ #include "base/compiler_specific.h" #include "base/i18n/rtl.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/menu_gtk.h" diff --git a/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc b/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc index 10e6e5a..ea0bf0f 100644 --- a/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc +++ b/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc @@ -6,7 +6,7 @@ #include "base/i18n/rtl.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/gtk/zoom_bubble_gtk.cc b/chrome/browser/ui/gtk/zoom_bubble_gtk.cc index 625ef25..5086e13 100644 --- a/chrome/browser/ui/gtk/zoom_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/zoom_bubble_gtk.cc @@ -6,7 +6,7 @@ #include "base/i18n/rtl.h" #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc index bf31df3..9e5d523 100644 --- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc +++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc @@ -17,9 +17,9 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/ui/libgtk2ui/gtk2_signal.h" #include "chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h" #include "grit/ui_strings.h" diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc index 78b91717..0add310 100644 --- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc +++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc @@ -13,8 +13,8 @@ #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/utf_string_conversions.h" #include "chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc index 08fc2df..81be483 100644 --- a/chrome/browser/ui/login/login_prompt.cc +++ b/chrome/browser/ui/login/login_prompt.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/ui/login/login_prompt_browsertest.cc b/chrome/browser/ui/login/login_prompt_browsertest.cc index 6291815..eca933d 100644 --- a/chrome/browser/ui/login/login_prompt_browsertest.cc +++ b/chrome/browser/ui/login/login_prompt_browsertest.cc @@ -6,7 +6,7 @@ #include <list> #include <map> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/ui/metro_pin_tab_helper_win.cc b/chrome/browser/ui/metro_pin_tab_helper_win.cc index a06b792..a05c564 100644 --- a/chrome/browser/ui/metro_pin_tab_helper_win.cc +++ b/chrome/browser/ui/metro_pin_tab_helper_win.cc @@ -16,7 +16,7 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/metro.h" #include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/favicon/favicon_util.h" diff --git a/chrome/browser/ui/omnibox/action_box_browsertest.cc b/chrome/browser/ui/omnibox/action_box_browsertest.cc index a9a2009..e3abdc7 100644 --- a/chrome/browser/ui/omnibox/action_box_browsertest.cc +++ b/chrome/browser/ui/omnibox/action_box_browsertest.cc @@ -5,7 +5,7 @@ #include "base/command_line.h" #include "base/message_loop.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc index 5b96ed7..fe7e38a 100644 --- a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc +++ b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/infobars/infobar_service.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc b/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc index d2c347c..4ef46f3 100644 --- a/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc +++ b/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" #include "chrome/browser/predictors/autocomplete_action_predictor.h" diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc index dcf844a..b81db30 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc @@ -12,7 +12,7 @@ #include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" diff --git a/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc b/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc index 663a389..a090bf4 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_unittest.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 "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" diff --git a/chrome/browser/ui/omnibox/omnibox_popup_model.cc b/chrome/browser/ui/omnibox/omnibox_popup_model.cc index 48439a3..fab536a 100644 --- a/chrome/browser/ui/omnibox/omnibox_popup_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_popup_model.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/omnibox/omnibox_view.cc b/chrome/browser/ui/omnibox/omnibox_view.cc index 67c8cc6..0ab1976 100644 --- a/chrome/browser/ui/omnibox/omnibox_view.cc +++ b/chrome/browser/ui/omnibox/omnibox_view.cc @@ -7,9 +7,9 @@ #include "chrome/browser/ui/omnibox/omnibox_view.h" -#include "base/string_util.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "ui/base/clipboard/clipboard.h" diff --git a/chrome/browser/ui/omnibox/omnibox_view.h b/chrome/browser/ui/omnibox/omnibox_view.h index b05334c..d4f7752 100644 --- a/chrome/browser/ui/omnibox/omnibox_view.h +++ b/chrome/browser/ui/omnibox/omnibox_view.h @@ -15,7 +15,7 @@ #include "base/string16.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index 2001269..ad1e9a8 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -7,8 +7,8 @@ #include "base/message_loop.h" #include "base/string16.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/autocomplete/autocomplete_match.h" diff --git a/chrome/browser/ui/omnibox/omnibox_view_unittest.cc b/chrome/browser/ui/omnibox/omnibox_view_unittest.cc index 0eb60bb..199de3e 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_unittest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_unittest.cc @@ -6,7 +6,7 @@ #include "base/message_loop.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/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "ui/base/clipboard/clipboard.h" diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc index 5ffc6a9..752242d 100644 --- a/chrome/browser/ui/panels/panel.cc +++ b/chrome/browser/ui/panels/panel.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc index 5551fb2..7148c24 100644 --- a/chrome/browser/ui/panels/panel_browsertest.cc +++ b/chrome/browser/ui/panels/panel_browsertest.cc @@ -4,7 +4,7 @@ #include "base/bind.h" #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/extensions/extension_apitest.h" diff --git a/chrome/browser/ui/panels/panel_extension_browsertest.cc b/chrome/browser/ui/panels/panel_extension_browsertest.cc index c3dbabc..6b6d5d0 100644 --- a/chrome/browser/ui/panels/panel_extension_browsertest.cc +++ b/chrome/browser/ui/panels/panel_extension_browsertest.cc @@ -4,7 +4,7 @@ #include "base/command_line.h" #include "base/path_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_test_message_listener.h" diff --git a/chrome/browser/ui/panels/stacked_panel_collection.cc b/chrome/browser/ui/panels/stacked_panel_collection.cc index 6286e37..40e938d 100644 --- a/chrome/browser/ui/panels/stacked_panel_collection.cc +++ b/chrome/browser/ui/panels/stacked_panel_collection.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/auto_reset.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/panels/detached_panel_collection.h" #include "chrome/browser/ui/panels/display_settings_provider.h" #include "chrome/browser/ui/panels/native_panel_stack_window.h" diff --git a/chrome/browser/ui/pdf/pdf_browsertest.cc b/chrome/browser/ui/pdf/pdf_browsertest.cc index 91195d4..68e3f59 100644 --- a/chrome/browser/ui/pdf/pdf_browsertest.cc +++ b/chrome/browser/ui/pdf/pdf_browsertest.cc @@ -8,7 +8,7 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc index 7b3b8e9..07a1f50 100644 --- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc +++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "base/version.h" #include "chrome/browser/lifetime/application_lifetime.h" diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc index fe6aeba0..9d5bf78 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc @@ -10,7 +10,7 @@ #include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_preferences_util.h" diff --git a/chrome/browser/ui/screen_capture_notification_ui_win.cc b/chrome/browser/ui/screen_capture_notification_ui_win.cc index f339cd0..33769f3 100644 --- a/chrome/browser/ui/screen_capture_notification_ui_win.cc +++ b/chrome/browser/ui/screen_capture_notification_ui_win.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/process_util.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/scoped_gdi_object.h" #include "base/win/scoped_hdc.h" #include "base/win/scoped_select_object.h" diff --git a/chrome/browser/ui/search/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc index fe8aae9..d92e0f1 100644 --- a/chrome/browser/ui/search/instant_controller.cc +++ b/chrome/browser/ui/search/instant_controller.cc @@ -9,7 +9,7 @@ #include "base/metrics/histogram.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_provider.h" #include "chrome/browser/autocomplete/autocomplete_result.h" #include "chrome/browser/autocomplete/search_provider.h" diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc index 1a7ced1..4dd685d 100644 --- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc +++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc @@ -13,8 +13,8 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_controller.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/autocomplete_provider.h" diff --git a/chrome/browser/ui/search/instant_page.cc b/chrome/browser/ui/search/instant_page.cc index e7b587f..1c0b6a2 100644 --- a/chrome/browser/ui/search/instant_page.cc +++ b/chrome/browser/ui/search/instant_page.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/search/instant_page.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" #include "content/public/browser/navigation_controller.h" diff --git a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc index 160f22e..19d8d37 100644 --- a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc +++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.cc b/chrome/browser/ui/search_engines/keyword_editor_controller.cc index a44ab2d..23932d7 100644 --- a/chrome/browser/ui/search_engines/keyword_editor_controller.cc +++ b/chrome/browser/ui/search_engines/keyword_editor_controller.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" #include "base/prefs/pref_registry_simple.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc index f1b1743..7404c92 100644 --- a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc +++ b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc @@ -4,7 +4,7 @@ #include "base/message_loop.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc index a0319bd..44dab8d 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc @@ -8,7 +8,7 @@ #include "base/bind_helpers.h" #include "base/i18n/rtl.h" #include "base/stl_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/favicon/favicon_types.h" diff --git a/chrome/browser/ui/startup/autolaunch_prompt_win.cc b/chrome/browser/ui/startup/autolaunch_prompt_win.cc index d969642..5974ac1 100644 --- a/chrome/browser/ui/startup/autolaunch_prompt_win.cc +++ b/chrome/browser/ui/startup/autolaunch_prompt_win.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/message_loop.h" #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/auto_launch_trial.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc index 9ea4ae9..527e3aa 100644 --- a/chrome/browser/ui/startup/bad_flags_prompt.cc +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/startup/bad_flags_prompt.h" #include "base/command_line.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/infobars/simple_alert_infobar_delegate.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index 2aca68b..db6644a 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc @@ -23,8 +23,8 @@ #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/auto_launch_trial.h" #include "chrome/browser/automation/automation_provider.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc index 2985e38..14314c4 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -22,8 +22,8 @@ #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/auto_launch_trial.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc index 7f3dae3..d382193 100644 --- a/chrome/browser/ui/sync/one_click_signin_helper.cc +++ b/chrome/browser/ui/sync/one_click_signin_helper.cc @@ -18,8 +18,8 @@ #include "base/prefs/pref_service.h" #include "base/string_util.h" #include "base/strings/string_split.h" +#include "base/strings/utf_string_conversions.h" #include "base/supports_user_data.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/defaults.h" diff --git a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc index 108189d..bf5b10d 100644 --- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc +++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc index 3f589cf..25587ee 100644 --- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc +++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h" #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #if defined(ENABLE_CONFIGURATION_POLICY) diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc index 9ffee12..7e7508f 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc @@ -18,7 +18,7 @@ #include "base/run_loop.h" #include "base/string16.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/extensions/extension_service.h" |