Remove wstring from the search engine management APIs

This stops short of doing a wstring -> string16 conversion in template_url and template_url_model since that would ripple through the omnibox and auto-search-detection code, making the change much larger and more complicated.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/3245002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57723 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 8 deletions

diff --git a/chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm b/chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm
index dcb97ed..3d3208a 100644
--- a/chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm
+++ b/chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm
@@ -7,6 +7,7 @@
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #import "base/mac_util.h"
+#include "base/string16.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "grit/app_resources.h"
@@ -119,8 +120,8 @@ void ShiftOriginY(NSView* view, CGFloat amount) {
 
 - (IBAction)save:(id)sender {
   DCHECK([self validateFields]);
-  std::wstring title = base::SysNSStringToWide([nameField_ stringValue]);
-  std::wstring keyword = base::SysNSStringToWide([keywordField_ stringValue]);
+  string16 title = base::SysNSStringToUTF16([nameField_ stringValue]);
+  string16 keyword = base::SysNSStringToUTF16([keywordField_ stringValue]);
   std::string url = base::SysNSStringToUTF8([urlField_ stringValue]);
   controller_->AcceptAddOrEdit(title, keyword, url);
   [self doClose];
@@ -156,14 +157,14 @@ void ShiftOriginY(NSView* view, CGFloat amount) {
 // This sets the image state for all the controls and enables or disables the
 // done button. Returns YES if all the fields are valid.
 - (BOOL)validateFields {
-  std::wstring title = base::SysNSStringToWide([nameField_ stringValue]);
+  string16 title = base::SysNSStringToUTF16([nameField_ stringValue]);
   BOOL titleValid = controller_->IsTitleValid(title);
   [self setIsValid:titleValid
            toolTip:IDS_SEARCH_ENGINES_INVALID_TITLE_TT
       forImageView:nameImage_
          textField:nameField_];
 
-  std::wstring keyword = base::SysNSStringToWide([keywordField_ stringValue]);
+  string16 keyword = base::SysNSStringToUTF16([keywordField_ stringValue]);
   BOOL keywordValid = controller_->IsKeywordValid(keyword);
   [self setIsValid:keywordValid
            toolTip:IDS_SEARCH_ENGINES_INVALID_KEYWORD_TT
diff --git a/chrome/browser/cocoa/keyword_editor_cocoa_controller.h b/chrome/browser/cocoa/keyword_editor_cocoa_controller.h
index 647b200..d894957 100644
--- a/chrome/browser/cocoa/keyword_editor_cocoa_controller.h
+++ b/chrome/browser/cocoa/keyword_editor_cocoa_controller.h
@@ -7,6 +7,7 @@
 #include "app/table_model_observer.h"
 #import "base/cocoa_protocols_mac.h"
 #include "base/scoped_ptr.h"
+#include "base/string16.h"
 #include "chrome/browser/cocoa/table_row_nsimage_cache.h"
 #include "chrome/browser/search_engines/edit_search_engine_controller.h"
 #include "chrome/browser/search_engines/keyword_editor_controller.h"
@@ -35,8 +36,8 @@ class KeywordEditorModelObserver : public TemplateURLModelObserver,
   // indicates a new TemplateURL should be created rather than modifying an
   // existing TemplateURL.
   virtual void OnEditedKeyword(const TemplateURL* template_url,
-                               const std::wstring& title,
-                               const std::wstring& keyword,
+                               const string16& title,
+                               const string16& keyword,
                                const std::string& url);
 
   // TableModelObserver overrides. Invalidate icon cache.
diff --git a/chrome/browser/cocoa/keyword_editor_cocoa_controller.mm b/chrome/browser/cocoa/keyword_editor_cocoa_controller.mm
index c71ac1c..55133cf 100644
--- a/chrome/browser/cocoa/keyword_editor_cocoa_controller.mm
+++ b/chrome/browser/cocoa/keyword_editor_cocoa_controller.mm
@@ -51,8 +51,8 @@ void KeywordEditorModelObserver::OnTemplateURLModelChanged() {
 
 void KeywordEditorModelObserver::OnEditedKeyword(
     const TemplateURL* template_url,
-    const std::wstring& title,
-    const std::wstring& keyword,
+    const string16& title,
+    const string16& keyword,
     const std::string& url) {
   KeywordEditorController* controller = [controller_ controller];
   if (template_url) {