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

chrome/browser/search_engines/util.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/search_engines/util.h"
 
 #include <set>
 #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"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 
 string16 GetDefaultSearchEngineName(Profile* profile) {
   if (!profile) {
     NOTREACHED();
     return string16();
   }
   const TemplateURL* const default_provider =
       profile->GetTemplateURLModel()->GetDefaultSearchProvider();
   if (!default_provider) {
     // TODO(cpu): bug 1187517. It is possible to have no default provider.
     // returning an empty string is a stopgap measure for the crash
     // 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
 // prepopulate ids. Duplicate prepopulate ids are not allowed, but due to a
 // bug it was possible get dups. This step is only called when the version
 // number changes. Only pass in a non-NULL value for |service| if the removed
 // items should be removed from the DB.
 static void RemoveDuplicatePrepopulateIDs(
     std::vector<TemplateURL*>* template_urls,
     WebDataService* service) {
@@ skipping 147 matching lines @@
     }
   }
 
   if (keyword_result.builtin_keyword_version != resource_keyword_version) {
     MergeEnginesFromPrepopulateData(prefs, service, template_urls,
                                     default_search_provider);
     *new_resource_keyword_version = resource_keyword_version;
   }
 }