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

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

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

13 files changed, 25 insertions, 15 deletions

diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc
index cca2169..7371c8c 100644
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -6,7 +6,7 @@
 
 #include "app/l10n_util.h"
 #include "base/i18n/number_formatting.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/common/time_format.h"
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index 8ea8f10..145856d2 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -14,7 +14,7 @@
 #include "base/file_util.h"
 #include "base/gfx/rect.h"
 #include "base/i18n/time_formatting.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_item_model.h"
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc
index 4f5c780..87b11a9 100644
--- a/chrome/browser/download/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -11,7 +11,8 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
-#include "base/string_util.h"
+#include "base/string_piece.h"
+#include "base/utf_string_conversions.h"
 #include "base/task.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/encoding_menu_controller.cc b/chrome/browser/encoding_menu_controller.cc
index 69871a1..cfb59cf 100644
--- a/chrome/browser/encoding_menu_controller.cc
+++ b/chrome/browser/encoding_menu_controller.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/encoding_menu_controller.h"
 
 #include "app/l10n_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
diff --git a/chrome/browser/language_combobox_model.cc b/chrome/browser/language_combobox_model.cc
index bf98442..03d31a5 100644
--- a/chrome/browser/language_combobox_model.cc
+++ b/chrome/browser/language_combobox_model.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/language_combobox_model.h"
 
 #include "app/l10n_util.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/pref_service.h"
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index fc33220..466cfc3 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -7,7 +7,7 @@
 #include "app/l10n_util.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/child_process_host.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/renderer_host/backing_store_manager.h"
diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc
index 969c17b..0ff9a57 100644
--- a/chrome/browser/process_singleton_linux.cc
+++ b/chrome/browser/process_singleton_linux.cc
@@ -54,8 +54,8 @@
 #include "base/process_util.h"
 #include "base/safe_strerror_posix.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 "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/browser_init.h"
diff --git a/chrome/browser/search_engines/edit_search_engine_controller.cc b/chrome/browser/search_engines/edit_search_engine_controller.cc
index 9e3d5d7..58fb95b 100644
--- a/chrome/browser/search_engines/edit_search_engine_controller.cc
+++ b/chrome/browser/search_engines/edit_search_engine_controller.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/search_engines/edit_search_engine_controller.h"
 
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index 8432064..bc9af41 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -8,7 +8,7 @@
 #include "app/l10n_util.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google_url_tracker.h"
 #include "chrome/browser/search_engines/template_url_model.h"
diff --git a/chrome/browser/search_engines/template_url_parser.cc b/chrome/browser/search_engines/template_url_parser.cc
index 60947c6..ff0d2af3d 100644
--- a/chrome/browser/search_engines/template_url_parser.cc
+++ b/chrome/browser/search_engines/template_url_parser.cc
@@ -4,12 +4,14 @@
 
 #include "chrome/browser/search_engines/template_url_parser.h"
 
+#include <algorithm>
 #include <map>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
@@ -205,7 +207,7 @@ class ParsingContext {
 
  private:
   static void InitMapping() {
-    kElementNameToElementTypeMap = new std::map<std::string,ElementType>;
+    kElementNameToElementTypeMap = new std::map<std::string, ElementType>;
     (*kElementNameToElementTypeMap)[kURLElement] = URL;
     (*kElementNameToElementTypeMap)[kParamElement] = PARAM;
     (*kElementNameToElementTypeMap)[kShortNameElement] = SHORT_NAME;
@@ -222,7 +224,7 @@ class ParsingContext {
   }
 
   // Key is UTF8 encoded.
-  static std::map<std::string,ElementType>* kElementNameToElementTypeMap;
+  static std::map<std::string, ElementType>* kElementNameToElementTypeMap;
   // TemplateURL supplied to Read method. It's owned by the caller, so we
   // don't need to free it.
   TemplateURL* url_;
@@ -253,7 +255,7 @@ class ParsingContext {
 };
 
 // static
-std::map<std::string,ParsingContext::ElementType>*
+std::map<std::string, ParsingContext::ElementType>*
     ParsingContext::kElementNameToElementTypeMap = NULL;
 
 std::wstring XMLCharToWide(const xmlChar* value) {
@@ -385,10 +387,10 @@ static void AppendParamToQuery(const std::string& key,
                                const std::string& value,
                                std::string* query) {
   if (!query->empty())
-   query->append("&");
+    query->append("&");
   if (!key.empty()) {
-   query->append(key);
-   query->append("=");
+    query->append(key);
+    query->append("=");
   }
   query->append(value);
 }
@@ -548,7 +550,7 @@ bool IsLegal(TemplateURL* url) {
   return true;
 }
 
-} // namespace
+}  // namespace
 
 // static
 bool TemplateURLParser::Parse(const unsigned char* data, size_t length,
diff --git a/chrome/browser/search_engines/template_url_table_model.cc b/chrome/browser/search_engines/template_url_table_model.cc
index c47ce9a..894f56f 100644
--- a/chrome/browser/search_engines/template_url_table_model.cc
+++ b/chrome/browser/search_engines/template_url_table_model.cc
@@ -4,12 +4,15 @@
 
 #include "chrome/browser/search_engines/template_url_table_model.h"
 
+#include <vector>
+
 #include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/table_model_observer.h"
 #include "base/callback.h"
 #include "base/stl_util-inl.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/profile.h"
 #include "grit/app_resources.h"
diff --git a/chrome/browser/search_engines/template_url_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc
index 5c6414b..b2ef832 100644
--- a/chrome/browser/search_engines/template_url_unittest.cc
+++ b/chrome/browser/search_engines/template_url_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "base/base_paths.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/search_engines/template_url.h"
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc
index debaca5..9590cbb 100644
--- a/chrome/browser/shell_integration.cc
+++ b/chrome/browser/shell_integration.cc
@@ -7,6 +7,7 @@
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/browser/chrome_thread.h"
@@ -43,7 +44,7 @@ std::string ShellIntegration::GetCommandLineArgumentsCommon(const GURL& url,
     arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kAppId) +
         L"=\"" + ASCIIToWide(UTF16ToASCII(extension_app_id)) + L"\" --" +
         ASCIIToWide(switches::kEnableExtensionApps);
-  } else {  
+  } else {
     // Use '--app=url' instead of just 'url' to launch the browser with minimal
     // chrome.
     // Note: Do not change this flag!  Old Gears shortcuts will break if you do!