diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 23:46:18 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 23:46:18 +0000 |
| commit | 112158af2b74ec67707c85f6df26fb5547b37b6f (patch) | |
| tree | 4fd6ac75eab55eebe72b7cc05d8ff5e96662af36 /chrome | |
| parent | 5b86251b266a60f8fe4fee2e942b8299a75935cc (diff) | |
| download | chromium_src-112158af2b74ec67707c85f6df26fb5547b37b6f.zip chromium_src-112158af2b74ec67707c85f6df26fb5547b37b6f.tar.gz chromium_src-112158af2b74ec67707c85f6df26fb5547b37b6f.tar.bz2 | |
Use a direct include of utf_string_conversions.h in chrome/browser/, part 2.
BUG=none
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16561007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
223 files changed, 230 insertions, 231 deletions
diff --git a/chrome/browser/extensions/api/processes/processes_api.cc b/chrome/browser/extensions/api/processes/processes_api.cc index 404b968..adcd39d 100644 --- a/chrome/browser/extensions/api/processes/processes_api.cc +++ b/chrome/browser/extensions/api/processes/processes_api.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "base/metrics/histogram.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/extensions/api/processes/processes_api_constants.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" diff --git a/chrome/browser/extensions/api/proxy/proxy_api.cc b/chrome/browser/extensions/api/proxy/proxy_api.cc index 5e811bd..44d836c 100644 --- a/chrome/browser/extensions/api/proxy/proxy_api.cc +++ b/chrome/browser/extensions/api/proxy/proxy_api.cc @@ -8,7 +8,7 @@ #include "base/json/json_writer.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/api/proxy/proxy_api_constants.h" #include "chrome/browser/extensions/api/proxy/proxy_api_helpers.h" diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc index 564376c..730a767 100644 --- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc +++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc @@ -17,7 +17,7 @@ #include "base/basictypes.h" #include "base/string_util.h" #include "base/strings/string_tokenizer.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/api/proxy/proxy_api_constants.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc index f0bf6f11..4a96be4 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc @@ -6,7 +6,7 @@ #include "base/string16.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/api/push_messaging/sync_setup_helper.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/extensions/api/record/record_api.cc b/chrome/browser/extensions/api/record/record_api.cc index 48b07ee..6b0fa8a7 100644 --- a/chrome/browser/extensions/api/record/record_api.cc +++ b/chrome/browser/extensions/api/record/record_api.cc @@ -13,7 +13,7 @@ #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/experimental_record.h" diff --git a/chrome/browser/extensions/api/rtc_private/rtc_private_api.cc b/chrome/browser/extensions/api/rtc_private/rtc_private_api.cc index 3b03fcf..d70050a 100644 --- a/chrome/browser/extensions/api/rtc_private/rtc_private_api.cc +++ b/chrome/browser/extensions/api/rtc_private/rtc_private_api.cc @@ -7,8 +7,8 @@ #include "base/json/json_writer.h" #include "base/message_loop.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/value_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/contacts/contact.pb.h" diff --git a/chrome/browser/extensions/api/session_restore/session_restore_api.cc b/chrome/browser/extensions/api/session_restore/session_restore_api.cc index 922ea3e..ed0042c 100644 --- a/chrome/browser/extensions/api/session_restore/session_restore_api.cc +++ b/chrome/browser/extensions/api/session_restore/session_restore_api.cc @@ -9,7 +9,7 @@ #include "base/i18n/rtl.h" #include "base/lazy_instance.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_function_registry.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/extensions/api/storage/storage_schema_manifest_handler.cc b/chrome/browser/extensions/api/storage/storage_schema_manifest_handler.cc index ef4f43a..fbbcd5f 100644 --- a/chrome/browser/extensions/api/storage/storage_schema_manifest_handler.cc +++ b/chrome/browser/extensions/api/storage/storage_schema_manifest_handler.cc @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.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/policy/policy_schema.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_manifest_constants.h" diff --git a/chrome/browser/extensions/api/system_info_display/display_info_provider_win.cc b/chrome/browser/extensions/api/system_info_display/display_info_provider_win.cc index 51c2a0c..9fa228a 100644 --- a/chrome/browser/extensions/api/system_info_display/display_info_provider_win.cc +++ b/chrome/browser/extensions/api/system_info_display/display_info_provider_win.cc @@ -6,7 +6,7 @@ #include <windows.h> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/base/win/dpi.h" #include "ui/gfx/display.h" #include "ui/gfx/size.h" diff --git a/chrome/browser/extensions/api/system_info_storage/storage_info_provider.cc b/chrome/browser/extensions/api/system_info_storage/storage_info_provider.cc index 33c9ace..b29afa0 100644 --- a/chrome/browser/extensions/api/system_info_storage/storage_info_provider.cc +++ b/chrome/browser/extensions/api/system_info_storage/storage_info_provider.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/api/system_info_storage/storage_info_provider.h" #include "base/stl_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/storage_monitor/storage_monitor.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/extensions/api/system_info_storage/storage_info_provider_win.cc b/chrome/browser/extensions/api/system_info_storage/storage_info_provider_win.cc index b9257fc..b46d1cb 100644 --- a/chrome/browser/extensions/api/system_info_storage/storage_info_provider_win.cc +++ b/chrome/browser/extensions/api/system_info_storage/storage_info_provider_win.cc @@ -4,9 +4,9 @@ #include "chrome/browser/extensions/api/system_info_storage/storage_info_provider.h" -#include "base/string_util.h" -#include "base/utf_string_conversions.h" #include <windows.h> +#include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" namespace extensions { diff --git a/chrome/browser/extensions/api/system_info_storage/system_info_storage_apitest.cc b/chrome/browser/extensions/api/system_info_storage/system_info_storage_apitest.cc index b316a755..7420e3a 100644 --- a/chrome/browser/extensions/api/system_info_storage/system_info_storage_apitest.cc +++ b/chrome/browser/extensions/api/system_info_storage/system_info_storage_apitest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" #include "base/message_loop.h" +#include "base/strings/utf_string_conversions.h" #include "base/timer.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/extensions/api/system_info_storage/storage_info_provider.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_test_message_listener.h" diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc index 66b4c77..502f952 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc @@ -20,7 +20,7 @@ #include "base/string_util.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/extensions/api/tabs/tabs_constants.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/extensions/extension_function_util.h" diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc index f480bf5..4e79644 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc @@ -8,7 +8,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.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/browser_process.h" #include "chrome/browser/chrome_browser_main.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc index e43a471..c631011 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api.cc @@ -12,8 +12,8 @@ #include "base/metrics/histogram.h" #include "base/string_util.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 "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_content_browser_client.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index 0b4c630..933af93 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc @@ -18,8 +18,8 @@ #include "base/stl_util.h" #include "base/stringprintf.h" #include "base/strings/string_piece.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/extensions/api/web_request/upload_data_presenter.h" #include "chrome/browser/extensions/api/web_request/web_request_api.h" diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index 33c7394..fa23e56 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc @@ -11,7 +11,7 @@ #include "base/memory/scoped_vector.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 "base/values.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc index 67fe7bcf..8de5df4 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc @@ -7,7 +7,7 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_function_test_utils.h" diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc index 2247ec4..866edef 100644 --- a/chrome/browser/extensions/app_background_page_apitest.cc +++ b/chrome/browser/extensions/app_background_page_apitest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/background/background_contents_service.h" #include "chrome/browser/background/background_contents_service_factory.h" #include "chrome/browser/background/background_mode_manager.h" diff --git a/chrome/browser/extensions/bundle_installer.cc b/chrome/browser/extensions/bundle_installer.cc index db7057a..2249e2a 100644 --- a/chrome/browser/extensions/bundle_installer.cc +++ b/chrome/browser/extensions/bundle_installer.cc @@ -10,13 +10,13 @@ #include "base/command_line.h" #include "base/i18n/rtl.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc index 52d28c3..5c84637 100644 --- a/chrome/browser/extensions/content_script_apitest.cc +++ b/chrome/browser/extensions/content_script_apitest.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/extensions/api/permissions/permissions_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/extensions/context_menu_matcher.cc b/chrome/browser/extensions/context_menu_matcher.cc index 52924df..e69e38c 100644 --- a/chrome/browser/extensions/context_menu_matcher.cc +++ b/chrome/browser/extensions/context_menu_matcher.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/app/chrome_command_ids.h" #include "chrome/browser/extensions/context_menu_matcher.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc index 6f3b451..21be801 100644 --- a/chrome/browser/extensions/convert_user_script.cc +++ b/chrome/browser/extensions/convert_user_script.cc @@ -14,7 +14,7 @@ #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/user_script_master.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/convert_user_script_unittest.cc b/chrome/browser/extensions/convert_user_script_unittest.cc index 1e1fa3a..cc534f5 100644 --- a/chrome/browser/extensions/convert_user_script_unittest.cc +++ b/chrome/browser/extensions/convert_user_script_unittest.cc @@ -10,7 +10,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/convert_user_script.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc index 2406512..ef7f273 100644 --- a/chrome/browser/extensions/convert_web_app.cc +++ b/chrome/browser/extensions/convert_web_app.cc @@ -17,8 +17,8 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc index 5468b68..aa153c3 100644 --- a/chrome/browser/extensions/convert_web_app_unittest.cc +++ b/chrome/browser/extensions/convert_web_app_unittest.cc @@ -12,8 +12,8 @@ #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/version.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index f763e99..62adf5b 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -16,10 +16,10 @@ #include "base/sequenced_task_runner.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/version.h" #include "chrome/browser/extensions/convert_user_script.h" #include "chrome/browser/extensions/convert_web_app.h" diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index d00ee2d..e85b34e 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc @@ -13,7 +13,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/extensions/component_loader.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_creator.h" diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc index 20d709f..c1e7a2a 100644 --- a/chrome/browser/extensions/extension_context_menu_browsertest.cc +++ b/chrome/browser/extensions/extension_context_menu_browsertest.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/app/chrome_command_ids.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc index f6df0eda..547d83f 100644 --- a/chrome/browser/extensions/extension_context_menu_model.cc +++ b/chrome/browser/extensions/extension_context_menu_model.cc @@ -5,7 +5,7 @@ #include "chrome/browser/extensions/extension_context_menu_model.h" #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc index 450734a..6c887c1 100644 --- a/chrome/browser/extensions/extension_disabled_ui.cc +++ b/chrome/browser/extensions/extension_disabled_ui.cc @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #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/app/chrome_command_ids.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_install_ui.h" diff --git a/chrome/browser/extensions/extension_error_reporter.cc b/chrome/browser/extensions/extension_error_reporter.cc index 9cbf944..d94fd81 100644 --- a/chrome/browser/extensions/extension_error_reporter.cc +++ b/chrome/browser/extensions/extension_error_reporter.cc @@ -10,7 +10,7 @@ #include "base/bind_helpers.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/simple_message_box.h" ExtensionErrorReporter* ExtensionErrorReporter::instance_ = NULL; diff --git a/chrome/browser/extensions/extension_error_ui.cc b/chrome/browser/extensions/extension_error_ui.cc index e4f5f37..a14d2ec 100644 --- a/chrome/browser/extensions/extension_error_ui.cc +++ b/chrome/browser/extensions/extension_error_ui.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 "chrome/browser/extensions/extension_service.h" #include "chrome/browser/ui/global_error/global_error.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 6b97d397..a001ccd 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -12,7 +12,7 @@ #include "base/message_loop.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/browser_shutdown.h" #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_process_manager.h" diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc index 33a5bec..39faccc 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc @@ -12,7 +12,7 @@ #include "base/string_util.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/extensions/bundle_installer.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/image_loader.h" diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc index 3d27049..160c9f8 100644 --- a/chrome/browser/extensions/extension_nacl_browsertest.cc +++ b/chrome/browser/extensions/extension_nacl_browsertest.cc @@ -6,7 +6,7 @@ #include "base/files/file_path.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc index 79ff1b4..f4e7149 100644 --- a/chrome/browser/extensions/extension_prefs.cc +++ b/chrome/browser/extensions/extension_prefs.cc @@ -8,7 +8,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 "base/value_conversions.h" #include "chrome/browser/extensions/admin_policy.h" #include "chrome/browser/extensions/event_router.h" diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc index a0e363c..8b3557b 100644 --- a/chrome/browser/extensions/extension_protocols.cc +++ b/chrome/browser/extensions/extension_protocols.cc @@ -18,9 +18,9 @@ #include "base/sha1.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/threading/worker_pool.h" -#include "base/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/extensions/extension_info_map.h" #include "chrome/browser/extensions/image_loader.h" diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index e3451d8..1d03d3a 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -20,10 +20,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/sequenced_worker_pool.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "base/version.h" #include "chrome/browser/app_mode/app_mode_utils.h" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 323dad9..37056cc 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -25,7 +25,7 @@ #include "base/string16.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 "base/version.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/app_sync_data.h" diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc index 127dcdf..4d05765 100644 --- a/chrome/browser/extensions/extension_special_storage_policy.cc +++ b/chrome/browser/extensions/extension_special_storage_policy.cc @@ -8,7 +8,7 @@ #include "base/command_line.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/content_settings/cookie_settings.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/content_settings.h" diff --git a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc index c3f0272..8e8e1df 100644 --- a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc +++ b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc @@ -4,7 +4,7 @@ #include "base/process_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/component_loader.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/extensions/extension_warning_service.cc b/chrome/browser/extensions/extension_warning_service.cc index cf9881e..3eae70b 100644 --- a/chrome/browser/extensions/extension_warning_service.cc +++ b/chrome/browser/extensions/extension_warning_service.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/extension_warning_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" diff --git a/chrome/browser/extensions/extension_warning_set.cc b/chrome/browser/extensions/extension_warning_set.cc index 905ff3c..0e8879c 100644 --- a/chrome/browser/extensions/extension_warning_set.cc +++ b/chrome/browser/extensions/extension_warning_set.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/extension_warning_set.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc index 95a1bb4..f3e245d 100644 --- a/chrome/browser/extensions/extension_web_ui.cc +++ b/chrome/browser/extensions/extension_web_ui.cc @@ -10,7 +10,7 @@ #include "base/command_line.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/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_tab_util.h" diff --git a/chrome/browser/extensions/external_install_ui.cc b/chrome/browser/extensions/external_install_ui.cc index fd20b7a..dd25bf6 100644 --- a/chrome/browser/extensions/external_install_ui.cc +++ b/chrome/browser/extensions/external_install_ui.cc @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #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/app/chrome_command_ids.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_install_ui.h" diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc index f72bb04..403275a 100644 --- a/chrome/browser/extensions/external_pref_loader.cc +++ b/chrome/browser/extensions/external_pref_loader.cc @@ -13,7 +13,7 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/extensions/external_registry_loader_win.cc b/chrome/browser/extensions/external_registry_loader_win.cc index 23ed0ab..836b62c 100644 --- a/chrome/browser/extensions/external_registry_loader_win.cc +++ b/chrome/browser/extensions/external_registry_loader_win.cc @@ -10,8 +10,8 @@ #include "base/memory/scoped_handle.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 "base/values.h" #include "base/version.h" #include "base/win/registry.h" diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc index d9de618..24ef4b7 100644 --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc @@ -7,8 +7,8 @@ #include "base/files/file_path.h" #include "base/metrics/histogram.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/runtime/runtime_api.h" diff --git a/chrome/browser/extensions/isolated_app_browsertest.cc b/chrome/browser/extensions/isolated_app_browsertest.cc index 92bd799..067142d 100644 --- a/chrome/browser/extensions/isolated_app_browsertest.cc +++ b/chrome/browser/extensions/isolated_app_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #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_host.h" diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index 685e488..faa5910 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc @@ -4,7 +4,7 @@ #include "base/command_line.h" #include "base/files/file_path.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "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/extensions/management_policy_unittest.cc b/chrome/browser/extensions/management_policy_unittest.cc index c9dd846..1f1d86e 100644 --- a/chrome/browser/extensions/management_policy_unittest.cc +++ b/chrome/browser/extensions/management_policy_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/extensions/management_policy.h" #include "chrome/browser/extensions/test_management_policy.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/media_galleries_handler.cc b/chrome/browser/extensions/media_galleries_handler.cc index 33b0288..06bac15 100644 --- a/chrome/browser/extensions/media_galleries_handler.cc +++ b/chrome/browser/extensions/media_galleries_handler.cc @@ -7,7 +7,7 @@ #include "base/logging.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 "base/values.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_manifest_constants.h" diff --git a/chrome/browser/extensions/menu_manager.cc b/chrome/browser/extensions/menu_manager.cc index 34813c8..435e504 100644 --- a/chrome/browser/extensions/menu_manager.cc +++ b/chrome/browser/extensions/menu_manager.cc @@ -10,15 +10,15 @@ #include "base/logging.h" #include "base/stl_util.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/state_store.h" +#include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/background_info.h" diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc index 99393ed..56e24653 100644 --- a/chrome/browser/extensions/menu_manager_unittest.cc +++ b/chrome/browser/extensions/menu_manager_unittest.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "base/path_service.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 "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/event_router.h" diff --git a/chrome/browser/extensions/pack_extension_job.cc b/chrome/browser/extensions/pack_extension_job.cc index 55e2c28..1af8399 100644 --- a/chrome/browser/extensions/pack_extension_job.cc +++ b/chrome/browser/extensions/pack_extension_job.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/message_loop.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/extension_creator.h" #include "chrome/common/chrome_constants.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/page_action_browsertest.cc b/chrome/browser/extensions/page_action_browsertest.cc index 75a4525..90e8ef7 100644 --- a/chrome/browser/extensions/page_action_browsertest.cc +++ b/chrome/browser/extensions/page_action_browsertest.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/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_browsertest.h" diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/extensions/platform_app_browsertest.cc index 5a49d1b3..21c839d 100644 --- a/chrome/browser/extensions/platform_app_browsertest.cc +++ b/chrome/browser/extensions/platform_app_browsertest.cc @@ -7,9 +7,9 @@ #include "base/files/scoped_temp_dir.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" -#include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/automation/automation_util.h" #include "chrome/browser/devtools/devtools_window.h" diff --git a/chrome/browser/extensions/platform_app_launcher.cc b/chrome/browser/extensions/platform_app_launcher.cc index 1956abd..3306afe 100644 --- a/chrome/browser/extensions/platform_app_launcher.cc +++ b/chrome/browser/extensions/platform_app_launcher.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h" #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" diff --git a/chrome/browser/extensions/plugin_manager.cc b/chrome/browser/extensions/plugin_manager.cc index 863bd2d..1671fd8 100644 --- a/chrome/browser/extensions/plugin_manager.cc +++ b/chrome/browser/extensions/plugin_manager.cc @@ -5,7 +5,7 @@ #include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/path_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/plugin_manager.h" #include "chrome/browser/plugins/chrome_plugin_service_filter.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/extensions/process_management_browsertest.cc b/chrome/browser/extensions/process_management_browsertest.cc index ecafade..f9dbbb5 100644 --- a/chrome/browser/extensions/process_management_browsertest.cc +++ b/chrome/browser/extensions/process_management_browsertest.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/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_process_manager.h" diff --git a/chrome/browser/extensions/requirements_checker.cc b/chrome/browser/extensions/requirements_checker.cc index 5c2f557..1acc782 100644 --- a/chrome/browser/extensions/requirements_checker.cc +++ b/chrome/browser/extensions/requirements_checker.cc @@ -5,7 +5,7 @@ #include "chrome/browser/extensions/requirements_checker.h" #include "base/bind.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/gpu/gpu_feature_checker.h" #include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/sandboxed_unpacker.cc b/chrome/browser/extensions/sandboxed_unpacker.cc index d32455d..80241b7 100644 --- a/chrome/browser/extensions/sandboxed_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_unpacker.cc @@ -17,7 +17,7 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/sequenced_task_runner.h" -#include "base/utf_string_conversions.h" // TODO(viettrungluu): delete me. +#include "base/strings/utf_string_conversions.h" // TODO(viettrungluu): delete me. #include "chrome/browser/extensions/extension_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/extensions/startup_helper.cc b/chrome/browser/extensions/startup_helper.cc index 0ec0f8b..d002313 100644 --- a/chrome/browser/extensions/startup_helper.cc +++ b/chrome/browser/extensions/startup_helper.cc @@ -12,7 +12,7 @@ #include "base/run_loop.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/extensions/extension_service.h" #include "chrome/browser/extensions/sandboxed_unpacker.h" #include "chrome/browser/extensions/webstore_startup_installer.h" diff --git a/chrome/browser/extensions/test_management_policy.cc b/chrome/browser/extensions/test_management_policy.cc index 2296fc8..2a64d2f8 100644 --- a/chrome/browser/extensions/test_management_policy.cc +++ b/chrome/browser/extensions/test_management_policy.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/test_management_policy.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace extensions { TestManagementPolicyProvider::TestManagementPolicyProvider() diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc index d46bd31..deb28c2 100644 --- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc +++ b/chrome/browser/extensions/theme_installed_infobar_delegate.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/infobars/infobar_service.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/extensions/web_view_browsertest.cc b/chrome/browser/extensions/web_view_browsertest.cc index c6ed890..accc201 100644 --- a/chrome/browser/extensions/web_view_browsertest.cc +++ b/chrome/browser/extensions/web_view_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #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_test_message_listener.h" #include "chrome/browser/extensions/platform_app_browsertest_util.h" @@ -12,7 +12,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/test_launcher_utils.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/extensions/web_view_interactive_browsertest.cc b/chrome/browser/extensions/web_view_interactive_browsertest.cc index 75efe96..26031d8 100644 --- a/chrome/browser/extensions/web_view_interactive_browsertest.cc +++ b/chrome/browser/extensions/web_view_interactive_browsertest.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/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/platform_app_browsertest_util.h" #include "chrome/browser/extensions/shell_window_registry.h" diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index 8059cf8..53cdca9 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc @@ -12,7 +12,7 @@ #include "base/string_util.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/browser_process.h" #include "chrome/browser/download/download_crx_util.h" #include "chrome/browser/download/download_prefs.h" diff --git a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc index 0f916fb..fa7b4df 100644 --- a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc +++ b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc @@ -4,7 +4,7 @@ #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/extensions/extension_host.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/external_extension_browsertest.cc b/chrome/browser/external_extension_browsertest.cc index 2766b12..390c2b9 100644 --- a/chrome/browser/external_extension_browsertest.cc +++ b/chrome/browser/external_extension_browsertest.cc @@ -4,7 +4,7 @@ #include "base/command_line.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/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/feedback/feedback_util.cc b/chrome/browser/feedback/feedback_util.cc index 319c91b..f339dcf 100644 --- a/chrome/browser/feedback/feedback_util.cc +++ b/chrome/browser/feedback/feedback_util.cc @@ -14,7 +14,7 @@ #include "base/memory/singleton.h" #include "base/message_loop.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/windows_version.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/variations/variations_http_header_provider.h" diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc index 48cf490..0b6746c 100644 --- a/chrome/browser/file_select_helper.cc +++ b/chrome/browser/file_select_helper.cc @@ -11,7 +11,7 @@ #include "base/platform_file.h" #include "base/string_util.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index 5a0ea0d..17b1d99 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -15,7 +15,7 @@ #include "base/path_service.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 "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/first_run/first_run_browsertest.cc b/chrome/browser/first_run/first_run_browsertest.cc index d2847a6..66a268f 100644 --- a/chrome/browser/first_run/first_run_browsertest.cc +++ b/chrome/browser/first_run/first_run_browsertest.cc @@ -6,7 +6,7 @@ #include "base/files/file_path.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/browser_process.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/first_run/first_run.h" diff --git a/chrome/browser/first_run/first_run_linux.cc b/chrome/browser/first_run/first_run_linux.cc index 2bd99e9..dbaaa85 100644 --- a/chrome/browser/first_run/first_run_linux.cc +++ b/chrome/browser/first_run/first_run_linux.cc @@ -10,7 +10,7 @@ #include "base/process_util.h" #include "base/string_util.h" #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/first_run/first_run_internal.h" #include "chrome/browser/importer/importer_host.h" diff --git a/chrome/browser/geolocation/access_token_store_browsertest.cc b/chrome/browser/geolocation/access_token_store_browsertest.cc index de57be7..a82d586 100644 --- a/chrome/browser/geolocation/access_token_store_browsertest.cc +++ b/chrome/browser/geolocation/access_token_store_browsertest.cc @@ -5,7 +5,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/geolocation/chrome_access_token_store.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/geolocation/chrome_access_token_store.cc b/chrome/browser/geolocation/chrome_access_token_store.cc index 70e595d..9bf2b9f 100644 --- a/chrome/browser/geolocation/chrome_access_token_store.cc +++ b/chrome/browser/geolocation/chrome_access_token_store.cc @@ -8,7 +8,7 @@ #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc index 6437dec..3d52ec0 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc @@ -9,7 +9,7 @@ #include <vector> #include "base/bind.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/extensions/extension_service.h" diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 797b401..558d22d 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -7,7 +7,7 @@ #include "base/compiler_specific.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/content_settings/host_content_settings_map.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/geolocation/geolocation_settings_state.h" diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate_android.cc b/chrome/browser/geolocation/geolocation_infobar_delegate_android.cc index d409720..70470cc 100644 --- a/chrome/browser/geolocation/geolocation_infobar_delegate_android.cc +++ b/chrome/browser/geolocation/geolocation_infobar_delegate_android.cc @@ -4,7 +4,7 @@ #include "chrome/browser/geolocation/geolocation_infobar_delegate_android.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/android/google_location_settings_helper.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/geolocation/geolocation_settings_state.cc b/chrome/browser/geolocation/geolocation_settings_state.cc index 6fe9353..21cbb77 100644 --- a/chrome/browser/geolocation/geolocation_settings_state.cc +++ b/chrome/browser/geolocation/geolocation_settings_state.cc @@ -8,7 +8,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/string_piece.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/profiles/profile.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/google/google_util.cc b/chrome/browser/google/google_util.cc index 4dfd8cb..24947a5 100644 --- a/chrome/browser/google/google_util.cc +++ b/chrome/browser/google/google_util.cc @@ -12,7 +12,7 @@ #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/google/google_util_unittest.cc b/chrome/browser/google/google_util_unittest.cc index 75b7067..719c9b4 100644 --- a/chrome/browser/google/google_util_unittest.cc +++ b/chrome/browser/google/google_util_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/google/google_util.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/google_apis/drive_api_parser_unittest.cc b/chrome/browser/google_apis/drive_api_parser_unittest.cc index 8406b5b..759a5bf 100644 --- a/chrome/browser/google_apis/drive_api_parser_unittest.cc +++ b/chrome/browser/google_apis/drive_api_parser_unittest.cc @@ -8,8 +8,8 @@ #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "base/string16.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/google_apis/test_util.h" diff --git a/chrome/browser/google_apis/drive_api_util.cc b/chrome/browser/google_apis/drive_api_util.cc index 962c692..911f4f6 100644 --- a/chrome/browser/google_apis/drive_api_util.cc +++ b/chrome/browser/google_apis/drive_api_util.cc @@ -11,7 +11,7 @@ #include "base/string16.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/google_apis/drive_switches.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" diff --git a/chrome/browser/google_apis/fake_drive_service.cc b/chrome/browser/google_apis/fake_drive_service.cc index 7589a78..8d2b752 100644 --- a/chrome/browser/google_apis/fake_drive_service.cc +++ b/chrome/browser/google_apis/fake_drive_service.cc @@ -13,7 +13,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_tokenizer.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/google_apis/drive_api_parser.h" #include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/google_apis/test_util.h" diff --git a/chrome/browser/google_apis/fake_drive_service_unittest.cc b/chrome/browser/google_apis/fake_drive_service_unittest.cc index 28406e8..ad51c61 100644 --- a/chrome/browser/google_apis/fake_drive_service_unittest.cc +++ b/chrome/browser/google_apis/fake_drive_service_unittest.cc @@ -12,7 +12,7 @@ #include "base/message_loop.h" #include "base/stl_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/google_apis/drive_api_parser.h" #include "chrome/browser/google_apis/gdata_wapi_operations.h" #include "chrome/browser/google_apis/gdata_wapi_parser.h" diff --git a/chrome/browser/google_apis/gdata_wapi_parser.cc b/chrome/browser/google_apis/gdata_wapi_parser.cc index a9c945f..a40ab44 100644 --- a/chrome/browser/google_apis/gdata_wapi_parser.cc +++ b/chrome/browser/google_apis/gdata_wapi_parser.cc @@ -14,7 +14,7 @@ #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/google_apis/drive_api_parser.h" #include "chrome/browser/google_apis/time_util.h" diff --git a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc index 8813021..969dd3c 100644 --- a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc +++ b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc @@ -10,8 +10,8 @@ #include "base/json/json_file_value_serializer.h" #include "base/logging.h" #include "base/path_service.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/google_apis/test_util.h" #include "chrome/browser/google_apis/time_util.h" diff --git a/chrome/browser/google_apis/time_util_unittest.cc b/chrome/browser/google_apis/time_util_unittest.cc index e06f14e..af7eec9 100644 --- a/chrome/browser/google_apis/time_util_unittest.cc +++ b/chrome/browser/google_apis/time_util_unittest.cc @@ -5,8 +5,8 @@ #include "chrome/browser/google_apis/time_util.h" #include "base/i18n/time_formatting.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/history/android/android_cache_database_unittest.cc b/chrome/browser/history/android/android_cache_database_unittest.cc index 6d1c5b1..889bce7 100644 --- a/chrome/browser/history/android/android_cache_database_unittest.cc +++ b/chrome/browser/history/android/android_cache_database_unittest.cc @@ -4,7 +4,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/history/android/android_cache_database.h" #include "chrome/browser/history/android/android_time.h" #include "chrome/browser/history/history_database.h" diff --git a/chrome/browser/history/android/android_history_provider_service_unittest.cc b/chrome/browser/history/android/android_history_provider_service_unittest.cc index faf1f4f..626bf8a 100644 --- a/chrome/browser/history/android/android_history_provider_service_unittest.cc +++ b/chrome/browser/history/android/android_history_provider_service_unittest.cc @@ -4,13 +4,13 @@ #include "chrome/browser/history/android/android_history_provider_service.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/history/android/android_history_types.h" #include "chrome/common/chrome_constants.h" #include "chrome/test/base/testing_browser_process.h" -#include "chrome/test/base/testing_profile_manager.h" #include "chrome/test/base/testing_profile.h" +#include "chrome/test/base/testing_profile_manager.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread.h" diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc index 5c8f8c7..8f851e5 100644 --- a/chrome/browser/history/android/android_provider_backend_unittest.cc +++ b/chrome/browser/history/android/android_provider_backend_unittest.cc @@ -11,7 +11,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.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_model_factory.h" #include "chrome/browser/bookmarks/bookmark_service.h" diff --git a/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc b/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc index 1fd0737..6e3bfa2 100644 --- a/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc +++ b/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/history/android/bookmark_model_sql_handler.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/history/history_database.h" diff --git a/chrome/browser/history/android/sqlite_cursor_unittest.cc b/chrome/browser/history/android/sqlite_cursor_unittest.cc index 2e955f7..ac97f2f 100644 --- a/chrome/browser/history/android/sqlite_cursor_unittest.cc +++ b/chrome/browser/history/android/sqlite_cursor_unittest.cc @@ -9,8 +9,8 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/history/android/android_history_provider_service.h" #include "chrome/browser/history/android/android_history_types.h" #include "chrome/browser/history/android/android_time.h" diff --git a/chrome/browser/history/android/urls_sql_handler_unittest.cc b/chrome/browser/history/android/urls_sql_handler_unittest.cc index 998ab96..c56b773 100644 --- a/chrome/browser/history/android/urls_sql_handler_unittest.cc +++ b/chrome/browser/history/android/urls_sql_handler_unittest.cc @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/history/android/visit_sql_handler.h" #include "chrome/browser/history/history_database.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/history/android/visit_sql_handler_unittest.cc b/chrome/browser/history/android/visit_sql_handler_unittest.cc index 020008b..718464b 100644 --- a/chrome/browser/history/android/visit_sql_handler_unittest.cc +++ b/chrome/browser/history/android/visit_sql_handler_unittest.cc @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/history/android/urls_sql_handler.h" #include "chrome/browser/history/history_database.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/history/download_database.cc b/chrome/browser/history/download_database.cc index 4a88e3a..79f9f92 100644 --- a/chrome/browser/history/download_database.cc +++ b/chrome/browser/history/download_database.cc @@ -14,8 +14,8 @@ #include "base/metrics/histogram.h" #include "base/stl_util.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/history/download_row.h" #include "chrome/browser/history/history_types.h" diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc index 5ee0640..00267a1 100644 --- a/chrome/browser/history/expire_history_backend_unittest.cc +++ b/chrome/browser/history/expire_history_backend_unittest.cc @@ -15,7 +15,7 @@ #include "base/path_service.h" #include "base/stl_util.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_utils.h" #include "chrome/browser/history/archived_database.h" diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc index a7cef8d..26a51d0 100644 --- a/chrome/browser/history/history_backend.cc +++ b/chrome/browser/history/history_backend.cc @@ -21,8 +21,8 @@ #include "base/metrics/histogram.h" #include "base/rand_util.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/autocomplete/history_url_provider.h" #include "chrome/browser/bookmarks/bookmark_service.h" #include "chrome/browser/favicon/favicon_changed_details.h" diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc index 09e57e9..dad8d5a 100644 --- a/chrome/browser/history/history_backend_unittest.cc +++ b/chrome/browser/history/history_backend_unittest.cc @@ -17,7 +17,7 @@ #include "base/path_service.h" #include "base/string16.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "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/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc index a233ca2..a7831ff 100644 --- a/chrome/browser/history/history_browsertest.cc +++ b/chrome/browser/history/history_browsertest.cc @@ -8,7 +8,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/app/chrome_command_ids.h" #include "chrome/browser/history/history_db_task.h" #include "chrome/browser/history/history_service.h" diff --git a/chrome/browser/history/history_publisher.cc b/chrome/browser/history/history_publisher.cc index 9698517..1c42deb 100644 --- a/chrome/browser/history/history_publisher.cc +++ b/chrome/browser/history/history_publisher.cc @@ -4,7 +4,7 @@ #include "chrome/browser/history/history_publisher.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace history { diff --git a/chrome/browser/history/history_publisher_win.cc b/chrome/browser/history/history_publisher_win.cc index 31e5241..f5bc5ca 100644 --- a/chrome/browser/history/history_publisher_win.cc +++ b/chrome/browser/history/history_publisher_win.cc @@ -9,8 +9,8 @@ #include <wtypes.h> #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/win/registry.h" #include "base/win/scoped_bstr.h" #include "base/win/scoped_comptr.h" diff --git a/chrome/browser/history/history_querying_unittest.cc b/chrome/browser/history/history_querying_unittest.cc index 0b6781a..4719b90 100644 --- a/chrome/browser/history/history_querying_unittest.cc +++ b/chrome/browser/history/history_querying_unittest.cc @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/history/history_service.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/history/history_types_unittest.cc b/chrome/browser/history/history_types_unittest.cc index b6fac35..58033f6 100644 --- a/chrome/browser/history/history_types_unittest.cc +++ b/chrome/browser/history/history_types_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/history/history_types.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc index 4c5be04..1b9e5e3 100644 --- a/chrome/browser/history/history_unittest.cc +++ b/chrome/browser/history/history_unittest.cc @@ -38,9 +38,9 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/platform_thread.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/history/download_row.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_database.h" diff --git a/chrome/browser/history/in_memory_database.cc b/chrome/browser/history/in_memory_database.cc index 2f41481..40babf5 100644 --- a/chrome/browser/history/in_memory_database.cc +++ b/chrome/browser/history/in_memory_database.cc @@ -7,8 +7,8 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "build/build_config.h" namespace history { diff --git a/chrome/browser/history/in_memory_history_backend.cc b/chrome/browser/history/in_memory_history_backend.cc index bc41b22..0dc276f 100644 --- a/chrome/browser/history/in_memory_history_backend.cc +++ b/chrome/browser/history/in_memory_history_backend.cc @@ -8,8 +8,8 @@ #include <vector> #include "base/command_line.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/history/history_notifications.h" #include "chrome/browser/history/in_memory_database.h" diff --git a/chrome/browser/history/in_memory_url_index.cc b/chrome/browser/history/in_memory_url_index.cc index 0207af2..50098cd 100644 --- a/chrome/browser/history/in_memory_url_index.cc +++ b/chrome/browser/history/in_memory_url_index.cc @@ -6,7 +6,7 @@ #include "base/debug/trace_event.h" #include "base/file_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_service.h" diff --git a/chrome/browser/history/in_memory_url_index_types_unittest.cc b/chrome/browser/history/in_memory_url_index_types_unittest.cc index 634f459b..930db36 100644 --- a/chrome/browser/history/in_memory_url_index_types_unittest.cc +++ b/chrome/browser/history/in_memory_url_index_types_unittest.cc @@ -5,7 +5,7 @@ #include <algorithm> #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/history/in_memory_url_index_types.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/history/in_memory_url_index_unittest.cc b/chrome/browser/history/in_memory_url_index_unittest.cc index 4a573bf..37d7112 100644 --- a/chrome/browser/history/in_memory_url_index_unittest.cc +++ b/chrome/browser/history/in_memory_url_index_unittest.cc @@ -13,7 +13,7 @@ #include "base/path_service.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/autocomplete/autocomplete_provider.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_database.h" diff --git a/chrome/browser/history/multipart_browsertest.cc b/chrome/browser/history/multipart_browsertest.cc index 0f18f89..13bf191 100644 --- a/chrome/browser/history/multipart_browsertest.cc +++ b/chrome/browser/history/multipart_browsertest.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/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/browser/history/query_parser_unittest.cc b/chrome/browser/history/query_parser_unittest.cc index 0b34e74..4982b30 100644 --- a/chrome/browser/history/query_parser_unittest.cc +++ b/chrome/browser/history/query_parser_unittest.cc @@ -4,7 +4,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_vector.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/history/query_parser.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/history/redirect_browsertest.cc b/chrome/browser/history/redirect_browsertest.cc index 527767f..dfb435e 100644 --- a/chrome/browser/history/redirect_browsertest.cc +++ b/chrome/browser/history/redirect_browsertest.cc @@ -14,9 +14,9 @@ #include "base/string16.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/history/scored_history_match.cc b/chrome/browser/history/scored_history_match.cc index b8cb4c4..d94164d 100644 --- a/chrome/browser/history/scored_history_match.cc +++ b/chrome/browser/history/scored_history_match.cc @@ -14,7 +14,7 @@ #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/history_url_provider.h" #include "chrome/browser/autocomplete/url_prefix.h" #include "chrome/browser/bookmarks/bookmark_service.h" diff --git a/chrome/browser/history/scored_history_match_unittest.cc b/chrome/browser/history/scored_history_match_unittest.cc index 19a7ded..7ca3a17 100644 --- a/chrome/browser/history/scored_history_match_unittest.cc +++ b/chrome/browser/history/scored_history_match_unittest.cc @@ -5,7 +5,7 @@ #include <algorithm> #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_service.h" #include "chrome/browser/history/scored_history_match.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/history/shortcuts_backend_unittest.cc b/chrome/browser/history/shortcuts_backend_unittest.cc index 0a7ffda..4f54447 100644 --- a/chrome/browser/history/shortcuts_backend_unittest.cc +++ b/chrome/browser/history/shortcuts_backend_unittest.cc @@ -6,8 +6,8 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/history/shortcuts_backend.h" #include "chrome/browser/history/shortcuts_backend_factory.h" #include "chrome/browser/history/shortcuts_database.h" diff --git a/chrome/browser/history/shortcuts_database_unittest.cc b/chrome/browser/history/shortcuts_database_unittest.cc index 19c2be2..bd2a1f3 100644 --- a/chrome/browser/history/shortcuts_database_unittest.cc +++ b/chrome/browser/history/shortcuts_database_unittest.cc @@ -5,8 +5,8 @@ #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/history/shortcuts_database.h" #include "chrome/test/base/testing_profile.h" #include "sql/statement.h" diff --git a/chrome/browser/history/snippet.cc b/chrome/browser/history/snippet.cc index 929533d..de46b26 100644 --- a/chrome/browser/history/snippet.cc +++ b/chrome/browser/history/snippet.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "third_party/icu/public/common/unicode/brkiter.h" #include "third_party/icu/public/common/unicode/utext.h" #include "third_party/icu/public/common/unicode/utf8.h" diff --git a/chrome/browser/history/snippet_unittest.cc b/chrome/browser/history/snippet_unittest.cc index 0ac3ef6..9eac243 100644 --- a/chrome/browser/history/snippet_unittest.cc +++ b/chrome/browser/history/snippet_unittest.cc @@ -8,7 +8,7 @@ #include "base/string_util.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/history/text_database.cc b/chrome/browser/history/text_database.cc index 7f46a13..ac6f25a 100644 --- a/chrome/browser/history/text_database.cc +++ b/chrome/browser/history/text_database.cc @@ -13,7 +13,7 @@ #include "base/metrics/histogram.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/diagnostics/sqlite_diagnostics.h" #include "sql/statement.h" #include "sql/transaction.h" diff --git a/chrome/browser/history/text_database_manager.cc b/chrome/browser/history/text_database_manager.cc index f6ca82e..6f1b845 100644 --- a/chrome/browser/history/text_database_manager.cc +++ b/chrome/browser/history/text_database_manager.cc @@ -10,11 +10,11 @@ #include "base/bind.h" #include "base/compiler_specific.h" #include "base/file_util.h" -#include "base/metrics/histogram.h" #include "base/logging.h" #include "base/message_loop.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/history/history_publisher.h" #include "chrome/browser/history/visit_database.h" diff --git a/chrome/browser/history/text_database_manager_unittest.cc b/chrome/browser/history/text_database_manager_unittest.cc index 0ec6753..eccd7a8 100644 --- a/chrome/browser/history/text_database_manager_unittest.cc +++ b/chrome/browser/history/text_database_manager_unittest.cc @@ -7,7 +7,7 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/history/text_database_manager.h" #include "chrome/browser/history/visit_database.h" #include "sql/connection.h" diff --git a/chrome/browser/history/text_database_unittest.cc b/chrome/browser/history/text_database_unittest.cc index 0691e7f..9e7cb70 100644 --- a/chrome/browser/history/text_database_unittest.cc +++ b/chrome/browser/history/text_database_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/scoped_temp_dir.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/history/text_database.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/history/thumbnail_database.cc b/chrome/browser/history/thumbnail_database.cc index fcea806..4594eb6 100644 --- a/chrome/browser/history/thumbnail_database.cc +++ b/chrome/browser/history/thumbnail_database.cc @@ -18,8 +18,8 @@ #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_tokenizer.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/diagnostics/sqlite_diagnostics.h" #include "chrome/browser/history/history_publisher.h" #include "chrome/browser/history/top_sites.h" diff --git a/chrome/browser/history/top_sites_impl.cc b/chrome/browser/history/top_sites_impl.cc index bc6e110..ea2f10c 100644 --- a/chrome/browser/history/top_sites_impl.cc +++ b/chrome/browser/history/top_sites_impl.cc @@ -15,8 +15,8 @@ #include "base/message_loop/message_loop_proxy.h" #include "base/prefs/pref_service.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/task_runner.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_db_task.h" diff --git a/chrome/browser/history/top_sites_impl_unittest.cc b/chrome/browser/history/top_sites_impl_unittest.cc index 1e58ab0..d6e2989 100644 --- a/chrome/browser/history/top_sites_impl_unittest.cc +++ b/chrome/browser/history/top_sites_impl_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/weak_ptr.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_database.h" diff --git a/chrome/browser/history/top_sites_likely_impl.cc b/chrome/browser/history/top_sites_likely_impl.cc index 7bba06c..a93f9dd 100644 --- a/chrome/browser/history/top_sites_likely_impl.cc +++ b/chrome/browser/history/top_sites_likely_impl.cc @@ -15,8 +15,8 @@ #include "base/message_loop/message_loop_proxy.h" #include "base/prefs/pref_service.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/task_runner.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_db_task.h" diff --git a/chrome/browser/history/top_sites_likely_impl_unittest.cc b/chrome/browser/history/top_sites_likely_impl_unittest.cc index 377e04b..ce23310 100644 --- a/chrome/browser/history/top_sites_likely_impl_unittest.cc +++ b/chrome/browser/history/top_sites_likely_impl_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/weak_ptr.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_database.h" diff --git a/chrome/browser/history/typed_url_syncable_service.cc b/chrome/browser/history/typed_url_syncable_service.cc index 92240d2..3b6d57e 100644 --- a/chrome/browser/history/typed_url_syncable_service.cc +++ b/chrome/browser/history/typed_url_syncable_service.cc @@ -7,7 +7,7 @@ #include "base/auto_reset.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/history/history_backend.h" #include "net/base/net_util.h" #include "sync/protocol/sync.pb.h" diff --git a/chrome/browser/history/typed_url_syncable_service_unittest.cc b/chrome/browser/history/typed_url_syncable_service_unittest.cc index 149ec4b..e198382 100644 --- a/chrome/browser/history/typed_url_syncable_service_unittest.cc +++ b/chrome/browser/history/typed_url_syncable_service_unittest.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_types.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/history/url_database.cc b/chrome/browser/history/url_database.cc index 5387bc1..0856d25 100644 --- a/chrome/browser/history/url_database.cc +++ b/chrome/browser/history/url_database.cc @@ -10,7 +10,7 @@ #include <vector> #include "base/i18n/case_conversion.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" #include "sql/statement.h" diff --git a/chrome/browser/history/url_database_unittest.cc b/chrome/browser/history/url_database_unittest.cc index b51dd16..9120dae 100644 --- a/chrome/browser/history/url_database_unittest.cc +++ b/chrome/browser/history/url_database_unittest.cc @@ -6,7 +6,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/history/url_database.h" #include "sql/connection.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/history/url_index_private_data.cc b/chrome/browser/history/url_index_private_data.cc index 8af97fa..aa200760 100644 --- a/chrome/browser/history/url_index_private_data.cc +++ b/chrome/browser/history/url_index_private_data.cc @@ -17,8 +17,8 @@ #include "base/i18n/case_conversion.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/autocomplete/autocomplete_provider.h" #include "chrome/browser/autocomplete/url_prefix.h" #include "chrome/browser/bookmarks/bookmark_service.h" diff --git a/chrome/browser/history/visitsegment_database.cc b/chrome/browser/history/visitsegment_database.cc index 902a1b9..c2ba7ff 100644 --- a/chrome/browser/history/visitsegment_database.cc +++ b/chrome/browser/history/visitsegment_database.cc @@ -14,7 +14,7 @@ #include "base/logging.h" #include "base/stl_util.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/history/page_usage_data.h" #include "chrome/common/chrome_switches.h" #include "sql/statement.h" diff --git a/chrome/browser/history/web_history_service.cc b/chrome/browser/history/web_history_service.cc index 4b16977..cea7f2f 100644 --- a/chrome/browser/history/web_history_service.cc +++ b/chrome/browser/history/web_history_service.cc @@ -9,7 +9,7 @@ #include "base/json/json_writer.h" #include "base/metrics/histogram.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/signin/oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service.h" diff --git a/chrome/browser/iframe_browsertest.cc b/chrome/browser/iframe_browsertest.cc index 629175a..3f650e3 100644 --- a/chrome/browser/iframe_browsertest.cc +++ b/chrome/browser/iframe_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/files/file_path.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/browser/importer/external_process_importer_bridge.cc b/chrome/browser/importer/external_process_importer_bridge.cc index 6271210c..2395fa0 100644 --- a/chrome/browser/importer/external_process_importer_bridge.cc +++ b/chrome/browser/importer/external_process_importer_bridge.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/task_runner.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/bookmarks/imported_bookmark_entry.h" #include "chrome/browser/favicon/imported_favicon_usage.h" diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc index 5160310..d890f08 100644 --- a/chrome/browser/importer/firefox3_importer.cc +++ b/chrome/browser/importer/firefox3_importer.cc @@ -11,7 +11,7 @@ #include "base/message_loop.h" #include "base/stl_util.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_html_reader.h" #include "chrome/browser/bookmarks/imported_bookmark_entry.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/importer/firefox_importer_browsertest.cc b/chrome/browser/importer/firefox_importer_browsertest.cc index d8fe3e3..9823523 100644 --- a/chrome/browser/importer/firefox_importer_browsertest.cc +++ b/chrome/browser/importer/firefox_importer_browsertest.cc @@ -10,7 +10,7 @@ #include "base/stl_util.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/imported_bookmark_entry.h" #include "chrome/browser/favicon/imported_favicon_usage.h" #include "chrome/browser/importer/external_process_importer_host.h" diff --git a/chrome/browser/importer/firefox_importer_unittest.cc b/chrome/browser/importer/firefox_importer_unittest.cc index dac485b..bdfa18f 100644 --- a/chrome/browser/importer/firefox_importer_unittest.cc +++ b/chrome/browser/importer/firefox_importer_unittest.cc @@ -6,7 +6,7 @@ #include "base/files/file_path.h" #include "base/path_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/importer/firefox_importer_unittest_utils.h" #include "chrome/browser/importer/nss_decryptor.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/importer/firefox_importer_utils.cc b/chrome/browser/importer/firefox_importer_utils.cc index 8ffe8f2..62591ad 100644 --- a/chrome/browser/importer/firefox_importer_utils.cc +++ b/chrome/browser/importer/firefox_importer_utils.cc @@ -14,7 +14,7 @@ #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_parser.h" diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index 36a7db6..572ca90 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -20,8 +20,8 @@ #include "base/string16.h" #include "base/string_util.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 "base/win/registry.h" #include "base/win/scoped_co_mem.h" #include "base/win/scoped_comptr.h" diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc index b97892b..10089f2 100644 --- a/chrome/browser/importer/ie_importer_browsertest_win.cc +++ b/chrome/browser/importer/ie_importer_browsertest_win.cc @@ -23,7 +23,7 @@ #include "base/stl_util.h" #include "base/string16.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/registry.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_propvariant.h" @@ -32,8 +32,8 @@ #include "chrome/browser/favicon/imported_favicon_usage.h" #include "chrome/browser/importer/external_process_importer_host.h" #include "chrome/browser/importer/ie_importer.h" -#include "chrome/browser/importer/ie_importer_utils_win.h" #include "chrome/browser/importer/ie_importer_test_registry_overrider_win.h" +#include "chrome/browser/importer/ie_importer_utils_win.h" #include "chrome/browser/importer/importer_bridge.h" #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/importer/importer_host.h" diff --git a/chrome/browser/importer/ie_importer_test_registry_overrider_win.cc b/chrome/browser/importer/ie_importer_test_registry_overrider_win.cc index 82ea296..7d1dcf4 100644 --- a/chrome/browser/importer/ie_importer_test_registry_overrider_win.cc +++ b/chrome/browser/importer/ie_importer_test_registry_overrider_win.cc @@ -11,7 +11,7 @@ #include "base/environment.h" #include "base/guid.h" #include "base/memory/scoped_ptr.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/registry.h" namespace { diff --git a/chrome/browser/importer/importer_host.cc b/chrome/browser/importer/importer_host.cc index dde8a71..b22f7bc 100644 --- a/chrome/browser/importer/importer_host.cc +++ b/chrome/browser/importer/importer_host.cc @@ -8,7 +8,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/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/importer/importer_unittest_utils.cc b/chrome/browser/importer/importer_unittest_utils.cc index 39cdfc5..c96cf81 100644 --- a/chrome/browser/importer/importer_unittest_utils.cc +++ b/chrome/browser/importer/importer_unittest_utils.cc @@ -4,7 +4,7 @@ #include "chrome/browser/importer/importer_unittest_utils.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/imported_bookmark_entry.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/importer/in_process_importer_bridge.cc b/chrome/browser/importer/in_process_importer_bridge.cc index 977dbe0..6d1dc1d 100644 --- a/chrome/browser/importer/in_process_importer_bridge.cc +++ b/chrome/browser/importer/in_process_importer_bridge.cc @@ -5,7 +5,7 @@ #include "chrome/browser/importer/in_process_importer_bridge.h" #include "base/bind.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/imported_bookmark_entry.h" #include "chrome/browser/favicon/imported_favicon_usage.h" #include "chrome/browser/importer/importer_host.h" diff --git a/chrome/browser/importer/nss_decryptor.cc b/chrome/browser/importer/nss_decryptor.cc index 2c19324..904d9b3 100644 --- a/chrome/browser/importer/nss_decryptor.cc +++ b/chrome/browser/importer/nss_decryptor.cc @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/public/common/password_form.h" #include "sql/connection.h" #include "sql/statement.h" diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index 0d85ae0..136cbd5 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -11,8 +11,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/threading/thread.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/imported_bookmark_entry.h" diff --git a/chrome/browser/importer/profile_writer_unittest.cc b/chrome/browser/importer/profile_writer_unittest.cc index 5494e54..072b327 100644 --- a/chrome/browser/importer/profile_writer_unittest.cc +++ b/chrome/browser/importer/profile_writer_unittest.cc @@ -5,7 +5,7 @@ #include <string> #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/bookmarks/bookmark_title_match.h" diff --git a/chrome/browser/importer/safari_importer.mm b/chrome/browser/importer/safari_importer.mm index e4dceda..678a5eb 100644 --- a/chrome/browser/importer/safari_importer.mm +++ b/chrome/browser/importer/safari_importer.mm @@ -14,8 +14,8 @@ #include "base/memory/scoped_nsobject.h" #include "base/string16.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/imported_bookmark_entry.h" #include "chrome/browser/favicon/favicon_util.h" #include "chrome/browser/favicon/imported_favicon_usage.h" diff --git a/chrome/browser/importer/safari_importer_unittest.mm b/chrome/browser/importer/safari_importer_unittest.mm index f4e288c..2aa248f 100644 --- a/chrome/browser/importer/safari_importer_unittest.mm +++ b/chrome/browser/importer/safari_importer_unittest.mm @@ -12,7 +12,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/imported_bookmark_entry.h" #include "chrome/browser/favicon/imported_favicon_usage.h" #include "chrome/browser/importer/importer_bridge.h" diff --git a/chrome/browser/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc index 9f0596b0..dea1d61 100644 --- a/chrome/browser/importer/toolbar_importer.cc +++ b/chrome/browser/importer/toolbar_importer.cc @@ -10,7 +10,7 @@ #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/imported_bookmark_entry.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/importer/importer_bridge.h" diff --git a/chrome/browser/importer/toolbar_importer_unittest.cc b/chrome/browser/importer/toolbar_importer_unittest.cc index 0660b07..8ff95fe 100644 --- a/chrome/browser/importer/toolbar_importer_unittest.cc +++ b/chrome/browser/importer/toolbar_importer_unittest.cc @@ -9,7 +9,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/bookmarks/imported_bookmark_entry.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/first_run/first_run_internal.h" diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc index fcc6c6e..6167c61 100644 --- a/chrome/browser/intranet_redirect_detector.cc +++ b/chrome/browser/intranet_redirect_detector.cc @@ -10,7 +10,7 @@ #include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/stl_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index fa1b2b5..ac301439 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -18,8 +18,8 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_propvariant.h" #include "base/win/windows_version.h" diff --git a/chrome/browser/managed_mode/managed_mode_browsertest.cc b/chrome/browser/managed_mode/managed_mode_browsertest.cc index 233b7fb..c505db7 100644 --- a/chrome/browser/managed_mode/managed_mode_browsertest.cc +++ b/chrome/browser/managed_mode/managed_mode_browsertest.cc @@ -4,7 +4,7 @@ #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 "base/values.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/history/history_service_factory.h" diff --git a/chrome/browser/managed_mode/managed_mode_interstitial.cc b/chrome/browser/managed_mode/managed_mode_interstitial.cc index c8e283e..d444fca 100644 --- a/chrome/browser/managed_mode/managed_mode_interstitial.cc +++ b/chrome/browser/managed_mode/managed_mode_interstitial.cc @@ -7,7 +7,7 @@ #include "base/i18n/rtl.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 "base/values.h" #include "chrome/browser/managed_mode/managed_user_service.h" #include "chrome/browser/managed_mode/managed_user_service_factory.h" diff --git a/chrome/browser/managed_mode/managed_mode_site_list.cc b/chrome/browser/managed_mode/managed_mode_site_list.cc index d41074b..d516c73 100644 --- a/chrome/browser/managed_mode/managed_mode_site_list.cc +++ b/chrome/browser/managed_mode/managed_mode_site_list.cc @@ -6,7 +6,7 @@ #include "base/json/json_file_value_serializer.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc index 6d2d464..d0c8ec1 100644 --- a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc +++ b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/string16.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/signin/oauth2_token_service.h" #include "google_apis/gaia/gaia_oauth_client.h" diff --git a/chrome/browser/managed_mode/managed_user_service.cc b/chrome/browser/managed_mode/managed_user_service.cc index 13305e8..e6e07ba 100644 --- a/chrome/browser/managed_mode/managed_user_service.cc +++ b/chrome/browser/managed_mode/managed_user_service.cc @@ -9,7 +9,7 @@ #include "base/metrics/field_trial.h" #include "base/prefs/pref_service.h" #include "base/sequenced_task_runner.h" -#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.h" #include "chrome/browser/managed_mode/managed_mode_site_list.h" diff --git a/chrome/browser/managed_mode/managed_user_service_unittest.cc b/chrome/browser/managed_mode/managed_user_service_unittest.cc index 02517aa..caff2c8 100644 --- a/chrome/browser/managed_mode/managed_user_service_unittest.cc +++ b/chrome/browser/managed_mode/managed_user_service_unittest.cc @@ -4,7 +4,7 @@ #include "base/path_service.h" #include "base/prefs/pref_service.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/extensions/unpacked_installer.h" #include "chrome/browser/managed_mode/managed_user_service.h" diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc index 4e96891..c86a147 100644 --- a/chrome/browser/media/media_capture_devices_dispatcher.cc +++ b/chrome/browser/media/media_capture_devices_dispatcher.cc @@ -9,7 +9,7 @@ #include "base/prefs/pref_service.h" #include "base/sha1.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h" #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry_factory.h" #include "chrome/browser/media/audio_stream_indicator.h" diff --git a/chrome/browser/media/media_stream_capture_indicator.cc b/chrome/browser/media/media_stream_capture_indicator.cc index f05fed3..ebb6ab4 100644 --- a/chrome/browser/media/media_stream_capture_indicator.cc +++ b/chrome/browser/media/media_stream_capture_indicator.cc @@ -9,7 +9,7 @@ #include "base/logging.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/browser_process.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/media/media_stream_infobar_delegate.cc b/chrome/browser/media/media_stream_infobar_delegate.cc index 754c25c..eb521c5 100644 --- a/chrome/browser/media/media_stream_infobar_delegate.cc +++ b/chrome/browser/media/media_stream_infobar_delegate.cc @@ -5,7 +5,7 @@ #include "chrome/browser/media/media_stream_infobar_delegate.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/media_galleries/fileapi/itunes_finder_win.cc b/chrome/browser/media_galleries/fileapi/itunes_finder_win.cc index 73bbd23..706b328 100644 --- a/chrome/browser/media_galleries/fileapi/itunes_finder_win.cc +++ b/chrome/browser/media_galleries/fileapi/itunes_finder_win.cc @@ -13,7 +13,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/media_galleries/fileapi/itunes_xml_utils.h" #include "chrome/common/chrome_paths.h" #include "third_party/libxml/chromium/libxml_utils.h" diff --git a/chrome/browser/media_galleries/fileapi/picasa/picasa_album_table_reader.cc b/chrome/browser/media_galleries/fileapi/picasa/picasa_album_table_reader.cc index 86562a2..9c56236 100644 --- a/chrome/browser/media_galleries/fileapi/picasa/picasa_album_table_reader.cc +++ b/chrome/browser/media_galleries/fileapi/picasa/picasa_album_table_reader.cc @@ -8,7 +8,7 @@ #include "base/path_service.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/media_galleries/fileapi/picasa/pmp_column_reader.h" #include "chrome/browser/media_galleries/fileapi/picasa/pmp_constants.h" #include "chrome/browser/media_galleries/fileapi/picasa/pmp_table_reader.h" diff --git a/chrome/browser/media_galleries/fileapi/picasa/pmp_table_reader.cc b/chrome/browser/media_galleries/fileapi/picasa/pmp_table_reader.cc index 943ec3f..cf0b4fd 100644 --- a/chrome/browser/media_galleries/fileapi/picasa/pmp_table_reader.cc +++ b/chrome/browser/media_galleries/fileapi/picasa/pmp_table_reader.cc @@ -9,8 +9,8 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/media_galleries/fileapi/picasa/pmp_column_reader.h" namespace picasa { diff --git a/chrome/browser/media_galleries/fileapi/picasa/pmp_table_reader_unittest.cc b/chrome/browser/media_galleries/fileapi/picasa/pmp_table_reader_unittest.cc index 2dc60a7..91df98b 100644 --- a/chrome/browser/media_galleries/fileapi/picasa/pmp_table_reader_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/picasa/pmp_table_reader_unittest.cc @@ -5,7 +5,7 @@ #include <algorithm> #include <vector> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/media_galleries/fileapi/picasa/pmp_column_reader.h" #include "chrome/browser/media_galleries/fileapi/picasa/pmp_constants.h" #include "chrome/browser/media_galleries/fileapi/picasa/pmp_table_reader.h" diff --git a/chrome/browser/media_galleries/fileapi/picasa/pmp_test_helper.cc b/chrome/browser/media_galleries/fileapi/picasa/pmp_test_helper.cc index b2cf6fa..b2c28c7 100644 --- a/chrome/browser/media_galleries/fileapi/picasa/pmp_test_helper.cc +++ b/chrome/browser/media_galleries/fileapi/picasa/pmp_test_helper.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/media_galleries/fileapi/picasa/pmp_column_reader.h" namespace picasa { diff --git a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc index 5cdc49d..949a1a2 100644 --- a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc +++ b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc @@ -18,8 +18,8 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" -#include "base/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/media_galleries/media_galleries_dialog_controller.cc b/chrome/browser/media_galleries/media_galleries_dialog_controller.cc index 0dfe3b7..cff0820 100644 --- a/chrome/browser/media_galleries/media_galleries_dialog_controller.cc +++ b/chrome/browser/media_galleries/media_galleries_dialog_controller.cc @@ -7,7 +7,7 @@ #include "base/i18n/time_formatting.h" #include "base/path_service.h" #include "base/stl_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/media_galleries/media_file_system_registry.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc index a0686540f..f073ad3 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences.cc @@ -9,7 +9,7 @@ #include "base/stl_util.h" #include "base/string16.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.h" diff --git a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc index ad540c1..03d145b 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.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_system.h" #include "chrome/browser/extensions/test_extension_system.h" diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc index e6f83b5..4ef2514 100644 --- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc +++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc @@ -18,10 +18,10 @@ #include "base/stl_util.h" #include "base/string_util.h" #include "base/strings/string_split.h" +#include "base/strings/utf_string_conversions.h" #include "base/task_runner_util.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/thread_restrictions.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/media_galleries/win/mtp_device_object_entry.h" #include "chrome/browser/media_galleries/win/mtp_device_object_enumerator.h" #include "chrome/browser/media_galleries/win/mtp_device_operations_util.h" diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index 3571453..d300cdc 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -10,7 +10,7 @@ #include "base/process_util.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/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/memory_details_linux.cc b/chrome/browser/memory_details_linux.cc index 555fa17..e02aeb2 100644 --- a/chrome/browser/memory_details_linux.cc +++ b/chrome/browser/memory_details_linux.cc @@ -13,7 +13,7 @@ #include "base/bind.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 "chrome/common/chrome_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/process_type.h" diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc index 1a40120..ebba44e 100644 --- a/chrome/browser/memory_details_mac.cc +++ b/chrome/browser/memory_details_mac.cc @@ -14,8 +14,8 @@ #include "base/mac/mac_util.h" #include "base/process_util.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/process_info_snapshot.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_version_info.h" diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc index 30cf64f..72e42eb 100644 --- a/chrome/browser/memory_details_win.cc +++ b/chrome/browser/memory_details_win.cc @@ -10,7 +10,7 @@ #include "base/file_version_info.h" #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 "base/win/scoped_handle.h" #include "base/win/windows_version.h" #include "chrome/common/chrome_version_info.h" diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc index 21356fd..1aaeda0 100644 --- a/chrome/browser/metrics/metrics_log.cc +++ b/chrome/browser/metrics/metrics_log.cc @@ -18,11 +18,11 @@ #include "base/profiler/alternate_timer.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/sys_info.h" #include "base/third_party/nspr/prtime.h" #include "base/time.h" #include "base/tracked_objects.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/autocomplete_provider.h" diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index 410dbb5..cf07d98 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -164,11 +164,11 @@ #include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "base/tracked_objects.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/mouseleave_browsertest.cc b/chrome/browser/mouseleave_browsertest.cc index 87b1b7e..47dd69db 100644 --- a/chrome/browser/mouseleave_browsertest.cc +++ b/chrome/browser/mouseleave_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/files/file_path.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/nacl_host/nacl_file_host.cc b/chrome/browser/nacl_host/nacl_file_host.cc index 9ec7890..67d1a39 100644 --- a/chrome/browser/nacl_host/nacl_file_host.cc +++ b/chrome/browser/nacl_host/nacl_file_host.cc @@ -9,8 +9,8 @@ #include "base/files/file_path.h" #include "base/path_service.h" #include "base/platform_file.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_info_map.h" #include "chrome/browser/nacl_host/nacl_browser.h" #include "chrome/browser/renderer_host/chrome_render_message_filter.h" diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 037006d..9c9f1af 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -19,7 +19,7 @@ #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/windows_version.h" #include "build/build_config.h" #include "chrome/browser/extensions/extension_info_map.h" diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc index 0bbcb10..6725699 100644 --- a/chrome/browser/net/connection_tester.cc +++ b/chrome/browser/net/connection_tester.cc @@ -10,9 +10,9 @@ #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" +#include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" #include "base/threading/thread_restrictions.h" -#include "base/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" #include "content/public/browser/browser_thread.h" #include "net/base/io_buffer.h" diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc index 75e157b..7473257 100644 --- a/chrome/browser/net/proxy_browsertest.cc +++ b/chrome/browser/net/proxy_browsertest.cc @@ -6,7 +6,7 @@ #include "base/path_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/ui/browser.h" #include "chrome/browser/ui/login/login_prompt.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy.cc b/chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy.cc index 0cd9df4..3c2ec18 100644 --- a/chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy.cc +++ b/chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy.cc @@ -9,7 +9,7 @@ #include "base/i18n/icu_string_conversions.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 "net/base/net_errors.h" #include "net/http/http_auth.h" #include "net/http/http_request_info.h" diff --git a/chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy_unittest.cc b/chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy_unittest.cc index 4a59ba1..ed4f1e9 100644 --- a/chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy_unittest.cc +++ b/chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy_unittest.cc @@ -9,7 +9,7 @@ #include "base/basictypes.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 "net/base/net_errors.h" #include "net/http/http_request_info.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/net/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc index c16268a..ef3c5628 100644 --- a/chrome/browser/net/url_fixer_upper.cc +++ b/chrome/browser/net/url_fixer_upper.cc @@ -12,7 +12,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/common/url_constants.h" #include "googleurl/src/url_file.h" #include "googleurl/src/url_parse.h" diff --git a/chrome/browser/net/url_fixer_upper_unittest.cc b/chrome/browser/net/url_fixer_upper_unittest.cc index 491d478..1119933 100644 --- a/chrome/browser/net/url_fixer_upper_unittest.cc +++ b/chrome/browser/net/url_fixer_upper_unittest.cc @@ -8,11 +8,11 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/common/chrome_paths.h" -#include "googleurl/src/url_parse.h" #include "googleurl/src/gurl.h" +#include "googleurl/src/url_parse.h" #include "net/base/net_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/net/websocket_browsertest.cc b/chrome/browser/net/websocket_browsertest.cc index a29b924..4eb13ce 100644 --- a/chrome/browser/net/websocket_browsertest.cc +++ b/chrome/browser/net/websocket_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #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/tabs/tab_strip_model.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index 3479ade..3df5858 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -5,8 +5,8 @@ #include "chrome/browser/notifications/desktop_notification_service.h" #include "base/metrics/histogram.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/content_settings_details.h" #include "chrome/browser/content_settings/content_settings_provider.h" diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc index dfc9967..572022f 100644 --- a/chrome/browser/notifications/desktop_notifications_unittest.cc +++ b/chrome/browser/notifications/desktop_notifications_unittest.cc @@ -6,7 +6,7 @@ #include "base/prefs/testing_pref_service.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/notifications/balloon_notification_ui_manager.h" #include "chrome/browser/notifications/fake_balloon_view.h" #include "chrome/browser/prefs/browser_prefs.h" diff --git a/chrome/browser/notifications/message_center_notifications_browsertest.cc b/chrome/browser/notifications/message_center_notifications_browsertest.cc index eb4048d..ddf5100 100644 --- a/chrome/browser/notifications/message_center_notifications_browsertest.cc +++ b/chrome/browser/notifications/message_center_notifications_browsertest.cc @@ -9,7 +9,7 @@ #include "base/run_loop.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/browser_process.h" #include "chrome/browser/notifications/message_center_notification_manager.h" #include "chrome/browser/notifications/notification.h" diff --git a/chrome/browser/notifications/message_center_settings_controller.cc b/chrome/browser/notifications/message_center_settings_controller.cc index 65905a4..ea52be7 100644 --- a/chrome/browser/notifications/message_center_settings_controller.cc +++ b/chrome/browser/notifications/message_center_settings_controller.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/i18n/string_compare.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/app_icon_loader_impl.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/favicon/favicon_service.h" diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc index 853bb2f..f490119 100644 --- a/chrome/browser/notifications/notification_browsertest.cc +++ b/chrome/browser/notifications/notification_browsertest.cc @@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/run_loop.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/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar_service.h" diff --git a/chrome/browser/notifications/notification_options_menu_model.cc b/chrome/browser/notifications/notification_options_menu_model.cc index b5d79fb..3d2cbea 100644 --- a/chrome/browser/notifications/notification_options_menu_model.cc +++ b/chrome/browser/notifications/notification_options_menu_model.cc @@ -7,7 +7,7 @@ #include <string> #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/notifications/balloon.h" diff --git a/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc b/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc index d3037f1..5ad3b95 100644 --- a/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc +++ b/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc @@ -5,7 +5,7 @@ #include <map> #include "base/memory/scoped_ptr.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_test_util.h" diff --git a/chrome/browser/notifications/sync_notifier/synced_notification.cc b/chrome/browser/notifications/sync_notifier/synced_notification.cc index 015eb1d..e918c8b 100644 --- a/chrome/browser/notifications/sync_notifier/synced_notification.cc +++ b/chrome/browser/notifications/sync_notifier/synced_notification.cc @@ -5,8 +5,8 @@ #include "chrome/browser/notifications/sync_notifier/synced_notification.h" #include "base/basictypes.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/notifications/notification.h" diff --git a/chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc b/chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc index 3dc4fa6..f1f94838 100644 --- a/chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc +++ b/chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc @@ -6,7 +6,7 @@ #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 "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_test_util.h" #include "chrome/browser/notifications/notification_ui_manager.h" diff --git a/chrome/browser/page_cycler/page_cycler.cc b/chrome/browser/page_cycler/page_cycler.cc index b78e1fe..4912fe7 100644 --- a/chrome/browser/page_cycler/page_cycler.cc +++ b/chrome/browser/page_cycler/page_cycler.cc @@ -11,7 +11,7 @@ #include "base/process_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/page_cycler/page_cycler_unittest.cc b/chrome/browser/page_cycler/page_cycler_unittest.cc index 7fcd667..93cecb0 100644 --- a/chrome/browser/page_cycler/page_cycler_unittest.cc +++ b/chrome/browser/page_cycler/page_cycler_unittest.cc @@ -7,8 +7,8 @@ #include "base/prefs/testing_pref_service.h" #include "base/string_util.h" #include "base/strings/string_split.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" -#include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/page_cycler/page_cycler.h" diff --git a/chrome/browser/parsers/metadata_parser_filebase.cc b/chrome/browser/parsers/metadata_parser_filebase.cc index 56207e1..17e3f5b 100644 --- a/chrome/browser/parsers/metadata_parser_filebase.cc +++ b/chrome/browser/parsers/metadata_parser_filebase.cc @@ -6,7 +6,7 @@ #include "base/file_util.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" FileMetadataParser::FileMetadataParser(const base::FilePath& path) : MetadataParser(path), diff --git a/chrome/browser/parsers/metadata_parser_jpeg_factory.cc b/chrome/browser/parsers/metadata_parser_jpeg_factory.cc index 366ded3..8a2b51e 100644 --- a/chrome/browser/parsers/metadata_parser_jpeg_factory.cc +++ b/chrome/browser/parsers/metadata_parser_jpeg_factory.cc @@ -5,7 +5,7 @@ #include "chrome/browser/parsers/metadata_parser_jpeg_factory.h" #include "base/files/file_path.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/parsers/metadata_parser_jpeg.h" MetadataParserJpegFactory::MetadataParserJpegFactory() diff --git a/chrome/browser/password_manager/login_database.cc b/chrome/browser/password_manager/login_database.cc index ff431de..4327728 100644 --- a/chrome/browser/password_manager/login_database.cc +++ b/chrome/browser/password_manager/login_database.cc @@ -13,8 +13,8 @@ #include "base/metrics/histogram.h" #include "base/pickle.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 "sql/statement.h" #include "sql/transaction.h" diff --git a/chrome/browser/password_manager/login_database_posix.cc b/chrome/browser/password_manager/login_database_posix.cc index fa884c2..99eb621 100644 --- a/chrome/browser/password_manager/login_database_posix.cc +++ b/chrome/browser/password_manager/login_database_posix.cc @@ -4,7 +4,7 @@ #include "chrome/browser/password_manager/login_database.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" // TODO: Actually encrypt passwords on Linux. diff --git a/chrome/browser/password_manager/login_database_unittest.cc b/chrome/browser/password_manager/login_database_unittest.cc index ceeaeaa..7c1b52d 100644 --- a/chrome/browser/password_manager/login_database_unittest.cc +++ b/chrome/browser/password_manager/login_database_unittest.cc @@ -8,8 +8,8 @@ #include "base/files/scoped_temp_dir.h" #include "base/path_service.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/password_manager/login_database.h" #include "chrome/common/chrome_paths.h" #include "content/public/common/password_form.h" diff --git a/chrome/browser/password_manager/native_backend_gnome_x.cc b/chrome/browser/password_manager/native_backend_gnome_x.cc index 5460655..29bd116 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x.cc +++ b/chrome/browser/password_manager/native_backend_gnome_x.cc @@ -16,9 +16,9 @@ #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread; diff --git a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc index 25cce09..814e380 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc @@ -9,8 +9,8 @@ #include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/native_backend_gnome_x.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc index f502a3c..740def1 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc @@ -11,8 +11,8 @@ #include "base/pickle.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/native_backend_kwallet_x.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/password_manager/password_form_data.cc b/chrome/browser/password_manager/password_form_data.cc index c2c9a01..4397f8c 100644 --- a/chrome/browser/password_manager/password_form_data.cc +++ b/chrome/browser/password_manager/password_form_data.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/password_manager/password_form_data.h" using content::PasswordForm; diff --git a/chrome/browser/password_manager/password_form_manager_unittest.cc b/chrome/browser/password_manager/password_form_manager_unittest.cc index f42f909..df6b482 100644 --- a/chrome/browser/password_manager/password_form_manager_unittest.cc +++ b/chrome/browser/password_manager/password_form_manager_unittest.cc @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/password_manager/password_form_manager.h" #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/password_manager/password_manager_delegate.h" diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc index d13c4ba..df0a03c 100644 --- a/chrome/browser/password_manager/password_manager.cc +++ b/chrome/browser/password_manager/password_manager.cc @@ -8,8 +8,8 @@ #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/platform_thread.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_form_manager.h" #include "chrome/browser/password_manager/password_manager_delegate.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/password_manager/password_manager_delegate_impl.cc b/chrome/browser/password_manager/password_manager_delegate_impl.cc index 132d724..989d918 100644 --- a/chrome/browser/password_manager/password_manager_delegate_impl.cc +++ b/chrome/browser/password_manager/password_manager_delegate_impl.cc @@ -6,7 +6,7 @@ #include "base/memory/singleton.h" #include "base/metrics/histogram.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/password_manager/password_form_manager.h" diff --git a/chrome/browser/password_manager/password_manager_unittest.cc b/chrome/browser/password_manager/password_manager_unittest.cc index 3dd46df..c9aa529 100644 --- a/chrome/browser/password_manager/password_manager_unittest.cc +++ b/chrome/browser/password_manager/password_manager_unittest.cc @@ -6,7 +6,7 @@ #include "base/message_loop.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/password_manager/mock_password_store.h" #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/password_manager/password_manager_delegate.h" diff --git a/chrome/browser/password_manager/password_store_default_unittest.cc b/chrome/browser/password_manager/password_store_default_unittest.cc index 69dfbe5..b4e7312 100644 --- a/chrome/browser/password_manager/password_store_default_unittest.cc +++ b/chrome/browser/password_manager/password_store_default_unittest.cc @@ -8,9 +8,9 @@ #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_form_data.h" #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/browser/password_manager/password_store_consumer.h" diff --git a/chrome/browser/password_manager/password_store_mac.cc b/chrome/browser/password_manager/password_store_mac.cc index 5d18ff2..afbf4a0 100644 --- a/chrome/browser/password_manager/password_store_mac.cc +++ b/chrome/browser/password_manager/password_store_mac.cc @@ -17,7 +17,7 @@ #include "base/message_loop.h" #include "base/stl_util.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/password_manager/login_database.h" #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/password_manager/password_store_mac_unittest.cc b/chrome/browser/password_manager/password_store_mac_unittest.cc index 4dcef68..23d0ed4 100644 --- a/chrome/browser/password_manager/password_store_mac_unittest.cc +++ b/chrome/browser/password_manager/password_store_mac_unittest.cc @@ -10,7 +10,7 @@ #include "base/path_service.h" #include "base/stl_util.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/password_manager/password_store_consumer.h" #include "chrome/browser/password_manager/password_store_mac.h" #include "chrome/browser/password_manager/password_store_mac_internal.h" diff --git a/chrome/browser/password_manager/password_store_win.cc b/chrome/browser/password_manager/password_store_win.cc index acb8066..489ef36 100644 --- a/chrome/browser/password_manager/password_store_win.cc +++ b/chrome/browser/password_manager/password_store_win.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/webdata/web_data_service.h" diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index a6b5bc3..4b9cd96 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/chrome/browser/password_manager/password_store_x_unittest.cc @@ -12,9 +12,9 @@ #include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_form_data.h" #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/browser/password_manager/password_store_consumer.h" |