Revert 70271 - Remove wstring from l10n_util. Part 3....

chrome/browser/search_engines/template_url_table_model.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/search_engines/template_url_table_model.h"
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
@@ skipping 170 matching lines @@
   DCHECK(row >= 0 && row < RowCount());
   const TemplateURL& url = entries_[row]->template_url();
 
   switch (col_id) {
     case IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN: {
       std::wstring url_short_name = url.short_name();
       // TODO(xji): Consider adding a special case if the short name is a URL,
       // since those should always be displayed LTR. Please refer to
       // http://crbug.com/6726 for more information.
       base::i18n::AdjustStringForLocaleDirection(&url_short_name);
-      if (template_url_model_->GetDefaultSearchProvider() == &url) {
-        return UTF16ToWideHack(
-            l10n_util::GetStringFUTF16(IDS_SEARCH_ENGINES_EDITOR_DEFAULT_ENGINE,
-                                       WideToUTF16Hack(url_short_name)));
-      }
-      return url_short_name;
+      return (template_url_model_->GetDefaultSearchProvider() == &url) ?
+          l10n_util::GetStringF(IDS_SEARCH_ENGINES_EDITOR_DEFAULT_ENGINE,
+                                url_short_name) : url_short_name;
     }
 
     case IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN: {
       // Keyword should be domain name. Force it to have LTR directionality.
       string16 keyword = WideToUTF16(url.keyword());
       keyword = base::i18n::GetDisplayStringInLTRDirectionality(keyword);
       return UTF16ToWide(keyword);
     }
 
     default:
@@ skipping 12 matching lines @@
 }
 
 bool TemplateURLTableModel::HasGroups() {
   return true;
 }
 
 TemplateURLTableModel::Groups TemplateURLTableModel::GetGroups() {
   Groups groups;
 
   Group search_engine_group;
-  search_engine_group.title = UTF16ToWideHack(
-      l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_MAIN_SEPARATOR));
+  search_engine_group.title =
+      l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_MAIN_SEPARATOR);
   search_engine_group.id = kMainGroupID;
   groups.push_back(search_engine_group);
 
   Group other_group;
-  other_group.title = UTF16ToWideHack(
-      l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_OTHER_SEPARATOR));
+  other_group.title =
+      l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_OTHER_SEPARATOR);
   other_group.id = kOtherGroupID;
   groups.push_back(other_group);
 
   return groups;
 }
 
 int TemplateURLTableModel::GetGroupID(int row) {
   DCHECK(row >= 0 && row < RowCount());
   return row < last_search_engine_index_ ? kMainGroupID : kOtherGroupID;
 }
@@ skipping 129 matching lines @@
 void TemplateURLTableModel::FavIconAvailable(ModelEntry* entry) {
   std::vector<ModelEntry*>::iterator i =
       find(entries_.begin(), entries_.end(), entry);
   DCHECK(i != entries_.end());
   NotifyChanged(static_cast<int>(i - entries_.begin()));
 }
 
 void TemplateURLTableModel::OnTemplateURLModelChanged() {
   Reload();
 }