Remove wstring from TemplateURL and friends....

chrome/browser/ui/cocoa/search_engine_dialog_controller.mm

-// Copyright (c) 2010 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_dialog_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/mac/mac_util.h"
@@ skipping 186 matching lines @@
     NSImage* logoImage =
         ResourceBundle::GetSharedInstance().GetNativeImageNamed(logoId);
     NSRect logoBounds = NSZeroRect;
     logoBounds.size = [logoImage size];
     NSImageView* logoView =
         [[[NSImageView alloc] initWithFrame:logoBounds] autorelease];
     [logoView setImage:logoImage];
     [logoView setEditable:NO];
 
     // Tooltip text provides accessibility.
-    [logoView setToolTip:base::SysWideToNSString(engine->short_name())];
+    [logoView setToolTip:base::SysUTF16ToNSString(engine->short_name())];
     engineIdentifier = logoView;
   } else {
     // No logo -- we must show a text label.
     NSRect labelBounds = NSMakeRect(0, 0, kLogoLabelWidth, kLogoLabelHeight);
     NSTextField* labelField =
         [[[NSTextField alloc] initWithFrame:labelBounds] autorelease];
     [labelField setBezeled:NO];
     [labelField setEditable:NO];
     [labelField setSelectable:NO];
 
     scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(
         [[NSMutableParagraphStyle alloc] init]);
     [paragraphStyle setAlignment:NSCenterTextAlignment];
     NSDictionary* attrs = [NSDictionary dictionaryWithObjectsAndKeys:
         [NSFont boldSystemFontOfSize:13], NSFontAttributeName,
         paragraphStyle.get(), NSParagraphStyleAttributeName,
         nil];
 
-    NSString* value = base::SysWideToNSString(engine->short_name());
+    NSString* value = base::SysUTF16ToNSString(engine->short_name());
     scoped_nsobject<NSAttributedString> attrValue(
         [[NSAttributedString alloc] initWithString:value
                                         attributes:attrs]);
 
     [labelField setAttributedStringValue:attrValue.get()];
 
     engineIdentifier = labelField;
   }
 
   // Make the "Choose" button.
@@ skipping 37 matching lines @@
 - (NSFont*)mainLabelFont {
   return [NSFont boldSystemFontOfSize:13];
 }
 
 - (IBAction)searchEngineSelected:(id)sender {
   [[self window] close];
   [NSApp stopModalWithCode:[sender tag]];
 }
 
 @end