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

chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller.mm

-// 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.
 
 #import "chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #import "base/mac/mac_util.h"
 #include "base/string16.h"
@@ skipping 68 matching lines @@
                                         delta:windowDelta];
 
   ResourceBundle& bundle = ResourceBundle::GetSharedInstance();
   goodImage_.reset([bundle.GetNativeImageNamed(IDR_INPUT_GOOD) retain]);
   badImage_.reset([bundle.GetNativeImageNamed(IDR_INPUT_ALERT) retain]);
   if (templateURL_) {
     // Defaults to |..._NEW_WINDOW_TITLE|.
     [window setTitle:l10n_util::GetNSString(
       IDS_SEARCH_ENGINES_EDITOR_EDIT_WINDOW_TITLE)];
     [nameField_ setStringValue:
-        base::SysUTF16ToNSString(templateURL_->short_name())];
+        base::SysWideToNSString(templateURL_->short_name())];
     [keywordField_ setStringValue:
-        base::SysUTF16ToNSString(templateURL_->keyword())];
+        base::SysWideToNSString(templateURL_->keyword())];
     [urlField_ setStringValue:
-        base::SysUTF16ToNSString(templateURL_->url()->DisplayURL())];
+        base::SysWideToNSString(templateURL_->url()->DisplayURL())];
     [urlField_ setEnabled:(templateURL_->prepopulate_id() == 0)];
   }
   // When creating a new keyword, this will mark the fields as "invalid" and
   // will not let the user save. If this is an edit, then this will set all
   // the images to the "valid" state.
   [self validateFields];
 }
 
 // When the window closes, clean ourselves up.
 - (void)windowWillClose:(NSNotification*)notif {
@@ skipping 73 matching lines @@
            toolTip:IDS_SEARCH_ENGINES_INVALID_URL_TT
       forImageView:urlImage_
          textField:urlField_];
 
   BOOL isValid = (titleValid && keywordValid && urlValid);
   [doneButton_ setEnabled:isValid];
   return isValid;
 }
 
 @end