chrome 3: string_util.h -> utf_string_conversions.h fix.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/671014

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

20 files changed, 49 insertions, 13 deletions

diff --git a/chrome/browser/gears_integration.cc b/chrome/browser/gears_integration.cc
index 83da75f..e4b0a00 100644
--- a/chrome/browser/gears_integration.cc
+++ b/chrome/browser/gears_integration.cc
@@ -4,11 +4,14 @@
 
 #include "chrome/browser/gears_integration.h"
 
+#include <string>
+#include <vector>
+
 #include "app/gfx/codec/png_codec.h"
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_plugin_host.h"
 #include "chrome/common/chrome_plugin_util.h"
 #include "chrome/common/gears_api.h"
diff --git a/chrome/browser/gtk/external_protocol_dialog_gtk.cc b/chrome/browser/gtk/external_protocol_dialog_gtk.cc
index 153ffa9..6be7e1a 100644
--- a/chrome/browser/gtk/external_protocol_dialog_gtk.cc
+++ b/chrome/browser/gtk/external_protocol_dialog_gtk.cc
@@ -6,9 +6,12 @@
 
 #include <gtk/gtk.h>
 
+#include <string>
+
 #include "app/l10n_util.h"
 #include "base/histogram.h"
 #include "base/message_loop.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/external_protocol_handler.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/gtk/gtk_tree.cc b/chrome/browser/gtk/gtk_tree.cc
index b638027..328ee02 100644
--- a/chrome/browser/gtk/gtk_tree.cc
+++ b/chrome/browser/gtk/gtk_tree.cc
@@ -7,7 +7,7 @@
 #include "app/gfx/gtk_util.h"
 #include "app/table_model.h"
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/chrome/browser/gtk/options/content_exception_editor.cc b/chrome/browser/gtk/options/content_exception_editor.cc
index 3147307..e4ee04d 100644
--- a/chrome/browser/gtk/options/content_exception_editor.cc
+++ b/chrome/browser/gtk/options/content_exception_editor.cc
@@ -7,6 +7,7 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/content_exceptions_table_model.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/host_content_settings_map.h"
diff --git a/chrome/browser/gtk/options/languages_page_gtk.cc b/chrome/browser/gtk/options/languages_page_gtk.cc
index a8c97e4..a94a209 100644
--- a/chrome/browser/gtk/options/languages_page_gtk.cc
+++ b/chrome/browser/gtk/options/languages_page_gtk.cc
@@ -6,10 +6,12 @@
 
 #include <set>
 #include <string>
+#include <vector>
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/language_combobox_model.h"
diff --git a/chrome/browser/gtk/tab_contents_drag_source.cc b/chrome/browser/gtk/tab_contents_drag_source.cc
index 490a524..dbc7293 100644
--- a/chrome/browser/gtk/tab_contents_drag_source.cc
+++ b/chrome/browser/gtk/tab_contents_drag_source.cc
@@ -4,10 +4,12 @@
 
 #include "chrome/browser/gtk/tab_contents_drag_source.h"
 
+#include <string>
+
 #include "app/gtk_dnd_util.h"
 #include "base/file_util.h"
 #include "base/mime_util.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/drag_download_file.h"
 #include "chrome/browser/download/drag_download_util.h"
diff --git a/chrome/browser/login_prompt.cc b/chrome/browser/login_prompt.cc
index c145b30..1b0327b 100644
--- a/chrome/browser/login_prompt.cc
+++ b/chrome/browser/login_prompt.cc
@@ -4,9 +4,12 @@
 
 #include "chrome/browser/login_prompt.h"
 
+#include <vector>
+
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/lock.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc
index dd4aa3f..37a6b7f 100644
--- a/chrome/browser/metrics/metrics_log.cc
+++ b/chrome/browser/metrics/metrics_log.cc
@@ -12,6 +12,7 @@
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
+#include "base/utf_string_conversions.h"
 #include "base/third_party/nspr/prtime.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/net/browser_url_util.cc b/chrome/browser/net/browser_url_util.cc
index 5f287795..9c8ab48 100644
--- a/chrome/browser/net/browser_url_util.cc
+++ b/chrome/browser/net/browser_url_util.cc
@@ -6,6 +6,7 @@
 
 #include "app/clipboard/scoped_clipboard_writer.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
