Remove wstring from TemplateURL and friends....

chrome/browser/gtk/keyword_editor_view_unittest.cc

Index: chrome/browser/gtk/keyword_editor_view_unittest.cc
===================================================================
--- chrome/browser/gtk/keyword_editor_view_unittest.cc	(revision 71269)
+++ chrome/browser/gtk/keyword_editor_view_unittest.cc	(working copy)
@@ -1,4 +1,4 @@
-// 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.
 
@@ -30,8 +30,8 @@
                           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)