Remove wstring from l10n_util. Part 3.

BUG=9911
TEST=no visible changes; all tests pass

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

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

2 files changed, 26 insertions, 21 deletions

diff --git a/chrome/browser/autocomplete/keyword_provider.cc b/chrome/browser/autocomplete/keyword_provider.cc
index 5f2d430..71a8f40 100644
--- a/chrome/browser/autocomplete/keyword_provider.cc
+++ b/chrome/browser/autocomplete/keyword_provider.cc
@@ -318,9 +318,10 @@ void KeywordProvider::FillInURLAndContents(
     if (element->url()->SupportsReplacement() &&
         !element->IsExtensionKeyword()) {
       // No query input; return a generic, no-destination placeholder.
-      match->contents.assign(l10n_util::GetStringF(message_id,
-          element->AdjustedShortNameForLocaleDirection(),
-          l10n_util::GetString(IDS_EMPTY_KEYWORD_VALUE)));
+      match->contents.assign(UTF16ToWideHack(
+          l10n_util::GetStringFUTF16(message_id,
+              WideToUTF16Hack(element->AdjustedShortNameForLocaleDirection()),
+              l10n_util::GetStringUTF16(IDS_EMPTY_KEYWORD_VALUE))));
       match->contents_class.push_back(
           ACMatchClassification(0, ACMatchClassification::DIM));
     } else {
@@ -341,10 +342,11 @@ void KeywordProvider::FillInURLAndContents(
       *element, remaining_input, TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
       std::wstring()));
     std::vector<size_t> content_param_offsets;
-    match->contents.assign(l10n_util::GetStringF(message_id,
-                                                 element->short_name(),
-                                                 remaining_input,
-                                                 &content_param_offsets));
+    match->contents.assign(UTF16ToWideHack(
+        l10n_util::GetStringFUTF16(message_id,
+                                   WideToUTF16Hack(element->short_name()),
+                                   WideToUTF16Hack(remaining_input),
+                                   &content_param_offsets)));
     if (content_param_offsets.size() == 2) {
       AutocompleteMatch::ClassifyLocationInString(content_param_offsets[1],
           remaining_input.length(), match->contents.length(),
@@ -420,15 +422,16 @@ AutocompleteMatch KeywordProvider::CreateAutocompleteMatch(
 
   // Create popup entry description based on the keyword name.
   if (!element->IsExtensionKeyword()) {
-    result.description.assign(l10n_util::GetStringF(
-        IDS_AUTOCOMPLETE_KEYWORD_DESCRIPTION, keyword));
-    static const std::wstring kKeywordDesc(
-        l10n_util::GetString(IDS_AUTOCOMPLETE_KEYWORD_DESCRIPTION));
-    AutocompleteMatch::ClassifyLocationInString(kKeywordDesc.find(L"%s"),
-                                                prefix_length,
-                                                result.description.length(),
-                                                ACMatchClassification::DIM,
-                                                &result.description_class);
+    result.description.assign(UTF16ToWideHack(l10n_util::GetStringFUTF16(
+        IDS_AUTOCOMPLETE_KEYWORD_DESCRIPTION, WideToUTF16Hack(keyword))));
+    string16 keyword_desc(
+        l10n_util::GetStringUTF16(IDS_AUTOCOMPLETE_KEYWORD_DESCRIPTION));
+    AutocompleteMatch::ClassifyLocationInString(
+        keyword_desc.find(ASCIIToUTF16("%s")),
+        prefix_length,
+        result.description.length(),
+        ACMatchClassification::DIM,
+        &result.description_class);
   }
 
   return result;
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index bd5a949..ff49c8a 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -161,12 +161,14 @@ void SearchProvider::Start(const AutocompleteInput& input,
     if (default_provider) {
       AutocompleteMatch match;
       match.provider = this;
-      match.contents.assign(l10n_util::GetString(IDS_EMPTY_KEYWORD_VALUE));
+      match.contents.assign(UTF16ToWideHack(
+          l10n_util::GetStringUTF16(IDS_EMPTY_KEYWORD_VALUE)));
       match.contents_class.push_back(
           ACMatchClassification(0, ACMatchClassification::NONE));
-      match.description.assign(l10n_util::GetStringF(
+      match.description.assign(UTF16ToWideHack(l10n_util::GetStringFUTF16(
           IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION,
-          default_provider->AdjustedShortNameForLocaleDirection()));
+          WideToUTF16Hack(
+            default_provider->AdjustedShortNameForLocaleDirection()))));
       match.description_class.push_back(
           ACMatchClassification(0, ACMatchClassification::DIM));
       matches_.push_back(match);
@@ -729,9 +731,9 @@ void SearchProvider::AddMatchToMap(const std::wstring& query_string,
     match.contents.assign(query_string);
     match.contents_class.push_back(
         ACMatchClassification(0, ACMatchClassification::NONE));
-    match.description.assign(l10n_util::GetStringF(
+    match.description.assign(UTF16ToWideHack(l10n_util::GetStringFUTF16(
         IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION,
-        provider.AdjustedShortNameForLocaleDirection()));
+        WideToUTF16Hack(provider.AdjustedShortNameForLocaleDirection()))));
     match.description_class.push_back(
         ACMatchClassification(0, ACMatchClassification::DIM));
   }