Remove wstring from TemplateURL and friends....

chrome/browser/ui/cocoa/search_engine_list_model.mm

-// 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.
 
 #import "chrome/browser/ui/cocoa/search_engine_list_model.h"
 
 #include "base/sys_string_conversions.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_model_observer.h"
 
@@ skipping 60 matching lines @@
 
 // Walks the model and builds an array of NSStrings to display to the user.
 // Assumes there is a non-NULL model.
 - (void)buildEngineList {
   scoped_nsobject<NSMutableArray> engines([[NSMutableArray alloc] init]);
 
   typedef std::vector<const TemplateURL*> TemplateURLs;
   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()];
 }
 
 // The index into |-searchEngines| of the current default search engine.
 // -1 if there is no default.
 - (NSInteger)defaultIndex {
   if (!model_) return -1;
 
@@ skipping 34 matching lines @@
     }
     DCHECK(false);
   }
 }
 
 // Return TRUE if the default is managed via policy.
 - (BOOL)isDefaultManaged {
   return model_->is_default_search_managed();
 }
 @end