Remove wstring from TemplateURL and friends....

chrome/browser/search_engines/template_url_prepopulate_data.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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_prepopulate_data.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <locale.h>
 #endif
 
 #include "base/command_line.h"
@@ skipping 3360 matching lines @@
                                          int logo_id,
                                          int id) {
   TemplateURL* new_turl = new TemplateURL();
   new_turl->SetURL(WideToUTF8(search_url), 0, 0);
   if (favicon_url)
     new_turl->SetFavIconURL(GURL(favicon_url));
   if (suggest_url)
     new_turl->SetSuggestionsURL(WideToUTF8(suggest_url), 0, 0);
   if (instant_url)
     new_turl->SetInstantURL(WideToUTF8(instant_url), 0, 0);
-  new_turl->set_short_name(name);
+  new_turl->set_short_name(WideToUTF16Hack(name));
   if (keyword == NULL)
     new_turl->set_autogenerate_keyword(true);
   else
-    new_turl->set_keyword(keyword);
+    new_turl->set_keyword(WideToUTF16Hack(keyword));
   new_turl->set_show_in_default_list(true);
   new_turl->set_safe_for_autoreplace(true);
   new_turl->set_date_created(Time());
   std::vector<std::string> turl_encodings;
   turl_encodings.push_back(encoding);
   new_turl->set_input_encodings(turl_encodings);
   new_turl->set_search_engine_type(search_engine_type);
   new_turl->set_logo_id(logo_id);
   new_turl->set_prepopulate_id(id);
   return new_turl;
@@ skipping 168 matching lines @@
   for (size_t i = 0; i < arraysize(kAllEngines); ++i) {
     std::string url_utf8_string(ToUTF8(kAllEngines[i]->search_url));
     GURL url(url_utf8_string);
     if (origin_to_find == url.GetOrigin())
       return kAllEngines[i]->logo_id;
   }
   return kNoSearchEngineLogo;
 }
 
 }  // namespace TemplateURLPrepopulateData