Remove wstring from TemplateURL and friends....

chrome/browser/ui/cocoa/search_engine_list_model.mm

Index: chrome/browser/ui/cocoa/search_engine_list_model.mm
===================================================================
--- chrome/browser/ui/cocoa/search_engine_list_model.mm	(revision 71269)
+++ chrome/browser/ui/cocoa/search_engine_list_model.mm	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 
@@ -79,7 +79,7 @@
   TemplateURLs modelURLs = model_->GetTemplateURLs();
   for (size_t i = 0; i < modelURLs.size(); ++i) {
     if (modelURLs[i]->ShowInDefaultList())
-      [engines addObject:base::SysWideToNSString(modelURLs[i]->short_name())];
+      [engines addObject:base::SysUTF16ToNSString(modelURLs[i]->short_name())];
   }
 
   [self setSearchEngines:engines.get()];