Remove wstring from TemplateURL and friends....

chrome/browser/gtk/keyword_editor_view_unittest.cc

-// 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.
 
 #include "chrome/browser/gtk/keyword_editor_view.h"
 
 #include <gtk/gtk.h>
 
 #include <string>
 #include <vector>
 
@@ skipping 11 matching lines @@
  public:
   virtual void SetUp() {
     profile_.reset(new TestingProfile());
     profile_->CreateTemplateURLModel();
   }
 
   TemplateURL* AddToModel(const std::string& name,
                           const std::string& keyword,
                           bool make_default) {
     TemplateURL* template_url = new TemplateURL();
-    template_url->set_short_name(UTF8ToWide(name));
-    template_url->set_keyword(UTF8ToWide(keyword));
+    template_url->set_short_name(UTF8ToUTF16(name));
+    template_url->set_keyword(UTF8ToUTF16(keyword));
     template_url->SetURL("http://example.com/{searchTerms}", 0, 0);
     profile_->GetTemplateURLModel()->Add(template_url);
     if (make_default)
       profile_->GetTemplateURLModel()->SetDefaultSearchProvider(template_url);
     return template_url;
   }
 
   int GetSelectedRowNum(const KeywordEditorView& editor) {
     GtkTreeIter iter;
     if (!gtk_tree_selection_get_selected(editor.selection_, NULL, &iter))
@@ skipping 217 matching lines @@
   editor.OnEditedKeyword(d, ASCIIToUTF16("DD"), ASCIIToUTF16("d"),
                          "example.com");
   EXPECT_STREQ("!,_,AA,BBB,_,@,_,C,DD",
                GetDisplayedEngines(editor).c_str());
 
   editor.OnEditedKeyword(c, ASCIIToUTF16("CC"), ASCIIToUTF16("cc"),
                          "example.com");
   EXPECT_STREQ("!,_,AA,BBB,_,@,_,CC,DD",
                GetDisplayedEngines(editor).c_str());
 }