From be1ce6a7b2fa7e9622e5b249abd5fab478b6ca05 Mon Sep 17 00:00:00 2001
From: "brettw@chromium.org"
<brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 3 Aug 2010 14:35:22 +0000
Subject: [PATCH] Add #include utf_string_conversions.h to all files that use
ASCIIToWide and ASCIIToUTF16. I removed string_util includes from a few
places where it obviously wasn't needed.
In a separate pass, I'm going to remove ASCIITo* from string_util, then I'm
going to do an even later pass to find the unnecessary string_util.h includes
and remove them.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3058027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54746 0039d316-1c4b-4281-b951-d872f2087c98
---
app/clipboard/clipboard_win.cc | 4 ++--
app/l10n_util.cc | 1 +
app/l10n_util_unittest.cc | 1 +
base/file_util_win.cc | 1 +
base/native_library_win.cc | 2 +-
base/process_util_unittest.cc | 3 ++-
base/string16_unittest.cc | 1 +
base/values_unittest.cc | 1 +
chrome/browser/autocomplete/autocomplete_browsertest.cc | 1 +
chrome/browser/autocomplete_history_manager.cc | 3 ++-
chrome/browser/autocomplete_history_manager_unittest.cc | 1 +
chrome/browser/autofill/address_field.cc | 1 +
chrome/browser/autofill/address_field_unittest.cc | 1 +
chrome/browser/autofill/autofill_common_unittest.cc | 1 +
chrome/browser/autofill/autofill_download_unittest.cc | 1 +
chrome/browser/autofill/autofill_field_unittest.cc | 1 +
chrome/browser/autofill/autofill_manager.cc | 1 +
chrome/browser/autofill/autofill_manager_unittest.cc | 1 +
chrome/browser/autofill/autofill_profile_unittest.cc | 1 +
chrome/browser/autofill/contact_info.cc | 1 +
chrome/browser/autofill/contact_info_unittest.cc | 1 +
chrome/browser/autofill/credit_card_field.cc | 1 +
chrome/browser/autofill/credit_card_field_unittest.cc | 1 +
chrome/browser/autofill/credit_card_unittest.cc | 1 +
chrome/browser/autofill/fax_field.cc | 1 +
chrome/browser/autofill/fax_field_unittest.cc | 1 +
chrome/browser/autofill/form_field.cc | 1 +
chrome/browser/autofill/name_field.cc | 1 +
chrome/browser/autofill/name_field_unittest.cc | 1 +
chrome/browser/autofill/personal_data_manager_unittest.cc | 1 +
chrome/browser/autofill/phone_field.cc | 1 +
chrome/browser/autofill/phone_field_unittest.cc | 1 +
chrome/browser/autofill/phone_number_unittest.cc | 1 +
chrome/browser/autofill/select_control_handler.cc | 1 +
chrome/browser/back_forward_menu_model_unittest.cc | 1 +
chrome/browser/bookmarks/bookmark_drag_data.cc | 1 +
chrome/browser/bookmarks/bookmark_utils_unittest.cc | 1 +
chrome/browser/browser_about_handler.cc | 1 +
chrome/browser/browser_browsertest.cc | 1 +
chrome/browser/browser_focus_uitest.cc | 1 +
chrome/browser/browser_init.cc | 1 +
chrome/browser/browser_main.cc | 1 +
chrome/browser/browser_main_win.cc | 1 +
chrome/browser/browsing_data_database_helper_browsertest.cc | 1 +
chrome/browser/character_encoding.cc | 1 +
.../chromeos/dom_ui/language_hangul_options_handler.cc | 1 +
chrome/browser/chromeos/dom_ui/language_options_util.h | 2 +-
chrome/browser/chromeos/login/account_screen.cc | 1 +
chrome/browser/chromeos/network_list.cc | 1 +
chrome/browser/chromeos/network_message_observer.cc | 1 +
.../chromeos/notifications/desktop_notifications_unittest.cc | 1 +
chrome/browser/chromeos/options/cellular_config_view.cc | 1 +
chrome/browser/chromeos/options/internet_page_view.cc | 1 +
chrome/browser/chromeos/options/ip_config_view.cc | 1 +
chrome/browser/chromeos/options/network_config_view.cc | 1 +
chrome/browser/chromeos/panels/panel_scroller.cc | 1 +
chrome/browser/chromeos/status/network_menu_button.cc | 1 +
chrome/browser/chromeos/status/power_menu_button.cc | 1 +
chrome/browser/configuration_policy_pref_store.cc | 1 +
chrome/browser/diagnostics/sqlite_diagnostics.cc | 1 +
chrome/browser/dom_ui/filebrowse_ui.cc | 1 +
chrome/browser/extensions/extension_omnibox_apitest.cc | 1 +
chrome/browser/extensions/extensions_service_unittest.cc | 1 +
chrome/browser/extensions/extensions_ui.cc | 1 +
.../browser/extensions/external_pref_extension_provider.cc | 1 +
.../extensions/external_registry_extension_provider_win.cc | 1 +
chrome/browser/external_protocol_handler.cc | 1 +
chrome/browser/find_backend_unittest.cc | 1 +
chrome/browser/find_bar_host_browsertest.cc | 1 +
chrome/browser/geolocation/access_token_store_browsertest.cc | 1 +
chrome/browser/geolocation/network_location_provider.cc | 1 +
chrome/browser/geolocation/network_location_request.cc | 1 +
.../geolocation/wifi_data_provider_common_unittest.cc | 1 +
chrome/browser/gtk/status_icons/status_tray_gtk_unittest.cc | 1 +
chrome/browser/history/history_publisher_win.cc | 1 +
chrome/browser/history/top_sites_unittest.cc | 1 +
chrome/browser/importer/importer_bridge.cc | 1 +
chrome/browser/importer/toolbar_importer_unittest.cc | 1 +
chrome/browser/memory_details_linux.cc | 1 +
chrome/browser/nacl_host/nacl_process_host.cc | 1 +
chrome/browser/password_manager/login_database_posix.cc | 5 +++--
chrome/browser/password_manager/login_database_unittest.cc | 2 +-
.../password_manager/password_form_manager_unittest.cc | 1 +
chrome/browser/password_manager/password_manager_unittest.cc | 1 +
chrome/browser/password_manager/password_store_win.cc | 1 +
chrome/browser/platform_util_win.cc | 1 +
chrome/browser/plugin_service.cc | 1 +
chrome/browser/printing/print_dialog_cloud_unittest.cc | 1 +
chrome/browser/process_singleton_linux_uitest.cc | 1 +
chrome/browser/rlz/rlz.cc | 1 +
chrome/browser/sessions/session_service_unittest.cc | 1 +
chrome/browser/shell_integration_unittest.cc | 1 +
chrome/browser/spellchecker_platform_engine_unittest.cc | 1 +
chrome/browser/status_icons/status_tray_manager.cc | 1 +
chrome/browser/status_icons/status_tray_unittest.cc | 1 +
chrome/browser/sync/profile_sync_service.cc | 1 +
chrome/browser/sync/profile_sync_service_unittest.cc | 1 +
.../browser/tab_contents/navigation_controller_unittest.cc | 1 +
chrome/browser/tab_contents/navigation_entry_unittest.cc | 1 +
chrome/browser/tab_contents/web_contents_unittest.cc | 1 +
chrome/browser/views/about_ipc_dialog.cc | 1 +
.../views/accessibility_event_router_views_unittest.cc | 1 +
.../browser/views/browser_views_accessibility_browsertest.cc | 1 +
chrome/browser/views/find_bar_host_interactive_uitest.cc | 1 +
chrome/browser/views/generic_info_view_unittest.cc | 1 +
chrome/browser/views/ssl_client_certificate_selector_win.cc | 1 +
.../browser/views/status_icons/status_tray_win_unittest.cc | 1 +
chrome/browser/views/task_manager_view.cc | 1 +
chrome/browser/web_applications/web_app_unittest.cc | 1 +
chrome/browser/webdata/web_data_service_unittest.cc | 1 +
chrome/browser/webdata/web_database_unittest.cc | 1 +
chrome/browser/worker_host/worker_process_host.cc | 1 +
chrome/browser/zygote_host_linux.cc | 1 +
chrome/common/child_process_logging_linux.cc | 1 +
.../common/extensions/extension_message_bundle_unittest.cc | 1 +
chrome/common/gpu_plugin.cc | 1 +
chrome/common/metrics_helpers.cc | 1 -
chrome/common/plugin_group_unittest.cc | 1 +
chrome/common/render_messages_unittest.cc | 1 +
chrome/default_plugin/plugin_impl_win.cc | 1 +
chrome/installer/setup/setup_main.cc | 1 +
chrome/installer/util/shell_util.cc | 1 +
chrome/renderer/form_manager.cc | 1 +
chrome/renderer/form_manager_unittest.cc | 1 +
chrome/renderer/localized_error.cc | 1 +
chrome/renderer/password_autocomplete_manager_unittest.cc | 1 +
chrome/renderer/pepper_devices_unittest.cc | 1 +
chrome/renderer/render_process_impl.cc | 1 +
chrome/renderer/render_thread.cc | 1 +
chrome/renderer/render_view.cc | 1 +
chrome/renderer/render_view_unittest.cc | 1 +
chrome/renderer/renderer_webkitclient_impl.cc | 1 +
chrome/renderer/translate_helper.cc | 1 +
chrome/renderer/webplugin_delegate_proxy.cc | 1 +
chrome/test/live_sync/two_client_live_autofill_sync_test.cc | 1 +
chrome/test/startup/startup_test.cc | 1 +
chrome/test/ui/omnibox_uitest.cc | 1 +
chrome/test/ui/ui_test.cc | 1 +
chrome_frame/http_negotiate.cc | 1 +
chrome_frame/simple_resource_loader.cc | 1 +
chrome_frame/test/http_negotiate_unittest.cc | 1 +
chrome_frame/test/test_with_web_server.h | 1 +
chrome_frame/urlmon_moniker.cc | 1 +
chrome_frame/urlmon_url_request.cc | 1 +
courgette/encoded_program.cc | 2 +-
ipc/ipc_channel_win.cc | 1 +
ipc/ipc_message_utils.h | 2 +-
net/ftp/ftp_auth_cache_unittest.cc | 1 +
net/ftp/ftp_directory_listing_parser_vms.cc | 2 +-
net/ftp/ftp_directory_listing_parser_vms_unittest.cc | 1 +
net/ftp/ftp_network_transaction_unittest.cc | 1 +
net/http/http_auth_cache_unittest.cc | 1 +
net/http/http_auth_handler_basic_unittest.cc | 1 +
net/http/http_auth_handler_digest_unittest.cc | 1 +
net/http/http_auth_handler_negotiate_unittest.cc | 1 +
net/http/http_auth_handler_unittest.cc | 1 +
net/http/http_network_transaction_unittest.cc | 1 +
net/http/url_security_manager_win.cc | 1 +
net/proxy/multi_threaded_proxy_resolver_unittest.cc | 1 +
net/proxy/proxy_resolver_winhttp.cc | 1 +
net/proxy/proxy_script_fetcher_unittest.cc | 1 +
net/proxy/proxy_service_unittest.cc | 1 +
net/socket/ssl_client_socket_pool_unittest.cc | 1 +
net/socket/ssl_client_socket_win.cc | 1 +
net/socket_stream/socket_stream_unittest.cc | 1 +
net/tools/dump_cache/cache_dumper.cc | 1 +
net/url_request/url_request_unittest.cc | 1 +
skia/ext/vector_canvas_unittest.cc | 1 +
tools/memory_watcher/memory_watcher.cc | 1 +
views/view_unittest.cc | 1 +
webkit/database/database_util_unittest.cc | 2 +-
webkit/database/databases_table_unittest.cc | 1 +
webkit/database/quota_table_unittest.cc | 1 +
webkit/glue/dom_operations_unittest.cc | 1 +
webkit/glue/plugins/plugin_host.cc | 1 +
webkit/glue/plugins/plugin_lib_unittest.cc | 1 +
webkit/glue/plugins/test/plugin_geturl_test.cc | 1 +
webkit/glue/simple_webmimeregistry_impl.cc | 1 +
webkit/glue/webpasswordautocompletelistener_unittest.cc | 1 +
webkit/support/test_webkit_client.cc | 1 +
webkit/tools/test_shell/mock_spellcheck.cc | 1 +
webkit/tools/test_shell/simple_database_system.cc | 1 +
webkit/tools/test_shell/test_shell_webkit_init.h | 1 +
183 files changed, 187 insertions(+), 14 deletions(-)
diff --git a/app/clipboard/clipboard_win.cc b/app/clipboard/clipboard_win.cc
index 393907da7e7c2..1a4d1c839bef3 100644
--- a/app/clipboard/clipboard_win.cc
+++ b/app/clipboard/clipboard_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -16,7 +16,7 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/shared_memory.h"
-#include "base/string_util.h" // Remove when ASCIIToWide is in utf_string_...
+#include "base/string_util.h"
#include "base/string_number_conversions.h"
#include "base/utf_string_conversions.h"
#include "gfx/size.h"
diff --git a/app/l10n_util.cc b/app/l10n_util.cc
index b3e550f65902f..0837c0220bf61 100644
--- a/app/l10n_util.cc
+++ b/app/l10n_util.cc
@@ -18,6 +18,7 @@
#include "base/string16.h"
#include "base/string_number_conversions.h"
#include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
#include "build/build_config.h"
#include "gfx/canvas.h"
#include "unicode/rbbi.h"
diff --git a/app/l10n_util_unittest.cc b/app/l10n_util_unittest.cc
index 8d26b92666025..2341559ab070d 100644
--- a/app/l10n_util_unittest.cc
+++ b/app/l10n_util_unittest.cc
@@ -20,6 +20,7 @@
#include "base/path_service.h"
#include "base/stl_util-inl.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#if defined(OS_WIN)
#include "base/win_util.h"
#endif
diff --git a/base/file_util_win.cc b/base/file_util_win.cc
index aa965bf0982d3..4adab2c194f51 100644
--- a/base/file_util_win.cc
+++ b/base/file_util_win.cc
@@ -20,6 +20,7 @@
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "base/win_util.h"
namespace file_util {
diff --git a/base/native_library_win.cc b/base/native_library_win.cc
index 1c7accf5f7109..94e4b63a466a0 100644
--- a/base/native_library_win.cc
+++ b/base/native_library_win.cc
@@ -7,7 +7,7 @@
#include <windows.h>
#include "base/file_util.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
namespace base {
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc
index 92031c97b8117..8da89b0928400 100644
--- a/base/process_util_unittest.cc
+++ b/base/process_util_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -14,6 +14,7 @@
#include "base/platform_thread.h"
#include "base/process_util.h"
#include "base/scoped_ptr.h"
+#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_LINUX)
diff --git a/base/string16_unittest.cc b/base/string16_unittest.cc
index 69eed4b003c67..06b3dcac2fa4e 100644
--- a/base/string16_unittest.cc
+++ b/base/string16_unittest.cc
@@ -5,6 +5,7 @@
#include <sstream>
#include "base/string16.h"
+#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#if defined(WCHAR_T_IS_UTF32)
diff --git a/base/values_unittest.cc b/base/values_unittest.cc
index 71eec5e2b5d02..f0b9d9e7fa0fe 100644
--- a/base/values_unittest.cc
+++ b/base/values_unittest.cc
@@ -7,6 +7,7 @@
#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "base/string16.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc
index 1a9bd606d9f98..f567d6b087931 100644
--- a/chrome/browser/autocomplete/autocomplete_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autocomplete/autocomplete.h"
#include "chrome/browser/autocomplete/autocomplete_edit.h"
#include "chrome/browser/autocomplete/autocomplete_edit_view.h"
diff --git a/chrome/browser/autocomplete_history_manager.cc b/chrome/browser/autocomplete_history_manager.cc
index c46217e687ebb..ca592d2d0ee2c 100644
--- a/chrome/browser/autocomplete_history_manager.cc
+++ b/chrome/browser/autocomplete_history_manager.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -8,6 +8,7 @@
#include "base/string16.h"
#include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/credit_card.h"
#include "chrome/browser/pref_service.h"
#include "chrome/browser/profile.h"
diff --git a/chrome/browser/autocomplete_history_manager_unittest.cc b/chrome/browser/autocomplete_history_manager_unittest.cc
index 3ff269611da67..591d096c4a4a0 100644
--- a/chrome/browser/autocomplete_history_manager_unittest.cc
+++ b/chrome/browser/autocomplete_history_manager_unittest.cc
@@ -7,6 +7,7 @@
#include "base/ref_counted.h"
#include "base/string16.h"
#include "base/task.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autocomplete_history_manager.h"
#include "chrome/browser/webdata/web_data_service.h"
#include "chrome/test/testing_profile.h"
diff --git a/chrome/browser/autofill/address_field.cc b/chrome/browser/autofill/address_field.cc
index 8ffb656e2d8c2..4d52a4ceccb99 100644
--- a/chrome/browser/autofill/address_field.cc
+++ b/chrome/browser/autofill/address_field.cc
@@ -8,6 +8,7 @@
#include "base/scoped_ptr.h"
#include "base/string16.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_field.h"
bool AddressField::GetFieldInfo(FieldTypeMap* field_type_map) const {
diff --git a/chrome/browser/autofill/address_field_unittest.cc b/chrome/browser/autofill/address_field_unittest.cc
index 2778ee3a8545e..1850f4c7863e6 100644
--- a/chrome/browser/autofill/address_field_unittest.cc
+++ b/chrome/browser/autofill/address_field_unittest.cc
@@ -4,6 +4,7 @@
#include "base/scoped_ptr.h"
#include "base/scoped_vector.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/address_field.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/glue/form_field.h"
diff --git a/chrome/browser/autofill/autofill_common_unittest.cc b/chrome/browser/autofill/autofill_common_unittest.cc
index b7997ccafc5f2..441379b2bbe11 100644
--- a/chrome/browser/autofill/autofill_common_unittest.cc
+++ b/chrome/browser/autofill/autofill_common_unittest.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/autofill/autofill_common_unittest.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_profile.h"
#include "chrome/browser/autofill/credit_card.h"
#include "webkit/glue/form_field.h"
diff --git a/chrome/browser/autofill/autofill_download_unittest.cc b/chrome/browser/autofill/autofill_download_unittest.cc
index 3074ecd18c9e3..4e8132366d235 100644
--- a/chrome/browser/autofill/autofill_download_unittest.cc
+++ b/chrome/browser/autofill/autofill_download_unittest.cc
@@ -5,6 +5,7 @@
#include <list>
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_download.h"
#include "chrome/common/net/test_url_fetcher_factory.h"
#include "chrome/test/testing_profile.h"
diff --git a/chrome/browser/autofill/autofill_field_unittest.cc b/chrome/browser/autofill/autofill_field_unittest.cc
index 48d29ec669f3c..712ddf88ce13a 100644
--- a/chrome/browser/autofill/autofill_field_unittest.cc
+++ b/chrome/browser/autofill/autofill_field_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_field.h"
#include "chrome/browser/autofill/field_types.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc
index a3a2bfb6a1a1f..0d935ce889dc7 100644
--- a/chrome/browser/autofill/autofill_manager.cc
+++ b/chrome/browser/autofill/autofill_manager.cc
@@ -9,6 +9,7 @@
#include "base/basictypes.h"
#include "base/string16.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_dialog.h"
#include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
#include "chrome/browser/autofill/form_structure.h"
diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc
index a44311ed9bea8..f54f23ddba54b 100644
--- a/chrome/browser/autofill/autofill_manager_unittest.cc
+++ b/chrome/browser/autofill/autofill_manager_unittest.cc
@@ -9,6 +9,7 @@
#include "base/scoped_vector.h"
#include "base/string16.h"
#include "base/tuple.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_common_unittest.h"
#include "chrome/browser/autofill/autofill_manager.h"
#include "chrome/browser/autofill/autofill_profile.h"
diff --git a/chrome/browser/autofill/autofill_profile_unittest.cc b/chrome/browser/autofill/autofill_profile_unittest.cc
index 59505850a3dc7..81dadb579d74d 100644
--- a/chrome/browser/autofill/autofill_profile_unittest.cc
+++ b/chrome/browser/autofill/autofill_profile_unittest.cc
@@ -6,6 +6,7 @@
#include "base/scoped_ptr.h"
#include "base/stl_util-inl.h"
#include "base/string16.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_common_unittest.h"
#include "chrome/browser/autofill/autofill_profile.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/autofill/contact_info.cc b/chrome/browser/autofill/contact_info.cc
index 0709a246d5df7..f38f0496f54ff 100644
--- a/chrome/browser/autofill/contact_info.cc
+++ b/chrome/browser/autofill/contact_info.cc
@@ -6,6 +6,7 @@
#include "base/basictypes.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_type.h"
#include "chrome/browser/autofill/field_types.h"
diff --git a/chrome/browser/autofill/contact_info_unittest.cc b/chrome/browser/autofill/contact_info_unittest.cc
index 139c2423b5e96..0ce9cecbcc323 100644
--- a/chrome/browser/autofill/contact_info_unittest.cc
+++ b/chrome/browser/autofill/contact_info_unittest.cc
@@ -6,6 +6,7 @@
#include "base/basictypes.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_type.h"
#include "chrome/browser/autofill/field_types.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/autofill/credit_card_field.cc b/chrome/browser/autofill/credit_card_field.cc
index 235bdf037ff89..7bf8db6ce5930 100644
--- a/chrome/browser/autofill/credit_card_field.cc
+++ b/chrome/browser/autofill/credit_card_field.cc
@@ -6,6 +6,7 @@
#include "base/scoped_ptr.h"
#include "base/string16.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_field.h"
bool CreditCardField::GetFieldInfo(FieldTypeMap* field_type_map) const {
diff --git a/chrome/browser/autofill/credit_card_field_unittest.cc b/chrome/browser/autofill/credit_card_field_unittest.cc
index d674bc54b9d51..c3330325aab2e 100644
--- a/chrome/browser/autofill/credit_card_field_unittest.cc
+++ b/chrome/browser/autofill/credit_card_field_unittest.cc
@@ -4,6 +4,7 @@
#include "base/scoped_ptr.h"
#include "base/scoped_vector.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/credit_card_field.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/glue/form_field.h"
diff --git a/chrome/browser/autofill/credit_card_unittest.cc b/chrome/browser/autofill/credit_card_unittest.cc
index 5912872fa651f..cdfbc24cea110 100644
--- a/chrome/browser/autofill/credit_card_unittest.cc
+++ b/chrome/browser/autofill/credit_card_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/basictypes.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_common_unittest.h"
#include "chrome/browser/autofill/credit_card.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/autofill/fax_field.cc b/chrome/browser/autofill/fax_field.cc
index f935a6daa33a8..80e25cba00136 100644
--- a/chrome/browser/autofill/fax_field.cc
+++ b/chrome/browser/autofill/fax_field.cc
@@ -6,6 +6,7 @@
#include "base/logging.h"
#include "base/scoped_ptr.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_field.h"
// static
diff --git a/chrome/browser/autofill/fax_field_unittest.cc b/chrome/browser/autofill/fax_field_unittest.cc
index 258f8d0a25b78..0ba21c0b7f159 100644
--- a/chrome/browser/autofill/fax_field_unittest.cc
+++ b/chrome/browser/autofill/fax_field_unittest.cc
@@ -4,6 +4,7 @@
#include "base/scoped_ptr.h"
#include "base/scoped_vector.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/fax_field.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/glue/form_field.h"
diff --git a/chrome/browser/autofill/form_field.cc b/chrome/browser/autofill/form_field.cc
index b68c77d00add3..e0999f92e2247 100644
--- a/chrome/browser/autofill/form_field.cc
+++ b/chrome/browser/autofill/form_field.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/autofill/form_field.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/address_field.h"
#include "chrome/browser/autofill/autofill_field.h"
#include "chrome/browser/autofill/credit_card_field.h"
diff --git a/chrome/browser/autofill/name_field.cc b/chrome/browser/autofill/name_field.cc
index c11a018f0123b..12b37ce09608d 100644
--- a/chrome/browser/autofill/name_field.cc
+++ b/chrome/browser/autofill/name_field.cc
@@ -6,6 +6,7 @@
#include "base/scoped_ptr.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_type.h"
NameField* NameField::Parse(std::vector<AutoFillField*>::const_iterator* iter,
diff --git a/chrome/browser/autofill/name_field_unittest.cc b/chrome/browser/autofill/name_field_unittest.cc
index 11e453e874275..7240004d24858 100644
--- a/chrome/browser/autofill/name_field_unittest.cc
+++ b/chrome/browser/autofill/name_field_unittest.cc
@@ -4,6 +4,7 @@
#include "base/scoped_ptr.h"
#include "base/scoped_vector.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_field.h"
#include "chrome/browser/autofill/name_field.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/autofill/personal_data_manager_unittest.cc b/chrome/browser/autofill/personal_data_manager_unittest.cc
index 8afb9e90fc905..34cb925873ee7 100644
--- a/chrome/browser/autofill/personal_data_manager_unittest.cc
+++ b/chrome/browser/autofill/personal_data_manager_unittest.cc
@@ -6,6 +6,7 @@
#include "base/message_loop.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_common_unittest.h"
#include "chrome/browser/autofill/autofill_profile.h"
#include "chrome/browser/autofill/form_structure.h"
diff --git a/chrome/browser/autofill/phone_field.cc b/chrome/browser/autofill/phone_field.cc
index 16df07fa23181..e063587cf316f 100644
--- a/chrome/browser/autofill/phone_field.cc
+++ b/chrome/browser/autofill/phone_field.cc
@@ -8,6 +8,7 @@
#include "base/scoped_ptr.h"
#include "base/string16.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_field.h"
// static
diff --git a/chrome/browser/autofill/phone_field_unittest.cc b/chrome/browser/autofill/phone_field_unittest.cc
index e27f09e1db0e3..ce0ae48f9bbed 100644
--- a/chrome/browser/autofill/phone_field_unittest.cc
+++ b/chrome/browser/autofill/phone_field_unittest.cc
@@ -4,6 +4,7 @@
#include "base/scoped_ptr.h"
#include "base/scoped_vector.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/phone_field.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/glue/form_field.h"
diff --git a/chrome/browser/autofill/phone_number_unittest.cc b/chrome/browser/autofill/phone_number_unittest.cc
index be61665d81586..bcb37f25655f9 100644
--- a/chrome/browser/autofill/phone_number_unittest.cc
+++ b/chrome/browser/autofill/phone_number_unittest.cc
@@ -2,6 +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 "chrome/browser/autofill/home_phone_number.h"
#include "chrome/browser/autofill/phone_number.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/autofill/select_control_handler.cc b/chrome/browser/autofill/select_control_handler.cc
index d1f348e3f041d..cbf5292d1cbaa 100644
--- a/chrome/browser/autofill/select_control_handler.cc
+++ b/chrome/browser/autofill/select_control_handler.cc
@@ -10,6 +10,7 @@
#include "base/logging.h"
#include "base/string_number_conversions.h"
#include "base/string16.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/form_group.h"
#include "webkit/glue/form_field.h"
diff --git a/chrome/browser/back_forward_menu_model_unittest.cc b/chrome/browser/back_forward_menu_model_unittest.cc
index 99c2af5bd7b1a..1de42979b9856 100644
--- a/chrome/browser/back_forward_menu_model_unittest.cc
+++ b/chrome/browser/back_forward_menu_model_unittest.cc
@@ -8,6 +8,7 @@
#include "base/file_util.h"
#include "base/path_service.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/profile_manager.h"
#include "chrome/browser/renderer_host/test/test_render_view_host.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
diff --git a/chrome/browser/bookmarks/bookmark_drag_data.cc b/chrome/browser/bookmarks/bookmark_drag_data.cc
index b691abf20a5a4..bdd56ba04e9f2 100644
--- a/chrome/browser/bookmarks/bookmark_drag_data.cc
+++ b/chrome/browser/bookmarks/bookmark_drag_data.cc
@@ -8,6 +8,7 @@
#include "base/basictypes.h"
#include "base/pickle.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#if defined(OS_MACOSX)
#include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h"
diff --git a/chrome/browser/bookmarks/bookmark_utils_unittest.cc b/chrome/browser/bookmarks/bookmark_utils_unittest.cc
index 384a55e89aabd..fc5f3cc104e92 100644
--- a/chrome/browser/bookmarks/bookmark_utils_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_utils_unittest.cc
@@ -7,6 +7,7 @@
#include "app/clipboard/scoped_clipboard_writer.h"
#include "base/message_loop.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/bookmarks/bookmark_utils.h"
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 490fb78a7cb18..c2d27239ae87b 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -23,6 +23,7 @@
#include "base/string_util.h"
#include "base/thread.h"
#include "base/tracked_objects.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_thread.h"
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index 97cda48bff7ab..bafdfbd7e4b66 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -9,6 +9,7 @@
#include "base/i18n/rtl.h"
#include "base/file_path.h"
#include "base/sys_info.h"
+#include "base/utf_string_conversions.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/app_modal_dialog.h"
#include "chrome/browser/browser.h"
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index e4a035709b90d..8b421f6172336 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -11,6 +11,7 @@
#include "base/path_service.h"
#include "base/ref_counted.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/automation/ui_controls.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_window.h"
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index c5d8355a5686b..cf9f3a27b9c62 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -14,6 +14,7 @@
#include "base/path_service.h"
#include "base/scoped_ptr.h"
#include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/automation/automation_provider.h"
#include "chrome/browser/automation/automation_provider_list.h"
#include "chrome/browser/automation/chrome_frame_automation_provider.h"
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index dd9e81770c0fd..ef3d4c8308c70 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -25,6 +25,7 @@
#include "base/string_util.h"
#include "base/sys_string_conversions.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "build/build_config.h"
#include "chrome/browser/browser.h"
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc
index 4e6eca92e2f87..553b9123db33b 100644
--- a/chrome/browser/browser_main_win.cc
+++ b/chrome/browser/browser_main_win.cc
@@ -16,6 +16,7 @@
#include "base/i18n/rtl.h"
#include "base/nss_util.h"
#include "base/path_service.h"
+#include "base/utf_string_conversions.h"
#include "base/win_util.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/first_run/first_run.h"
diff --git a/chrome/browser/browsing_data_database_helper_browsertest.cc b/chrome/browser/browsing_data_database_helper_browsertest.cc
index 19c7c20587291..85792ebec1dc4 100644
--- a/chrome/browser/browsing_data_database_helper_browsertest.cc
+++ b/chrome/browser/browsing_data_database_helper_browsertest.cc
@@ -2,6 +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 "chrome/browser/browsing_data_database_helper.h"
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/testing_profile.h"
diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc
index 1e05017cead07..8e24b02202543 100644
--- a/chrome/browser/character_encoding.cc
+++ b/chrome/browser/character_encoding.cc
@@ -13,6 +13,7 @@
#include "base/scoped_ptr.h"
#include "base/string_tokenizer.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/app/chrome_dll_resource.h"
#include "grit/generated_resources.h"
#include "unicode/ucnv.h"
diff --git a/chrome/browser/chromeos/dom_ui/language_hangul_options_handler.cc b/chrome/browser/chromeos/dom_ui/language_hangul_options_handler.cc
index 150ae15f19c9e..a0dea20836828 100644
--- a/chrome/browser/chromeos/dom_ui/language_hangul_options_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/language_hangul_options_handler.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h"
#include "app/l10n_util.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/chromeos/language_preferences.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/chromeos/dom_ui/language_options_util.h b/chrome/browser/chromeos/dom_ui/language_options_util.h
index 6918e88aa6dd2..72d8cca4d27c8 100644
--- a/chrome/browser/chromeos/dom_ui/language_options_util.h
+++ b/chrome/browser/chromeos/dom_ui/language_options_util.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_CHROMEOS_DOM_UI_LANGUAGE_OPTIONS_UTIL_H_
#pragma once
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/language_preferences.h"
class ListValue;
diff --git a/chrome/browser/chromeos/login/account_screen.cc b/chrome/browser/chromeos/login/account_screen.cc
index b9ad26dbdf9a8..72132227d5208 100644
--- a/chrome/browser/chromeos/login/account_screen.cc
+++ b/chrome/browser/chromeos/login/account_screen.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/chromeos/login/account_screen.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/input_method/input_method_util.h"
#include "chrome/browser/chromeos/login/account_creation_view.h"
diff --git a/chrome/browser/chromeos/network_list.cc b/chrome/browser/chromeos/network_list.cc
index 1ee2b481e5a7f..9780642897454 100644
--- a/chrome/browser/chromeos/network_list.cc
+++ b/chrome/browser/chromeos/network_list.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/chromeos/network_list.h"
#include "app/l10n_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/chromeos/network_message_observer.cc b/chrome/browser/chromeos/network_message_observer.cc
index 192ff28681277..a6ddad8bee625 100644
--- a/chrome/browser/chromeos/network_message_observer.cc
+++ b/chrome/browser/chromeos/network_message_observer.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/chromeos/network_message_observer.h"
#include "app/l10n_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/network_library.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc b/chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc
index cbdf0e4642141..7872e67861857 100644
--- a/chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc
+++ b/chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc
@@ -2,6 +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 "chrome/browser/chromeos/notifications/desktop_notifications_unittest.h"
namespace chromeos {
diff --git a/chrome/browser/chromeos/options/cellular_config_view.cc b/chrome/browser/chromeos/options/cellular_config_view.cc
index be1e761d3446b..db3d8379772bc 100644
--- a/chrome/browser/chromeos/options/cellular_config_view.cc
+++ b/chrome/browser/chromeos/options/cellular_config_view.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/chromeos/options/cellular_config_view.h"
#include "app/l10n_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/options/network_config_view.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/chromeos/options/internet_page_view.cc b/chrome/browser/chromeos/options/internet_page_view.cc
index d2656952bc13f..2a934f9d8d2b8 100644
--- a/chrome/browser/chromeos/options/internet_page_view.cc
+++ b/chrome/browser/chromeos/options/internet_page_view.cc
@@ -9,6 +9,7 @@
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/options/network_config_view.h"
#include "chrome/browser/chromeos/options/options_window_view.h"
diff --git a/chrome/browser/chromeos/options/ip_config_view.cc b/chrome/browser/chromeos/options/ip_config_view.cc
index 9fb1520b720ce..8e596a205b810 100644
--- a/chrome/browser/chromeos/options/ip_config_view.cc
+++ b/chrome/browser/chromeos/options/ip_config_view.cc
@@ -6,6 +6,7 @@
#include "app/l10n_util.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc
index b139b5615518c..99194335bf3c3 100644
--- a/chrome/browser/chromeos/options/network_config_view.cc
+++ b/chrome/browser/chromeos/options/network_config_view.cc
@@ -6,6 +6,7 @@
#include "app/l10n_util.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/options/cellular_config_view.h"
#include "chrome/browser/chromeos/options/ip_config_view.h"
#include "chrome/browser/chromeos/options/wifi_config_view.h"
diff --git a/chrome/browser/chromeos/panels/panel_scroller.cc b/chrome/browser/chromeos/panels/panel_scroller.cc
index daaa3fc017a2f..f4728587f5e2f 100644
--- a/chrome/browser/chromeos/panels/panel_scroller.cc
+++ b/chrome/browser/chromeos/panels/panel_scroller.cc
@@ -8,6 +8,7 @@
#include "base/logging.h"
#include "base/stl_util-inl.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "gfx/canvas.h"
#include "chrome/browser/chromeos/panels/panel_scroller_container.h"
#include "chrome/browser/chromeos/panels/panel_scroller_header.h"
diff --git a/chrome/browser/chromeos/status/network_menu_button.cc b/chrome/browser/chromeos/status/network_menu_button.cc
index 7ea165ea75146..be180a2fbef02 100644
--- a/chrome/browser/chromeos/status/network_menu_button.cc
+++ b/chrome/browser/chromeos/status/network_menu_button.cc
@@ -9,6 +9,7 @@
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/options/network_config_view.h"
#include "chrome/browser/chromeos/status/status_area_host.h"
diff --git a/chrome/browser/chromeos/status/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc
index d5d91e5b0c619..98fb75e06ed68 100644
--- a/chrome/browser/chromeos/status/power_menu_button.cc
+++ b/chrome/browser/chromeos/status/power_menu_button.cc
@@ -8,6 +8,7 @@
#include "app/resource_bundle.h"
#include "base/string_number_conversions.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "gfx/canvas.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/configuration_policy_pref_store.cc b/chrome/browser/configuration_policy_pref_store.cc
index 94b0fad3007af..e1a21007be088 100644
--- a/chrome/browser/configuration_policy_pref_store.cc
+++ b/chrome/browser/configuration_policy_pref_store.cc
@@ -9,6 +9,7 @@
#include "base/path_service.h"
#include "base/string16.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/configuration_policy_provider.h"
#if defined(OS_WIN)
diff --git a/chrome/browser/diagnostics/sqlite_diagnostics.cc b/chrome/browser/diagnostics/sqlite_diagnostics.cc
index 5013fa9754210..768bf7086a883 100644
--- a/chrome/browser/diagnostics/sqlite_diagnostics.cc
+++ b/chrome/browser/diagnostics/sqlite_diagnostics.cc
@@ -13,6 +13,7 @@
#include "base/path_service.h"
#include "base/singleton.h"
#include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
#include "third_party/sqlite/preprocessed/sqlite3.h"
diff --git a/chrome/browser/dom_ui/filebrowse_ui.cc b/chrome/browser/dom_ui/filebrowse_ui.cc
index e277c16a23893..9e18c2a2a3811 100644
--- a/chrome/browser/dom_ui/filebrowse_ui.cc
+++ b/chrome/browser/dom_ui/filebrowse_ui.cc
@@ -15,6 +15,7 @@
#include "base/string_util.h"
#include "base/thread.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "base/weak_ptr.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
diff --git a/chrome/browser/extensions/extension_omnibox_apitest.cc b/chrome/browser/extensions/extension_omnibox_apitest.cc
index 5b799e409b0f4..109faf3891a95 100644
--- a/chrome/browser/extensions/extension_omnibox_apitest.cc
+++ b/chrome/browser/extensions/extension_omnibox_apitest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autocomplete/autocomplete.h"
#include "chrome/browser/autocomplete/autocomplete_edit.h"
#include "chrome/browser/autocomplete/autocomplete_edit_view.h"
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
index 27a57c24677ce..1dfe65e794212 100644
--- a/chrome/browser/extensions/extensions_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_service_unittest.cc
@@ -18,6 +18,7 @@
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/task.h"
+#include "base/utf_string_conversions.h"
#include "base/version.h"
#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/extensions/crx_installer.h"
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index 03d23dc8c7a51..68c6110649681 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -11,6 +11,7 @@
#include "base/file_util.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "base/thread.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/extensions/external_pref_extension_provider.cc b/chrome/browser/extensions/external_pref_extension_provider.cc
index a7c99ff1b8fb6..f5ffcb55a6dfe 100644
--- a/chrome/browser/extensions/external_pref_extension_provider.cc
+++ b/chrome/browser/extensions/external_pref_extension_provider.cc
@@ -9,6 +9,7 @@
#include "base/file_util.h"
#include "base/path_service.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "base/version.h"
#include "chrome/common/json_value_serializer.h"
diff --git a/chrome/browser/extensions/external_registry_extension_provider_win.cc b/chrome/browser/extensions/external_registry_extension_provider_win.cc
index d8057a03bf8dc..9189c3ae86027 100644
--- a/chrome/browser/extensions/external_registry_extension_provider_win.cc
+++ b/chrome/browser/extensions/external_registry_extension_provider_win.cc
@@ -7,6 +7,7 @@
#include "base/file_path.h"
#include "base/registry.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "base/version.h"
// The Registry hive where to look for external extensions.
diff --git a/chrome/browser/external_protocol_handler.cc b/chrome/browser/external_protocol_handler.cc
index 822e1fbd377de..2172394cd5a01 100644
--- a/chrome/browser/external_protocol_handler.cc
+++ b/chrome/browser/external_protocol_handler.cc
@@ -12,6 +12,7 @@
#include "base/message_loop.h"
#include "base/string_util.h"
#include "base/thread.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_process_impl.h"
#include "chrome/browser/platform_util.h"
diff --git a/chrome/browser/find_backend_unittest.cc b/chrome/browser/find_backend_unittest.cc
index b927b358fab71..172ecf91ff7a9 100644
--- a/chrome/browser/find_backend_unittest.cc
+++ b/chrome/browser/find_backend_unittest.cc
@@ -4,6 +4,7 @@
#include "base/string16.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/find_bar_state.h"
#include "chrome/browser/renderer_host/test/test_render_view_host.h"
#include "chrome/common/url_constants.h"
diff --git a/chrome/browser/find_bar_host_browsertest.cc b/chrome/browser/find_bar_host_browsertest.cc
index 6e6d33b134b35..5d67553bc99c3 100644
--- a/chrome/browser/find_bar_host_browsertest.cc
+++ b/chrome/browser/find_bar_host_browsertest.cc
@@ -5,6 +5,7 @@
#include "base/keyboard_codes.h"
#include "base/message_loop.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/find_bar.h"
diff --git a/chrome/browser/geolocation/access_token_store_browsertest.cc b/chrome/browser/geolocation/access_token_store_browsertest.cc
index 1ce1291837bcf..f7ea9901f925a 100644
--- a/chrome/browser/geolocation/access_token_store_browsertest.cc
+++ b/chrome/browser/geolocation/access_token_store_browsertest.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/geolocation/access_token_store.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/chrome_thread.h"
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
diff --git a/chrome/browser/geolocation/network_location_provider.cc b/chrome/browser/geolocation/network_location_provider.cc
index f3f9c0c5af7e1..88dc22fc9a308 100644
--- a/chrome/browser/geolocation/network_location_provider.cc
+++ b/chrome/browser/geolocation/network_location_provider.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/geolocation/network_location_provider.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/geolocation/access_token_store.h"
namespace {
diff --git a/chrome/browser/geolocation/network_location_request.cc b/chrome/browser/geolocation/network_location_request.cc
index 2683b0c8e2203..d6a4f33e46e51 100644
--- a/chrome/browser/geolocation/network_location_request.cc
+++ b/chrome/browser/geolocation/network_location_request.cc
@@ -7,6 +7,7 @@
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/common/geoposition.h"
#include "chrome/common/net/url_request_context_getter.h"
diff --git a/chrome/browser/geolocation/wifi_data_provider_common_unittest.cc b/chrome/browser/geolocation/wifi_data_provider_common_unittest.cc
index 6947d41e5e527..2b8390ec9458b 100644
--- a/chrome/browser/geolocation/wifi_data_provider_common_unittest.cc
+++ b/chrome/browser/geolocation/wifi_data_provider_common_unittest.cc
@@ -9,6 +9,7 @@
#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
+#include "base/utf_string_conversions.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/gtk/status_icons/status_tray_gtk_unittest.cc b/chrome/browser/gtk/status_icons/status_tray_gtk_unittest.cc
index d123e5bacbfec..5bc2c2b3a3bf9 100644
--- a/chrome/browser/gtk/status_icons/status_tray_gtk_unittest.cc
+++ b/chrome/browser/gtk/status_icons/status_tray_gtk_unittest.cc
@@ -4,6 +4,7 @@
#include "app/resource_bundle.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/gtk/status_icons/status_icon_gtk.h"
#include "chrome/browser/gtk/status_icons/status_tray_gtk.h"
#include "grit/browser_resources.h"
diff --git a/chrome/browser/history/history_publisher_win.cc b/chrome/browser/history/history_publisher_win.cc
index cbde619ec906b..7ff7ccfd08702 100644
--- a/chrome/browser/history/history_publisher_win.cc
+++ b/chrome/browser/history/history_publisher_win.cc
@@ -15,6 +15,7 @@
#include "base/scoped_variant_win.h"
#include "base/string_util.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "googleurl/src/gurl.h"
namespace {
diff --git a/chrome/browser/history/top_sites_unittest.cc b/chrome/browser/history/top_sites_unittest.cc
index 2977e62675a9a..94db4f2525b9b 100644
--- a/chrome/browser/history/top_sites_unittest.cc
+++ b/chrome/browser/history/top_sites_unittest.cc
@@ -5,6 +5,7 @@
#include "app/l10n_util.h"
#include "base/scoped_temp_dir.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/history/top_sites.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/browser/dom_ui/most_visited_handler.h"
diff --git a/chrome/browser/importer/importer_bridge.cc b/chrome/browser/importer/importer_bridge.cc
index 3a16dd66f06e7..53d99f712aae6 100644
--- a/chrome/browser/importer/importer_bridge.cc
+++ b/chrome/browser/importer/importer_bridge.cc
@@ -6,6 +6,7 @@
#include "app/l10n_util.h"
#include "base/scoped_ptr.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/history/history_types.h"
diff --git a/chrome/browser/importer/toolbar_importer_unittest.cc b/chrome/browser/importer/toolbar_importer_unittest.cc
index 1e49c1c01aec3..79b09fbaa91f7 100644
--- a/chrome/browser/importer/toolbar_importer_unittest.cc
+++ b/chrome/browser/importer/toolbar_importer_unittest.cc
@@ -9,6 +9,7 @@
#include "base/string16.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/first_run/first_run.h"
#include "chrome/browser/importer/importer.h"
#include "chrome/browser/importer/toolbar_importer.h"
diff --git a/chrome/browser/memory_details_linux.cc b/chrome/browser/memory_details_linux.cc
index 78a9065fc5aa5..232deafc2b89d 100644
--- a/chrome/browser/memory_details_linux.cc
+++ b/chrome/browser/memory_details_linux.cc
@@ -12,6 +12,7 @@
#include "base/file_version_info.h"
#include "base/string_util.h"
#include "base/process_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_child_process_host.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_thread.h"
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc
index 6adccd0d0bc02..1cb8a7a949ae2 100644
--- a/chrome/browser/nacl_host/nacl_process_host.cc
+++ b/chrome/browser/nacl_host/nacl_process_host.cc
@@ -11,6 +11,7 @@
#endif
#include "base/command_line.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/renderer_host/resource_message_filter.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/logging_chrome.h"
diff --git a/chrome/browser/password_manager/login_database_posix.cc b/chrome/browser/password_manager/login_database_posix.cc
index b33e747c89fa5..44183bf901f2a 100644
--- a/chrome/browser/password_manager/login_database_posix.cc
+++ b/chrome/browser/password_manager/login_database_posix.cc
@@ -2,14 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/string_util.h"
#include "chrome/browser/password_manager/login_database.h"
+#include "base/utf_string_conversions.h"
+
// TODO: Actually encrypt passwords on Linux.
std::string LoginDatabase::EncryptedString(const string16& plain_text)
const {
- return UTF16ToASCII(plain_text);
+ return UTF16ToUTF8(plain_text);
}
string16 LoginDatabase::DecryptedString(const std::string& cipher_text)
diff --git a/chrome/browser/password_manager/login_database_unittest.cc b/chrome/browser/password_manager/login_database_unittest.cc
index 2d8a061552220..ad0c2dbc29727 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/file_util.h"
#include "base/path_service.h"
#include "base/string_number_conversions.h"
-#include "base/string_util.h" // TODO(brettw) remove when ASCIIToUTF16 moves.
#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 "webkit/glue/password_form.h"
diff --git a/chrome/browser/password_manager/password_form_manager_unittest.cc b/chrome/browser/password_manager/password_form_manager_unittest.cc
index b8614666aae62..3e4846b902d92 100644
--- a/chrome/browser/password_manager/password_form_manager_unittest.cc
+++ b/chrome/browser/password_manager/password_form_manager_unittest.cc
@@ -5,6 +5,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/password_manager/password_form_manager.h"
#include "chrome/browser/password_manager/password_manager.h"
#include "chrome/browser/profile_manager.h"
diff --git a/chrome/browser/password_manager/password_manager_unittest.cc b/chrome/browser/password_manager/password_manager_unittest.cc
index 57c3c75fc529e..aaa31aa3a0e95 100644
--- a/chrome/browser/password_manager/password_manager_unittest.cc
+++ b/chrome/browser/password_manager/password_manager_unittest.cc
@@ -4,6 +4,7 @@
#include "base/file_path.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/password_manager/password_manager.h"
#include "chrome/browser/password_manager/password_manager_delegate.h"
#include "chrome/browser/password_manager/password_store.h"
diff --git a/chrome/browser/password_manager/password_store_win.cc b/chrome/browser/password_manager/password_store_win.cc
index a62a19a3ceba8..1ae4fbfde8c1a 100644
--- a/chrome/browser/password_manager/password_store_win.cc
+++ b/chrome/browser/password_manager/password_store_win.cc
@@ -6,6 +6,7 @@
#include "base/logging.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/password_manager/ie7_password.h"
#include "chrome/browser/password_manager/password_manager.h"
#include "chrome/browser/profile.h"
diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc
index 9b0a12c30931c..5157cb489d09f 100644
--- a/chrome/browser/platform_util_win.cc
+++ b/chrome/browser/platform_util_win.cc
@@ -17,6 +17,7 @@
#include "base/registry.h"
#include "base/scoped_comptr_win.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/installer/util/google_update_settings.h"
#include "chrome/installer/util/google_update_constants.h"
#include "chrome/installer/util/install_util.h"
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc
index 197a3ffa92511..0112a4fb81c69 100644
--- a/chrome/browser/plugin_service.cc
+++ b/chrome/browser/plugin_service.cc
@@ -10,6 +10,7 @@
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/thread.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "base/waitable_event.h"
#include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/printing/print_dialog_cloud_unittest.cc b/chrome/browser/printing/print_dialog_cloud_unittest.cc
index 5a1c669f6258d..16f7dab77aa8d 100644
--- a/chrome/browser/printing/print_dialog_cloud_unittest.cc
+++ b/chrome/browser/printing/print_dialog_cloud_unittest.cc
@@ -9,6 +9,7 @@
#include "base/file_util.h"
#include "base/path_service.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "base/weak_ptr.h"
#include "chrome/browser/chrome_thread.h"
diff --git a/chrome/browser/process_singleton_linux_uitest.cc b/chrome/browser/process_singleton_linux_uitest.cc
index 2e30654883ca1..9b77d71df4e43 100644
--- a/chrome/browser/process_singleton_linux_uitest.cc
+++ b/chrome/browser/process_singleton_linux_uitest.cc
@@ -16,6 +16,7 @@
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/thread.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_process.h"
#include "chrome/common/chrome_constants.h"
diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc
index 685692d41b69b..c8a5cbdd4a36e 100644
--- a/chrome/browser/rlz/rlz.cc
+++ b/chrome/browser/rlz/rlz.cc
@@ -19,6 +19,7 @@
#include "base/string_util.h"
#include "base/task.h"
#include "base/thread.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/profile_manager.h"
diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc
index ce7354e302dfd..b13d37c7fefe1 100644
--- a/chrome/browser/sessions/session_service_unittest.cc
+++ b/chrome/browser/sessions/session_service_unittest.cc
@@ -9,6 +9,7 @@
#include "base/stl_util-inl.h"
#include "base/string_number_conversions.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/defaults.h"
#include "chrome/browser/sessions/session_backend.h"
#include "chrome/browser/sessions/session_service.h"
diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc
index 708bf3cb0d729..cc3372ce06ea8 100644
--- a/chrome/browser/shell_integration_unittest.cc
+++ b/chrome/browser/shell_integration_unittest.cc
@@ -12,6 +12,7 @@
#include "base/scoped_temp_dir.h"
#include "base/stl_util-inl.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/chrome_thread.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths_internal.h"
diff --git a/chrome/browser/spellchecker_platform_engine_unittest.cc b/chrome/browser/spellchecker_platform_engine_unittest.cc
index a63bf6733505d..7c2b9f033f409 100644
--- a/chrome/browser/spellchecker_platform_engine_unittest.cc
+++ b/chrome/browser/spellchecker_platform_engine_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/spellchecker_platform_engine.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/status_icons/status_tray_manager.cc b/chrome/browser/status_icons/status_tray_manager.cc
index d60fc5e0f64a1..57b6ed9a1de14 100644
--- a/chrome/browser/status_icons/status_tray_manager.cc
+++ b/chrome/browser/status_icons/status_tray_manager.cc
@@ -8,6 +8,7 @@
#include "app/resource_bundle.h"
#include "base/logging.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_window.h"
diff --git a/chrome/browser/status_icons/status_tray_unittest.cc b/chrome/browser/status_icons/status_tray_unittest.cc
index 9b600104c73e6..957faa7c45fb5 100644
--- a/chrome/browser/status_icons/status_tray_unittest.cc
+++ b/chrome/browser/status_icons/status_tray_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/status_icons/status_icon.h"
#include "chrome/browser/status_icons/status_tray.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index ce3d7e4ae36f2..109120828aad5 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -17,6 +17,7 @@
#include "base/stl_util-inl.h"
#include "base/string_util.h"
#include "base/task.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/history/history_types.h"
#include "chrome/browser/platform_util.h"
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 1418793291945..ae4986ad72bba 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -11,6 +11,7 @@
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/string16.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/profile.h"
diff --git a/chrome/browser/tab_contents/navigation_controller_unittest.cc b/chrome/browser/tab_contents/navigation_controller_unittest.cc
index 0a8c6773aaf25..b24d967e21701 100644
--- a/chrome/browser/tab_contents/navigation_controller_unittest.cc
+++ b/chrome/browser/tab_contents/navigation_controller_unittest.cc
@@ -7,6 +7,7 @@
#include "base/scoped_ptr.h"
#include "base/stl_util-inl.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/profile_manager.h"
#include "chrome/browser/history/history.h"
#include "chrome/browser/renderer_host/test/test_render_view_host.h"
diff --git a/chrome/browser/tab_contents/navigation_entry_unittest.cc b/chrome/browser/tab_contents/navigation_entry_unittest.cc
index 4ecd1df75f317..6b960a9d324eb 100644
--- a/chrome/browser/tab_contents/navigation_entry_unittest.cc
+++ b/chrome/browser/tab_contents/navigation_entry_unittest.cc
@@ -4,6 +4,7 @@
#include "base/string16.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/renderer_host/site_instance.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc
index 9b30f7bd39031..c2cd5c3d96ddb 100644
--- a/chrome/browser/tab_contents/web_contents_unittest.cc
+++ b/chrome/browser/tab_contents/web_contents_unittest.cc
@@ -4,6 +4,7 @@
#include "app/message_box_flags.h"
#include "base/logging.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/pref_service.h"
#include "chrome/browser/pref_value_store.h"
#include "chrome/browser/renderer_host/render_view_host.h"
diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc
index bf3490556167e..9b83e7d35ea89 100644
--- a/chrome/browser/views/about_ipc_dialog.cc
+++ b/chrome/browser/views/about_ipc_dialog.cc
@@ -18,6 +18,7 @@
#include "base/string_util.h"
#include "base/thread.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/browser_process.h"
#include "chrome/common/chrome_constants.h"
diff --git a/chrome/browser/views/accessibility_event_router_views_unittest.cc b/chrome/browser/views/accessibility_event_router_views_unittest.cc
index 392b0d93dce5b..924327d68c1a3 100644
--- a/chrome/browser/views/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/views/accessibility_event_router_views_unittest.cc
@@ -6,6 +6,7 @@
#include "base/message_loop.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/extensions/extension_accessibility_api.h"
#include "chrome/browser/views/accessibility_event_router_views.h"
#include "chrome/browser/views/accessible_view_helper.h"
diff --git a/chrome/browser/views/browser_views_accessibility_browsertest.cc b/chrome/browser/views/browser_views_accessibility_browsertest.cc
index 49b824c8c1e9b..af33e2c122760 100644
--- a/chrome/browser/views/browser_views_accessibility_browsertest.cc
+++ b/chrome/browser/views/browser_views_accessibility_browsertest.cc
@@ -6,6 +6,7 @@
#include "app/l10n_util.h"
#include "base/scoped_comptr_win.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/view_ids.h"
diff --git a/chrome/browser/views/find_bar_host_interactive_uitest.cc b/chrome/browser/views/find_bar_host_interactive_uitest.cc
index d2934cb8d00f3..615008d6a4275 100644
--- a/chrome/browser/views/find_bar_host_interactive_uitest.cc
+++ b/chrome/browser/views/find_bar_host_interactive_uitest.cc
@@ -5,6 +5,7 @@
#include "base/keyboard_codes.h"
#include "base/message_loop.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/automation/ui_controls.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_window.h"
diff --git a/chrome/browser/views/generic_info_view_unittest.cc b/chrome/browser/views/generic_info_view_unittest.cc
index ca0a030036454..2fa0e9d2bb3dd 100644
--- a/chrome/browser/views/generic_info_view_unittest.cc
+++ b/chrome/browser/views/generic_info_view_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "app/l10n_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/views/generic_info_view.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/views/ssl_client_certificate_selector_win.cc b/chrome/browser/views/ssl_client_certificate_selector_win.cc
index cf5ad4f39c3a9..1ea9d8c6677c1 100644
--- a/chrome/browser/views/ssl_client_certificate_selector_win.cc
+++ b/chrome/browser/views/ssl_client_certificate_selector_win.cc
@@ -9,6 +9,7 @@
#include "app/l10n_util.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_window.h"
diff --git a/chrome/browser/views/status_icons/status_tray_win_unittest.cc b/chrome/browser/views/status_icons/status_tray_win_unittest.cc
index 073e50bc14119..635c7df5d963d 100644
--- a/chrome/browser/views/status_icons/status_tray_win_unittest.cc
+++ b/chrome/browser/views/status_icons/status_tray_win_unittest.cc
@@ -4,6 +4,7 @@
#include "app/resource_bundle.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/views/status_icons/status_icon_win.h"
#include "chrome/browser/views/status_icons/status_tray_win.h"
#include "grit/browser_resources.h"
diff --git a/chrome/browser/views/task_manager_view.cc b/chrome/browser/views/task_manager_view.cc
index a95b172b990f9..4739be63f069e 100644
--- a/chrome/browser/views/task_manager_view.cc
+++ b/chrome/browser/views/task_manager_view.cc
@@ -8,6 +8,7 @@
#include "app/table_model_observer.h"
#include "base/command_line.h"
#include "base/stats_table.h"
+#include "base/utf_string_conversions.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc
index c1a487f3da04c..2b757a6322053 100644
--- a/chrome/browser/web_applications/web_app_unittest.cc
+++ b/chrome/browser/web_applications/web_app_unittest.cc
@@ -6,6 +6,7 @@
#include "base/file_path.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/renderer_host/test/test_render_view_host.h"
#include "chrome/common/render_messages.h"
#include "chrome/test/testing_profile.h"
diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc
index 224a76a2b9a68..263578a72ae22 100644
--- a/chrome/browser/webdata/web_data_service_unittest.cc
+++ b/chrome/browser/webdata/web_data_service_unittest.cc
@@ -14,6 +14,7 @@
#include "base/string16.h"
#include "base/string_util.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "base/waitable_event.h"
#include "chrome/browser/autofill/autofill_profile.h"
#include "chrome/browser/autofill/credit_card.h"
diff --git a/chrome/browser/webdata/web_database_unittest.cc b/chrome/browser/webdata/web_database_unittest.cc
index d17d8e82b3c7e..1daa2ed0a61ca 100644
--- a/chrome/browser/webdata/web_database_unittest.cc
+++ b/chrome/browser/webdata/web_database_unittest.cc
@@ -15,6 +15,7 @@
#include "base/string_number_conversions.h"
#include "base/string16.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/autofill/autofill_profile.h"
#include "chrome/browser/autofill/autofill_type.h"
diff --git a/chrome/browser/worker_host/worker_process_host.cc b/chrome/browser/worker_host/worker_process_host.cc
index d9b1ebc618106..51e0fd993ff3c 100644
--- a/chrome/browser/worker_host/worker_process_host.cc
+++ b/chrome/browser/worker_host/worker_process_host.cc
@@ -12,6 +12,7 @@
#include "base/debug_util.h"
#include "base/message_loop.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/appcache/appcache_dispatcher_host.h"
#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/child_process_security_policy.h"
diff --git a/chrome/browser/zygote_host_linux.cc b/chrome/browser/zygote_host_linux.cc
index 4ede3330d2e34..2828e3e2a7ec3 100644
--- a/chrome/browser/zygote_host_linux.cc
+++ b/chrome/browser/zygote_host_linux.cc
@@ -21,6 +21,7 @@
#include "base/string_util.h"
#include "base/scoped_ptr.h"
#include "base/unix_domain_socket_posix.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/renderer_host/render_sandbox_host_linux.h"
#include "chrome/common/chrome_constants.h"
diff --git a/chrome/common/child_process_logging_linux.cc b/chrome/common/child_process_logging_linux.cc
index 94cb34be03341..40ad90c0d8dee 100644
--- a/chrome/common/child_process_logging_linux.cc
+++ b/chrome/common/child_process_logging_linux.cc
@@ -6,6 +6,7 @@
#include "base/logging.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/common/gpu_info.h"
#include "chrome/installer/util/google_update_settings.h"
#include "googleurl/src/gurl.h"
diff --git a/chrome/common/extensions/extension_message_bundle_unittest.cc b/chrome/common/extensions/extension_message_bundle_unittest.cc
index 3119ef82e6333..81ae30c4bfcf1 100644
--- a/chrome/common/extensions/extension_message_bundle_unittest.cc
+++ b/chrome/common/extensions/extension_message_bundle_unittest.cc
@@ -11,6 +11,7 @@
#include "base/linked_ptr.h"
#include "base/scoped_ptr.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_error_utils.h"
diff --git a/chrome/common/gpu_plugin.cc b/chrome/common/gpu_plugin.cc
index af009f94fcf2e..84ab33999ed02 100644
--- a/chrome/common/gpu_plugin.cc
+++ b/chrome/common/gpu_plugin.cc
@@ -6,6 +6,7 @@
#include "base/command_line.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_switches.h"
#include "gpu/gpu_plugin/gpu_plugin.h"
#include "webkit/glue/plugins/plugin_list.h"
diff --git a/chrome/common/metrics_helpers.cc b/chrome/common/metrics_helpers.cc
index ee465e4359443..b0fdac16d81f1 100644
--- a/chrome/common/metrics_helpers.cc
+++ b/chrome/common/metrics_helpers.cc
@@ -18,7 +18,6 @@
#include "base/perftimer.h"
#include "base/scoped_ptr.h"
#include "base/string_number_conversions.h"
-#include "base/string_util.h" // TODO(brettw) remove when ASCIIToUTF16 moves.
#include "base/sys_info.h"
#include "base/utf_string_conversions.h"
#include "base/third_party/nspr/prtime.h"
diff --git a/chrome/common/plugin_group_unittest.cc b/chrome/common/plugin_group_unittest.cc
index 7def7c69586c5..07373c3388b24 100644
--- a/chrome/common/plugin_group_unittest.cc
+++ b/chrome/common/plugin_group_unittest.cc
@@ -9,6 +9,7 @@
#include "base/scoped_ptr.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "base/version.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/common/render_messages_unittest.cc b/chrome/common/render_messages_unittest.cc
index 30b1446c3bb83..5d590c33a1d5a 100644
--- a/chrome/common/render_messages_unittest.cc
+++ b/chrome/common/render_messages_unittest.cc
@@ -4,6 +4,7 @@
#include "base/scoped_ptr.h"
#include "base/string16.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/common/render_messages.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/default_plugin/plugin_impl_win.cc b/chrome/default_plugin/plugin_impl_win.cc
index 3f0f46ebea8a2..4d0f7f0fecb1f 100644
--- a/chrome/default_plugin/plugin_impl_win.cc
+++ b/chrome/default_plugin/plugin_impl_win.cc
@@ -9,6 +9,7 @@
#include "base/file_util.h"
#include "base/path_service.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/default_plugin/plugin_main.h"
#include "googleurl/src/gurl.h"
#include "grit/webkit_strings.h"
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index cf84b1859b437..3cbd522935a30 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -17,6 +17,7 @@
#include "base/registry.h"
#include "base/scoped_handle_win.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "base/win_util.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/installer/setup/install.h"
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index a8908c84e33a9..66b6382fcd8cf 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -21,6 +21,7 @@
#include "base/stl_util-inl.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "base/win_util.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
diff --git a/chrome/renderer/form_manager.cc b/chrome/renderer/form_manager.cc
index f427e5adee418..ffe43bf2335f8 100644
--- a/chrome/renderer/form_manager.cc
+++ b/chrome/renderer/form_manager.cc
@@ -8,6 +8,7 @@
#include "base/scoped_vector.h"
#include "base/string_util.h"
#include "base/stl_util-inl.h"
+#include "base/utf_string_conversions.h"
#include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
#include "third_party/WebKit/WebKit/chromium/public/WebElement.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFormControlElement.h"
diff --git a/chrome/renderer/form_manager_unittest.cc b/chrome/renderer/form_manager_unittest.cc
index 3d44e713fd2ef..48c80548770e3 100644
--- a/chrome/renderer/form_manager_unittest.cc
+++ b/chrome/renderer/form_manager_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/renderer/form_manager.h"
#include "chrome/test/render_view_test.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc
index ccc8f7f54cd7f..4751160d6a9d4 100644
--- a/chrome/renderer/localized_error.cc
+++ b/chrome/renderer/localized_error.cc
@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "base/string16.h"
#include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "googleurl/src/gurl.h"
#include "grit/generated_resources.h"
diff --git a/chrome/renderer/password_autocomplete_manager_unittest.cc b/chrome/renderer/password_autocomplete_manager_unittest.cc
index 3106704aef20b..a799365a1653f 100644
--- a/chrome/renderer/password_autocomplete_manager_unittest.cc
+++ b/chrome/renderer/password_autocomplete_manager_unittest.cc
@@ -4,6 +4,7 @@
#include "base/keyboard_codes.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/renderer/password_autocomplete_manager.h"
#include "chrome/test/render_view_test.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/renderer/pepper_devices_unittest.cc b/chrome/renderer/pepper_devices_unittest.cc
index 9327ed0bcaa65..e8e0bbe090e84 100644
--- a/chrome/renderer/pepper_devices_unittest.cc
+++ b/chrome/renderer/pepper_devices_unittest.cc
@@ -6,6 +6,7 @@
#include <vector>
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "build/build_config.h"
#include "chrome/common/render_messages.h"
#include "chrome/renderer/pepper_devices.h"
diff --git a/chrome/renderer/render_process_impl.cc b/chrome/renderer/render_process_impl.cc
index 34f3ef8741587..25773c2ecb375 100644
--- a/chrome/renderer/render_process_impl.cc
+++ b/chrome/renderer/render_process_impl.cc
@@ -21,6 +21,7 @@
#include "base/histogram.h"
#include "base/path_service.h"
#include "base/sys_info.h"
+#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/render_messages.h"
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 6ad92d2d23131..bdab4f7d2efed 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -19,6 +19,7 @@
#include "base/string_util.h"
#include "base/task.h"
#include "base/thread_local.h"
+#include "base/utf_string_conversions.h"
#include "chrome/common/appcache/appcache_dispatcher.h"
#include "chrome/common/child_process_logging.h"
#include "chrome/common/chrome_switches.h"
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index a591b6c93bee3..a7787a56b1fd5 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -21,6 +21,7 @@
#include "base/string_piece.h"
#include "base/string_util.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "build/build_config.h"
#include "chrome/common/appcache/appcache_dispatcher.h"
#include "chrome/common/bindings_policy.h"
diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc
index 315851f498d6f..a32d3f8befca8 100644
--- a/chrome/renderer/render_view_unittest.cc
+++ b/chrome/renderer/render_view_unittest.cc
@@ -7,6 +7,7 @@
#include "base/file_util.h"
#include "base/keyboard_codes.h"
#include "base/shared_memory.h"
+#include "base/utf_string_conversions.h"
#include "chrome/common/content_settings.h"
#include "chrome/common/native_web_keyboard_event.h"
#include "chrome/common/render_messages.h"
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 8b91028624342..fb6b3b1971640 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -8,6 +8,7 @@
#include "base/file_path.h"
#include "base/platform_file.h"
#include "base/shared_memory.h"
+#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/database_util.h"
#include "chrome/common/render_messages.h"
diff --git a/chrome/renderer/translate_helper.cc b/chrome/renderer/translate_helper.cc
index 48cab3fe2f80e..d27f10762a5fc 100644
--- a/chrome/renderer/translate_helper.cc
+++ b/chrome/renderer/translate_helper.cc
@@ -5,6 +5,7 @@
#include "chrome/renderer/translate_helper.h"
#include "base/compiler_specific.h"
+#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/renderer/render_view.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index 4b6d5b59b3de1..fb3516306df6a 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -18,6 +18,7 @@
#include "base/ref_counted.h"
#include "base/string_util.h"
#include "base/sys_info.h"
+#include "base/utf_string_conversions.h"
#include "chrome/common/child_process_logging.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/plugin_messages.h"
diff --git a/chrome/test/live_sync/two_client_live_autofill_sync_test.cc b/chrome/test/live_sync/two_client_live_autofill_sync_test.cc
index dacb91035d431..8d56a86aa2d70 100644
--- a/chrome/test/live_sync/two_client_live_autofill_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_autofill_sync_test.cc
@@ -2,6 +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 "chrome/test/live_sync/live_autofill_sync_test.h"
IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, Client1HasData) {
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index 8369e8af0c89f..f6b0479f564f9 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -11,6 +11,7 @@
#include "base/sys_info.h"
#include "base/test/test_file_util.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
diff --git a/chrome/test/ui/omnibox_uitest.cc b/chrome/test/ui/omnibox_uitest.cc
index 6ccb107aba781..8dc56fc5b7472 100644
--- a/chrome/test/ui/omnibox_uitest.cc
+++ b/chrome/test/ui/omnibox_uitest.cc
@@ -10,6 +10,7 @@
#include "base/path_service.h"
#include "base/perftimer.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/libxml_utils.h"
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index d5c898b837483..48849a31ffb0a 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -25,6 +25,7 @@
#include "base/string_number_conversions.h"
#include "base/test/test_file_util.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/common/chrome_constants.h"
diff --git a/chrome_frame/http_negotiate.cc b/chrome_frame/http_negotiate.cc
index db51fd5a526b2..dd62de14dbbbd 100644
--- a/chrome_frame/http_negotiate.cc
+++ b/chrome_frame/http_negotiate.cc
@@ -11,6 +11,7 @@
#include "base/logging.h"
#include "base/scoped_ptr.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome_frame/bho.h"
#include "chrome_frame/exception_barrier.h"
diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc
index e5f29247435ba..6e0fcb3462a1a 100644
--- a/chrome_frame/simple_resource_loader.cc
+++ b/chrome_frame/simple_resource_loader.cc
@@ -13,6 +13,7 @@
#include "base/path_service.h"
#include "base/i18n/rtl.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "base/win_util.h"
const wchar_t kLocalesDirName[] = L"Locales";
diff --git a/chrome_frame/test/http_negotiate_unittest.cc b/chrome_frame/test/http_negotiate_unittest.cc
index afba216432018..0ef8a4379f79a 100644
--- a/chrome_frame/test/http_negotiate_unittest.cc
+++ b/chrome_frame/test/http_negotiate_unittest.cc
@@ -8,6 +8,7 @@
#include "base/scoped_bstr_win.h"
#include "base/scoped_comptr_win.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome_frame/http_negotiate.h"
#include "chrome_frame/html_utils.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
diff --git a/chrome_frame/test/test_with_web_server.h b/chrome_frame/test/test_with_web_server.h
index 862b27168b2ed..f22300947e383 100644
--- a/chrome_frame/test/test_with_web_server.h
+++ b/chrome_frame/test/test_with_web_server.h
@@ -9,6 +9,7 @@
#include <string>
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome_frame/test/http_server.h"
#include "chrome_frame/test/test_server.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome_frame/urlmon_moniker.cc b/chrome_frame/urlmon_moniker.cc
index cd55faa02f6c8..452a9a68c5a06 100644
--- a/chrome_frame/urlmon_moniker.cc
+++ b/chrome_frame/urlmon_moniker.cc
@@ -7,6 +7,7 @@
#include <shlguid.h>
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome_frame/bho.h"
#include "chrome_frame/bind_context_info.h"
#include "chrome_frame/exception_barrier.h"
diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc
index da255b5168f53..47f34ac05342d 100644
--- a/chrome_frame/urlmon_url_request.cc
+++ b/chrome_frame/urlmon_url_request.cc
@@ -11,6 +11,7 @@
#include "base/message_loop.h"
#include "base/scoped_ptr.h"
#include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
#include "chrome_frame/bind_context_info.h"
#include "chrome_frame/chrome_frame_activex_base.h"
#include "chrome_frame/extra_system_apis.h"
diff --git a/courgette/encoded_program.cc b/courgette/encoded_program.cc
index a83972f6c9868..eb3dcdaf83eef 100644
--- a/courgette/encoded_program.cc
+++ b/courgette/encoded_program.cc
@@ -13,7 +13,7 @@
#include "base/logging.h"
#include "base/scoped_ptr.h"
#include "base/string_util.h"
-
+#include "base/utf_string_conversions.h"
#include "courgette/courgette.h"
#include "courgette/streams.h"
diff --git a/ipc/ipc_channel_win.cc b/ipc/ipc_channel_win.cc
index ba1df9f23e582..be98707fe0608 100644
--- a/ipc/ipc_channel_win.cc
+++ b/ipc/ipc_channel_win.cc
@@ -12,6 +12,7 @@
#include "base/logging.h"
#include "base/non_thread_safe.h"
#include "base/stats_counters.h"
+#include "base/utf_string_conversions.h"
#include "base/win_util.h"
#include "ipc/ipc_logging.h"
#include "ipc/ipc_message_utils.h"
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index 0da59c4b2c171..e1d4b4b25e3c2 100644
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -18,9 +18,9 @@
#include "base/string16.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
#include "base/time.h"
#include "base/tuple.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#if defined(OS_POSIX)
#include "ipc/file_descriptor_set_posix.h"
diff --git a/net/ftp/ftp_auth_cache_unittest.cc b/net/ftp/ftp_auth_cache_unittest.cc
index 3971b323d5ef8..a8c5732f7d2b5 100644
--- a/net/ftp/ftp_auth_cache_unittest.cc
+++ b/net/ftp/ftp_auth_cache_unittest.cc
@@ -6,6 +6,7 @@
#include "base/string_number_conversions.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/ftp/ftp_directory_listing_parser_vms.cc b/net/ftp/ftp_directory_listing_parser_vms.cc
index 90fd4664f1ee6..bfdb9528de6b0 100644
--- a/net/ftp/ftp_directory_listing_parser_vms.cc
+++ b/net/ftp/ftp_directory_listing_parser_vms.cc
@@ -7,8 +7,8 @@
#include <vector>
#include "base/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "net/ftp/ftp_util.h"
namespace {
diff --git a/net/ftp/ftp_directory_listing_parser_vms_unittest.cc b/net/ftp/ftp_directory_listing_parser_vms_unittest.cc
index 363c99c90cade..2d6404cb5acde 100644
--- a/net/ftp/ftp_directory_listing_parser_vms_unittest.cc
+++ b/net/ftp/ftp_directory_listing_parser_vms_unittest.cc
@@ -6,6 +6,7 @@
#include "base/format_macros.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "net/ftp/ftp_directory_listing_parser_vms.h"
namespace {
diff --git a/net/ftp/ftp_network_transaction_unittest.cc b/net/ftp/ftp_network_transaction_unittest.cc
index 5745ae716b031..8b877a9ba4924 100644
--- a/net/ftp/ftp_network_transaction_unittest.cc
+++ b/net/ftp/ftp_network_transaction_unittest.cc
@@ -8,6 +8,7 @@
#include "base/ref_counted.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "net/base/io_buffer.h"
#include "net/base/mock_host_resolver.h"
#include "net/base/net_util.h"
diff --git a/net/http/http_auth_cache_unittest.cc b/net/http/http_auth_cache_unittest.cc
index b5d71753650a8..5db49ee61348d 100644
--- a/net/http/http_auth_cache_unittest.cc
+++ b/net/http/http_auth_cache_unittest.cc
@@ -6,6 +6,7 @@
#include "base/string16.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "net/base/net_errors.h"
#include "net/http/http_auth_cache.h"
#include "net/http/http_auth_handler.h"
diff --git a/net/http/http_auth_handler_basic_unittest.cc b/net/http/http_auth_handler_basic_unittest.cc
index a758887e7384e..61ce864ca3ffd 100644
--- a/net/http/http_auth_handler_basic_unittest.cc
+++ b/net/http/http_auth_handler_basic_unittest.cc
@@ -6,6 +6,7 @@
#include "base/basictypes.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "net/base/net_errors.h"
#include "net/http/http_auth_handler_basic.h"
#include "net/http/http_request_info.h"
diff --git a/net/http/http_auth_handler_digest_unittest.cc b/net/http/http_auth_handler_digest_unittest.cc
index c563aae287256..5129001b6ff29 100644
--- a/net/http/http_auth_handler_digest_unittest.cc
+++ b/net/http/http_auth_handler_digest_unittest.cc
@@ -6,6 +6,7 @@
#include "base/basictypes.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "net/base/net_errors.h"
#include "net/http/http_auth_handler_digest.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/http/http_auth_handler_negotiate_unittest.cc b/net/http/http_auth_handler_negotiate_unittest.cc
index 75063cab33f0c..7bcf37cd56161 100644
--- a/net/http/http_auth_handler_negotiate_unittest.cc
+++ b/net/http/http_auth_handler_negotiate_unittest.cc
@@ -5,6 +5,7 @@
#include "net/http/http_auth_handler_negotiate.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "net/base/mock_host_resolver.h"
#include "net/base/net_errors.h"
#include "net/base/test_completion_callback.h"
diff --git a/net/http/http_auth_handler_unittest.cc b/net/http/http_auth_handler_unittest.cc
index 62ecf22f45439..d63b9fbea7371 100644
--- a/net/http/http_auth_handler_unittest.cc
+++ b/net/http/http_auth_handler_unittest.cc
@@ -5,6 +5,7 @@
#include "net/http/http_auth_handler.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "net/base/capturing_net_log.h"
#include "net/base/net_errors.h"
#include "net/base/net_log_unittest.h"
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 4e0d354d36ccb..b5919e6205025 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -12,6 +12,7 @@
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/scoped_ptr.h"
+#include "base/utf_string_conversions.h"
#include "net/base/capturing_net_log.h"
#include "net/base/completion_callback.h"
#include "net/base/mock_host_resolver.h"
diff --git a/net/http/url_security_manager_win.cc b/net/http/url_security_manager_win.cc
index 4eaef78d1e7dd..76250d036d22b 100644
--- a/net/http/url_security_manager_win.cc
+++ b/net/http/url_security_manager_win.cc
@@ -9,6 +9,7 @@
#include "base/scoped_comptr_win.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "googleurl/src/gurl.h"
// The Windows implementation of URLSecurityManager uses WinINet/IE's
diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
index 1a76d217869aa..f06fdea6d2584 100644
--- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc
+++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
@@ -6,6 +6,7 @@
#include "base/stl_util-inl.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "base/waitable_event.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_log.h"
diff --git a/net/proxy/proxy_resolver_winhttp.cc b/net/proxy/proxy_resolver_winhttp.cc
index d7aaae3fab564..4307b5e08a93d 100644
--- a/net/proxy/proxy_resolver_winhttp.cc
+++ b/net/proxy/proxy_resolver_winhttp.cc
@@ -9,6 +9,7 @@
#include "base/histogram.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_errors.h"
#include "net/proxy/proxy_info.h"
diff --git a/net/proxy/proxy_script_fetcher_unittest.cc b/net/proxy/proxy_script_fetcher_unittest.cc
index d96da036fead4..28e6895604af5 100644
--- a/net/proxy/proxy_script_fetcher_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_unittest.cc
@@ -7,6 +7,7 @@
#include "base/file_path.h"
#include "base/compiler_specific.h"
#include "base/path_service.h"
+#include "base/utf_string_conversions.h"
#include "net/base/net_util.h"
#include "net/base/ssl_config_service_defaults.h"
#include "net/base/test_completion_callback.h"
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc
index bc5f74ed39005..70f1551bf86ef 100644
--- a/net/proxy/proxy_service_unittest.cc
+++ b/net/proxy/proxy_service_unittest.cc
@@ -9,6 +9,7 @@
#include "base/format_macros.h"
#include "base/logging.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_log.h"
#include "net/base/net_log_unittest.h"
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc
index 047a647267e3e..ab4579d8a32af 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -8,6 +8,7 @@
#include "base/compiler_specific.h"
#include "base/string_util.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "net/base/auth.h"
#include "net/base/mock_host_resolver.h"
#include "net/base/net_errors.h"
diff --git a/net/socket/ssl_client_socket_win.cc b/net/socket/ssl_client_socket_win.cc
index 77a553c162399..3d751d5417f6f 100644
--- a/net/socket/ssl_client_socket_win.cc
+++ b/net/socket/ssl_client_socket_win.cc
@@ -11,6 +11,7 @@
#include "base/singleton.h"
#include "base/stl_util-inl.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "net/base/cert_verifier.h"
#include "net/base/connection_type_histograms.h"
#include "net/base/io_buffer.h"
diff --git a/net/socket_stream/socket_stream_unittest.cc b/net/socket_stream/socket_stream_unittest.cc
index def766c0adcbd..9480d8837fe4a 100644
--- a/net/socket_stream/socket_stream_unittest.cc
+++ b/net/socket_stream/socket_stream_unittest.cc
@@ -6,6 +6,7 @@
#include <vector>
#include "base/callback.h"
+#include "base/utf_string_conversions.h"
#include "net/base/mock_host_resolver.h"
#include "net/base/net_log.h"
#include "net/base/net_log_unittest.h"
diff --git a/net/tools/dump_cache/cache_dumper.cc b/net/tools/dump_cache/cache_dumper.cc
index f573b2af3e363..9eee05859eb11 100644
--- a/net/tools/dump_cache/cache_dumper.cc
+++ b/net/tools/dump_cache/cache_dumper.cc
@@ -4,6 +4,7 @@
#include "net/tools/dump_cache/cache_dumper.h"
+#include "base/utf_string_conversions.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "net/disk_cache/entry_impl.h"
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 48f5351d0b21e..8ab18bdfb1652 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -23,6 +23,7 @@
#include "base/process_util.h"
#include "base/string_piece.h"
#include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
#include "net/base/cookie_monster.h"
#include "net/base/cookie_policy.h"
#include "net/base/load_flags.h"
diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc
index 0dadcb1677896..c2a9f84948b04 100644
--- a/skia/ext/vector_canvas_unittest.cc
+++ b/skia/ext/vector_canvas_unittest.cc
@@ -12,6 +12,7 @@
#include "base/file_util.h"
#include "base/path_service.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "gfx/codec/png_codec.h"
#include "skia/ext/vector_canvas.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/tools/memory_watcher/memory_watcher.cc b/tools/memory_watcher/memory_watcher.cc
index 0bcab53a891b7..6e6779306a305 100644
--- a/tools/memory_watcher/memory_watcher.cc
+++ b/tools/memory_watcher/memory_watcher.cc
@@ -12,6 +12,7 @@
#include "base/logging.h"
#include "base/stats_counters.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "tools/memory_watcher/call_stack.h"
#include "tools/memory_watcher/preamble_patcher.h"
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index baca2c33b05b1..870273ef9bded 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -8,6 +8,7 @@
#include "base/keyboard_codes.h"
#include "base/message_loop.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "gfx/canvas_skia.h"
#include "gfx/path.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webkit/database/database_util_unittest.cc b/webkit/database/database_util_unittest.cc
index edcc25f54155f..f6e3e2cb49c78 100644
--- a/webkit/database/database_util_unittest.cc
+++ b/webkit/database/database_util_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/string_util.h"
+#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/database/database_util.h"
diff --git a/webkit/database/databases_table_unittest.cc b/webkit/database/databases_table_unittest.cc
index 2d72d60686c08..65ac2efc04564 100644
--- a/webkit/database/databases_table_unittest.cc
+++ b/webkit/database/databases_table_unittest.cc
@@ -5,6 +5,7 @@
#include "app/sql/connection.h"
#include "app/sql/statement.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/database/databases_table.h"
diff --git a/webkit/database/quota_table_unittest.cc b/webkit/database/quota_table_unittest.cc
index fbb59bf6ca92d..de051f4f3d857 100644
--- a/webkit/database/quota_table_unittest.cc
+++ b/webkit/database/quota_table_unittest.cc
@@ -5,6 +5,7 @@
#include "app/sql/connection.h"
#include "app/sql/statement.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/database/quota_table.h"
diff --git a/webkit/glue/dom_operations_unittest.cc b/webkit/glue/dom_operations_unittest.cc
index e9f590cfa569c..c57e9437f654e 100644
--- a/webkit/glue/dom_operations_unittest.cc
+++ b/webkit/glue/dom_operations_unittest.cc
@@ -5,6 +5,7 @@
#include "base/file_util.h"
#include "base/path_service.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "net/base/net_util.h"
#include "net/url_request/url_request_context.h"
#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc
index fe1d7efbf6005..2cdf076b4d247 100644
--- a/webkit/glue/plugins/plugin_host.cc
+++ b/webkit/glue/plugins/plugin_host.cc
@@ -13,6 +13,7 @@
#include "base/sys_info.h"
#endif
#include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
#include "net/base/net_util.h"
#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
#include "webkit/glue/webkit_glue.h"
diff --git a/webkit/glue/plugins/plugin_lib_unittest.cc b/webkit/glue/plugins/plugin_lib_unittest.cc
index a52510ba9d975..5ac6bdc6e6cd5 100644
--- a/webkit/glue/plugins/plugin_lib_unittest.cc
+++ b/webkit/glue/plugins/plugin_lib_unittest.cc
@@ -5,6 +5,7 @@
#include "webkit/glue/plugins/plugin_lib.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webkit/glue/plugins/test/plugin_geturl_test.cc b/webkit/glue/plugins/test/plugin_geturl_test.cc
index e9b1c33c5e414..aedf5821efbdc 100644
--- a/webkit/glue/plugins/test/plugin_geturl_test.cc
+++ b/webkit/glue/plugins/test/plugin_geturl_test.cc
@@ -9,6 +9,7 @@
#include "base/basictypes.h"
#include "base/file_util.h"
#include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
// url for "self". The %22%22 is to make a statement for javascript to
// evaluate and return.
diff --git a/webkit/glue/simple_webmimeregistry_impl.cc b/webkit/glue/simple_webmimeregistry_impl.cc
index 5dd227fa0018d..d87886711abb4 100644
--- a/webkit/glue/simple_webmimeregistry_impl.cc
+++ b/webkit/glue/simple_webmimeregistry_impl.cc
@@ -6,6 +6,7 @@
#include "base/string_util.h"
#include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
#include "net/base/mime_util.h"
#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
#include "webkit/glue/webkit_glue.h"
diff --git a/webkit/glue/webpasswordautocompletelistener_unittest.cc b/webkit/glue/webpasswordautocompletelistener_unittest.cc
index 5a05d462db0f6..0ce2916b7ed3b 100644
--- a/webkit/glue/webpasswordautocompletelistener_unittest.cc
+++ b/webkit/glue/webpasswordautocompletelistener_unittest.cc
@@ -9,6 +9,7 @@
#include <string>
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/glue/form_field.h"
#include "webkit/glue/webpasswordautocompletelistener_impl.h"
diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc
index 5f380e1b65f1a..a031f3f821b48 100644
--- a/webkit/support/test_webkit_client.cc
+++ b/webkit/support/test_webkit_client.cc
@@ -7,6 +7,7 @@
#include "base/scoped_temp_dir.h"
#include "base/stats_counters.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "net/base/cookie_monster.h"
#include "net/http/http_cache.h"
#include "net/test/test_server.h"
diff --git a/webkit/tools/test_shell/mock_spellcheck.cc b/webkit/tools/test_shell/mock_spellcheck.cc
index 518e576b815eb..fd53401685a84 100644
--- a/webkit/tools/test_shell/mock_spellcheck.cc
+++ b/webkit/tools/test_shell/mock_spellcheck.cc
@@ -10,6 +10,7 @@
#include "base/logging.h"
#include "base/string16.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
MockSpellCheck::MockSpellCheck()
: initialized_(false) {
diff --git a/webkit/tools/test_shell/simple_database_system.cc b/webkit/tools/test_shell/simple_database_system.cc
index 16e280fb6c2da..0fc36239f5011 100644
--- a/webkit/tools/test_shell/simple_database_system.cc
+++ b/webkit/tools/test_shell/simple_database_system.cc
@@ -7,6 +7,7 @@
#include "base/auto_reset.h"
#include "base/file_util.h"
#include "base/message_loop.h"
+#include "base/utf_string_conversions.h"
#include "third_party/sqlite/preprocessed/sqlite3.h"
#include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h"
#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h
index 34f69e387f765..62fdc9211daf3 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.h
+++ b/webkit/tools/test_shell/test_shell_webkit_init.h
@@ -5,6 +5,7 @@
#ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_
#define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_
+#include "base/utf_string_conversions.h"
#include "third_party/WebKit/WebKit/chromium/public/WebGraphicsContext3D.h"
#include "third_party/WebKit/WebKit/chromium/public/WebIDBFactory.h"
#include "third_party/WebKit/WebKit/chromium/public/WebStorageNamespace.h"
--
GitLab