Remove wstring from TableModel....

chrome/browser/dom_ui/options/search_engine_manager_handler.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/dom_ui/options/search_engine_manager_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 138 matching lines @@
 
 void SearchEngineManagerHandler::OnItemsRemoved(int start, int length) {
   OnModelChanged();
 }
 
 DictionaryValue* SearchEngineManagerHandler::CreateDictionaryForHeading(
     int group_index) {
   TableModel::Groups groups = list_controller_->table_model()->GetGroups();
 
   DictionaryValue* dict = new DictionaryValue();
-  dict->SetString("heading", WideToUTF16Hack(groups[group_index].title));
+  dict->SetString("heading", groups[group_index].title);
   return dict;
 }
 
 DictionaryValue* SearchEngineManagerHandler::CreateDictionaryForEngine(
     int index, bool is_default) {
   TemplateURLTableModel* table_model = list_controller_->table_model();
 
   DictionaryValue* dict = new DictionaryValue();
-  dict->SetString("name", WideToUTF16Hack(table_model->GetText(
-    index, IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN)));
-  dict->SetString("keyword", WideToUTF16Hack(table_model->GetText(
-    index, IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN)));
+  dict->SetString("name", table_model->GetText(
+    index, IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN));
+  dict->SetString("keyword", table_model->GetText(
+    index, IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN));
   const TemplateURL* template_url = list_controller_->GetTemplateURL(index);
   GURL icon_url = template_url->GetFavIconURL();
   if (icon_url.is_valid())
     dict->SetString("iconURL", icon_url.spec());
   dict->SetString("modelIndex", base::IntToString(index));
 
   if (list_controller_->CanRemove(template_url))
     dict->SetString("canBeRemoved", "1");
   if (list_controller_->CanMakeDefault(template_url))
     dict->SetString("canBeDefault", "1");
@@ skipping 106 matching lines @@
   string16 keyword;
   std::string url;
   if (!args->GetString(ENGINE_NAME, &name) ||
       !args->GetString(ENGINE_KEYWORD, &keyword) ||
       !args->GetString(ENGINE_URL, &url)) {
     NOTREACHED();
     return;
   }
   edit_controller_->AcceptAddOrEdit(name, keyword, url);
 }