diff --git a/chrome/browser/net/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc
index cc85420..e5dc12a 100644
--- a/chrome/browser/net/url_fixer_upper.cc
+++ b/chrome/browser/net/url_fixer_upper.cc
@@ -9,6 +9,7 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_file.h"
@@ -200,8 +201,8 @@ static void AddDesiredTLD(const string& desired_tld,
 
   // Add the suffix at the end of the domain.
   const size_t domain_length(domain->length());
-  DCHECK(domain_length > 0);
-  DCHECK(desired_tld[0] != '.');
+  DCHECK_GT(domain_length, 0U);
+  DCHECK_NE(desired_tld[0], '.');
   if ((*domain)[domain_length - 1] != '.')
     domain->push_back('.');
   domain->append(desired_tld);
@@ -255,7 +256,7 @@ static void FixupHost(const string& text,
     domain.erase(0, first_nondot);
     size_t last_nondot(domain.find_last_not_of('.'));
     DCHECK(last_nondot != string::npos);
-    last_nondot += 2; // Point at second period in ending string
+    last_nondot += 2;  // Point at second period in ending string
     if (last_nondot < domain.length())
       domain.erase(last_nondot);
   }
diff --git a/chrome/browser/net/url_request_mock_http_job.cc b/chrome/browser/net/url_request_mock_http_job.cc
index 5887a55..ee516a5 100644
--- a/chrome/browser/net/url_request_mock_http_job.cc
+++ b/chrome/browser/net/url_request_mock_http_job.cc
@@ -7,6 +7,7 @@
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "net/base/net_util.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_filter.h"
diff --git a/chrome/browser/net/url_request_mock_net_error_job.cc b/chrome/browser/net/url_request_mock_net_error_job.cc
index 8441f6a..bf31a92 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.cc
+++ b/chrome/browser/net/url_request_mock_net_error_job.cc
@@ -4,9 +4,12 @@
 
 #include "chrome/browser/net/url_request_mock_net_error_job.h"
 
+#include <string>
+#include <vector>
+
 #include "base/file_util.h"
 #include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_filter.h"
diff --git a/chrome/browser/net/url_request_slow_http_job.cc b/chrome/browser/net/url_request_slow_http_job.cc
index 2ae0f13..3d143b07 100644
--- a/chrome/browser/net/url_request_slow_http_job.cc
+++ b/chrome/browser/net/url_request_slow_http_job.cc
@@ -5,8 +5,8 @@
 #include "chrome/browser/net/url_request_slow_http_job.h"
 
 #include "base/platform_thread.h"
-#include "base/string_util.h"
 #include "base/time.h"
+#include "base/utf_string_conversions.h"
 #include "net/url_request/url_request_filter.h"
 
 static const char kMockHostname[] = "mock.slow.http";
diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc
index b8defaa..f657273 100644
--- a/chrome/browser/page_info_model.cc
+++ b/chrome/browser/page_info_model.cc
@@ -4,9 +4,12 @@
 
 #include "chrome/browser/page_info_model.h"
 
+#include <string>
+
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/i18n/time_formatting.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
diff --git a/chrome/browser/pref_service.cc b/chrome/browser/pref_service.cc
index 430077c6..6abfd0f 100644
--- a/chrome/browser/pref_service.cc
+++ b/chrome/browser/pref_service.cc
@@ -4,12 +4,16 @@
 
 #include "chrome/browser/pref_service.h"
 
+#include <algorithm>
+#include <string>
+
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/session_startup_pref.cc b/chrome/browser/session_startup_pref.cc
index 87c149d..ff919d0 100644
--- a/chrome/browser/session_startup_pref.cc
+++ b/chrome/browser/session_startup_pref.cc
@@ -4,7 +4,9 @@
 
 #include "chrome/browser/session_startup_pref.h"
 
-#include "base/string_util.h"
+#include <string>
+
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index 9dadbb1..3b057b7 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -24,9 +24,9 @@
 #include "base/process_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_tokenizer.h"
-#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/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/tab_contents/navigation_entry.cc b/chrome/browser/tab_contents/navigation_entry.cc
index 32e0474..2001dd4 100644
--- a/chrome/browser/tab_contents/navigation_entry.cc
+++ b/chrome/browser/tab_contents/navigation_entry.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/tab_contents/navigation_entry.h"
 
 #include "app/resource_bundle.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/site_instance.h"
diff --git a/chrome/browser/tab_contents/web_drag_dest_gtk.cc b/chrome/browser/tab_contents/web_drag_dest_gtk.cc
index e379339..d439a3f 100644
--- a/chrome/browser/tab_contents/web_drag_dest_gtk.cc
+++ b/chrome/browser/tab_contents/web_drag_dest_gtk.cc
@@ -4,9 +4,11 @@
 
 #include "chrome/browser/tab_contents/web_drag_dest_gtk.h"
 
+#include <string>
+
 #include "app/gtk_dnd_util.h"
 #include "base/file_path.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
index a8ef292..b4ec742 100644
--- a/chrome/browser/web_applications/web_app.cc
+++ b/chrome/browser/web_applications/web_app.cc
@@ -8,6 +8,10 @@
 #include <ShellAPI.h>
 #endif  // defined(OS_WIN)
 
+#include <algorithm>
+#include <string>
+#include <vector>
+
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/md5.h"
@@ -15,7 +19,7 @@
 #include "base/path_service.h"
 #include "base/thread.h"
 #include "base/scoped_ptr.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"