Revert 71485 - Remove wstring from TemplateURL and friends....

chrome/browser/dom_ui/options/browser_options_handler.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/browser_options_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
 #include "base/string_number_conversions.h"
@@ skipping 210 matching lines @@
 
   int default_index = 0;
   ListValue search_engines;
   std::vector<const TemplateURL*> model_urls =
       template_url_model_->GetTemplateURLs();
   for (size_t i = 0; i < model_urls.size(); ++i) {
     if (!model_urls[i]->ShowInDefaultList())
       continue;
 
     DictionaryValue* entry = new DictionaryValue();
-    entry->SetString("name", model_urls[i]->short_name());
+    entry->SetString("name", WideToUTF16Hack(model_urls[i]->short_name()));
     entry->SetInteger("index", i);
     search_engines.Append(entry);
     if (model_urls[i] == default_url)
       default_index = i;
   }
 
   scoped_ptr<Value> default_value(Value::CreateIntegerValue(default_index));
 
   dom_ui_->CallJavascriptFunction(L"BrowserOptions.updateSearchEngines",
                                   search_engines, *(default_value.get()));
@@ skipping 134 matching lines @@
 }
 
 void BrowserOptionsHandler::SaveStartupPagesPref() {
   PrefService* prefs = dom_ui_->GetProfile()->GetPrefs();
 
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs);
   pref.urls = startup_custom_pages_table_model_->GetURLs();
 
   SessionStartupPref::SetStartupPref(prefs, pref);
 }