Use utf_string_conversions header in more places.

Patch contributed by Thiago Farina (thiago.farina@gmail.com)

TEST=none
BUG=none

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

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

12 files changed, 12 insertions, 14 deletions

diff --git a/app/clipboard/scoped_clipboard_writer.cc b/app/clipboard/scoped_clipboard_writer.cc
index ec9dd0a..5a3634f 100644
--- a/app/clipboard/scoped_clipboard_writer.cc
+++ b/app/clipboard/scoped_clipboard_writer.cc
@@ -10,7 +10,7 @@
 
 #include "base/gfx/size.h"
 #include "base/pickle.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 
 ScopedClipboardWriter::ScopedClipboardWriter(Clipboard* clipboard)
     : clipboard_(clipboard) {
diff --git a/app/gtk_dnd_util.cc b/app/gtk_dnd_util.cc
index 3e87f32..a7933ab 100644
--- a/app/gtk_dnd_util.cc
+++ b/app/gtk_dnd_util.cc
@@ -4,9 +4,9 @@
 
 #include "app/gtk_dnd_util.h"
 
-#include "base/string_util.h"
 #include "base/logging.h"
 #include "base/pickle.h"
+#include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 
 static const int kBitsPerByte = 8;
diff --git a/chrome/browser/history/download_database.cc b/chrome/browser/history/download_database.cc
index 4fcf386..8bf4a95 100644
--- a/chrome/browser/history/download_database.cc
+++ b/chrome/browser/history/download_database.cc
@@ -9,7 +9,7 @@
 
 #include "app/sql/connection.h"
 #include "app/sql/statement.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/history/download_types.h"
diff --git a/chrome/browser/importer/nss_decryptor.cc b/chrome/browser/importer/nss_decryptor.cc
index 38b1a66f..c30aabd 100644
--- a/chrome/browser/importer/nss_decryptor.cc
+++ b/chrome/browser/importer/nss_decryptor.cc
@@ -14,7 +14,7 @@
 #endif  // defined(OS_LINUX)
 
 #include "base/base64.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "webkit/glue/password_form.h"
 
 using webkit_glue::PasswordForm;
diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc
index bfe472d..8600de0 100644
--- a/chrome/browser/notifications/desktop_notification_service.cc
+++ b/chrome/browser/notifications/desktop_notification_service.cc
@@ -6,9 +6,8 @@
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/string_piece.h"
-#include "base/string_util.h"
 #include "base/thread.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/extensions/extensions_service.h"
diff --git a/chrome/browser/password_manager/encryptor_win.cc b/chrome/browser/password_manager/encryptor_win.cc
index 76a9d3d..ba50339 100644
--- a/chrome/browser/password_manager/encryptor_win.cc
+++ b/chrome/browser/password_manager/encryptor_win.cc
@@ -6,7 +6,7 @@
 
 #include <windows.h>
 #include <wincrypt.h>
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 
 #pragma comment(lib, "crypt32.lib")
 
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index 1a13480..d6917cd 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -3,10 +3,9 @@
 // found in the LICENSE file.
 
 #include "build/build_config.h"
-#include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/sync/glue/change_processor.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index d859bc2..9877ec2 100755
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
@@ -10,7 +10,7 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/common/chrome_constants.h"
diff --git a/chrome/browser/views/blocked_popup_container_view_views.cc b/chrome/browser/views/blocked_popup_container_view_views.cc
index f01eca5..4feedba 100644
--- a/chrome/browser/views/blocked_popup_container_view_views.cc
+++ b/chrome/browser/views/blocked_popup_container_view_views.cc
@@ -16,7 +16,6 @@
 #include "app/menus/simple_menu_model.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
-#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
diff --git a/webkit/database/databases_table.cc b/webkit/database/databases_table.cc
index c76db8cc..132e7ad 100644
--- a/webkit/database/databases_table.cc
+++ b/webkit/database/databases_table.cc
@@ -6,7 +6,8 @@
 
 #include "app/sql/connection.h"
 #include "app/sql/statement.h"
-#include "base/string_util.h"
+#include "base/logging.h"
+#include "base/utf_string_conversions.h"
 
 namespace webkit_database {
 
diff --git a/webkit/glue/glue_serialize.cc b/webkit/glue/glue_serialize.cc
index f10fc8a..6cbe39b 100644
--- a/webkit/glue/glue_serialize.cc
+++ b/webkit/glue/glue_serialize.cc
@@ -7,7 +7,7 @@
 #include <string>
 
 #include "base/pickle.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h"
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index a77e8d1..340a28c 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -12,7 +12,7 @@
 #include "base/process_util.h"
 #include "base/platform_file.h"
 #include "base/stats_counters.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "base/trace_event.h"
 #include "grit/webkit_resources.h"
 #include "grit/webkit_strings.h"