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

chrome/browser/dom_ui/options/browser_options_handler.cc

Index: chrome/browser/dom_ui/options/browser_options_handler.cc
===================================================================
--- chrome/browser/dom_ui/options/browser_options_handler.cc	(revision 71499)
+++ chrome/browser/dom_ui/options/browser_options_handler.cc	(working copy)
@@ -1,4 +1,4 @@
-// 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.
 
@@ -229,7 +229,7 @@
       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)