win: string_util.h -> utf_string_conversions.h fix.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/830002

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

15 files changed, 15 insertions, 14 deletions

diff --git a/chrome/browser/views/about_network_dialog.cc b/chrome/browser/views/about_network_dialog.cc
index 128b2c8..0fc8e16 100644
--- a/chrome/browser/views/about_network_dialog.cc
+++ b/chrome/browser/views/about_network_dialog.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/views/about_network_dialog.h"
 
-#include "base/string_util.h"
 #include "base/thread.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_thread.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
diff --git a/chrome/browser/views/appcache_info_view.cc b/chrome/browser/views/appcache_info_view.cc
index 4de638c..8cc53c2 100644
--- a/chrome/browser/views/appcache_info_view.cc
+++ b/chrome/browser/views/appcache_info_view.cc
@@ -9,7 +9,7 @@
 #include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc
index 90b9fbe..8dc597c 100644
--- a/chrome/browser/views/bug_report_view.cc
+++ b/chrome/browser/views/bug_report_view.cc
@@ -7,7 +7,7 @@
 #include "app/combobox_model.h"
 #include "app/l10n_util.h"
 #include "base/file_version_info.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/bug_report_util.h"
 #include "chrome/browser/net/url_fetcher.h"
 #include "chrome/browser/pref_service.h"
diff --git a/chrome/browser/views/cookie_prompt_view.cc b/chrome/browser/views/cookie_prompt_view.cc
index fa0bbe6..1c84dd5 100644
--- a/chrome/browser/views/cookie_prompt_view.cc
+++ b/chrome/browser/views/cookie_prompt_view.cc
@@ -11,7 +11,7 @@
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.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/cookie_modal_dialog.h"
 #include "chrome/browser/pref_service.h"
diff --git a/chrome/browser/views/database_info_view.cc b/chrome/browser/views/database_info_view.cc
index 2d9a801..4f5eb54 100644
--- a/chrome/browser/views/database_info_view.cc
+++ b/chrome/browser/views/database_info_view.cc
@@ -9,7 +9,7 @@
 #include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
diff --git a/chrome/browser/views/database_open_info_view.cc b/chrome/browser/views/database_open_info_view.cc
index 20b315b4..0a81793 100644
--- a/chrome/browser/views/database_open_info_view.cc
+++ b/chrome/browser/views/database_open_info_view.cc
@@ -9,7 +9,7 @@
 #include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
diff --git a/chrome/browser/views/external_protocol_dialog.cc b/chrome/browser/views/external_protocol_dialog.cc
index 6548eb6..34f391e 100644
--- a/chrome/browser/views/external_protocol_dialog.cc
+++ b/chrome/browser/views/external_protocol_dialog.cc
@@ -8,8 +8,8 @@
 #include "app/message_box_flags.h"
 #include "base/histogram.h"
 #include "base/registry.h"
-#include "base/string_util.h"
 #include "base/thread.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/external_protocol_handler.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/views/local_storage_info_view.cc b/chrome/browser/views/local_storage_info_view.cc
index 21e5242..e47536c 100644
--- a/chrome/browser/views/local_storage_info_view.cc
+++ b/chrome/browser/views/local_storage_info_view.cc
@@ -9,7 +9,7 @@
 #include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
diff --git a/chrome/browser/views/local_storage_set_item_info_view.cc b/chrome/browser/views/local_storage_set_item_info_view.cc
index 699c2f5..3eb13ef 100644
--- a/chrome/browser/views/local_storage_set_item_info_view.cc
+++ b/chrome/browser/views/local_storage_set_item_info_view.cc
@@ -9,7 +9,7 @@
 #include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
diff --git a/chrome/browser/views/notifications/balloon_view.cc b/chrome/browser/views/notifications/balloon_view.cc
index 9292de4..f8c31a2 100644
--- a/chrome/browser/views/notifications/balloon_view.cc
+++ b/chrome/browser/views/notifications/balloon_view.cc
@@ -12,7 +12,7 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/balloon_collection.h"
diff --git a/chrome/browser/views/options/exception_editor_view.cc b/chrome/browser/views/options/exception_editor_view.cc
index 97f84e0..49bc2ac 100644
--- a/chrome/browser/views/options/exception_editor_view.cc
+++ b/chrome/browser/views/options/exception_editor_view.cc
@@ -6,6 +6,7 @@
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/content_exceptions_table_model.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "googleurl/src/url_canon.h"
diff --git a/chrome/browser/views/page_info_window_view.cc b/chrome/browser/views/page_info_window_view.cc
index 9f0a197..539a281 100644
--- a/chrome/browser/views/page_info_window_view.cc
+++ b/chrome/browser/views/page_info_window_view.cc
@@ -13,7 +13,7 @@
 #include "app/resource_bundle.h"
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/page_info_model.h"
 #include "chrome/browser/page_info_window.h"
diff --git a/chrome/browser/views/shell_dialogs_win.cc b/chrome/browser/views/shell_dialogs_win.cc
index 8cb28a6..c668390 100644
--- a/chrome/browser/views/shell_dialogs_win.cc
+++ b/chrome/browser/views/shell_dialogs_win.cc
@@ -17,8 +17,8 @@
 #include "base/file_util.h"
 #include "base/registry.h"
 #include "base/scoped_comptr_win.h"
-#include "base/string_util.h"
 #include "base/thread.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_thread.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/views/tabs/side_tab.cc b/chrome/browser/views/tabs/side_tab.cc
index b1b0280..efa3d8d 100644
--- a/chrome/browser/views/tabs/side_tab.cc
+++ b/chrome/browser/views/tabs/side_tab.cc
@@ -9,7 +9,7 @@
 #include "app/gfx/skia_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/image_button.h"
diff --git a/chrome/browser/views/url_picker.cc b/chrome/browser/views/url_picker.cc
index 65e983d..60ee014 100644
--- a/chrome/browser/views/url_picker.cc
+++ b/chrome/browser/views/url_picker.cc
@@ -10,7 +10,7 @@
 #include "app/table_model_observer.h"
 #include "base/keyboard_codes.h"
 #include "base/stl_util-inl.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/possible_url_model.h"
 #include "chrome/browser/pref_service.h"