Remove wstring from l10n_util. Part 2....

chrome/browser/autocomplete/autocomplete.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/autocomplete/autocomplete.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
@@ skipping 940 matching lines @@
   }
 
   AutocompleteMatch match(NULL, 0, false, AutocompleteMatch::OPEN_HISTORY_PAGE);
   match.fill_into_edit = input_.text();
 
   // Mark up the text such that the user input text is bold.
   size_t keyword_offset = std::wstring::npos;  // Offset into match.contents.
   if (history_contents_provider_->db_match_count() ==
       history_contents_provider_->kMaxMatchCount) {
     // History contents searcher has maxed out.
-    match.contents = l10n_util::GetStringF(IDS_OMNIBOX_RECENT_HISTORY_MANY,
-                                           input_.text(),
-                                           &keyword_offset);
+    match.contents = UTF16ToWideHack(
+        l10n_util::GetStringFUTF16(IDS_OMNIBOX_RECENT_HISTORY_MANY,
+                                   WideToUTF16Hack(input_.text()),
+                                   &keyword_offset));
   } else {
     // We can report exact matches when there aren't too many.
     std::vector<size_t> content_param_offsets;
-    match.contents = l10n_util::GetStringF(
+    match.contents = UTF16ToWideHack(l10n_util::GetStringFUTF16(
         IDS_OMNIBOX_RECENT_HISTORY,
-        UTF16ToWide(base::FormatNumber(history_contents_provider_->
-                                           db_match_count())),
-        input_.text(),
-        &content_param_offsets);
+        base::FormatNumber(history_contents_provider_->
+                               db_match_count()),
+        WideToUTF16Hack(input_.text()),
+        &content_param_offsets));
 
     // content_param_offsets is ordered based on supplied params, we expect
     // that the second one contains the query (first is the number).
     if (content_param_offsets.size() == 2) {
       keyword_offset = content_param_offsets[1];
     } else {
       // See comments on an identical NOTREACHED() in search_provider.cc.
       NOTREACHED();
     }
   }
@@ skipping 20 matching lines @@
 void AutocompleteController::CheckIfDone() {
   for (ACProviders::const_iterator i(providers_.begin()); i != providers_.end();
        ++i) {
     if (!(*i)->done()) {
       done_ = false;
       return;
     }
   }
   done_ = true;
 }