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

chrome/browser/search_engines/util.cc

Index: chrome/browser/search_engines/util.cc
===================================================================
--- chrome/browser/search_engines/util.cc	(revision 71499)
+++ chrome/browser/search_engines/util.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.
 
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "base/logging.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
@@ -28,7 +29,7 @@
     // http://code.google.com/p/chromium/issues/detail?id=2573
     return string16();
   }
-  return default_provider->short_name();
+  return WideToUTF16(default_provider->short_name());
 }
 
 // Removes (and deletes) TemplateURLs from |urls| that have duplicate