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

chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller_unittest.mm

Index: chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller_unittest.mm
===================================================================
--- chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller_unittest.mm	(revision 71499)
+++ chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller_unittest.mm	(working copy)
@@ -1,10 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 "app/l10n_util_mac.h"
 #include "base/scoped_nsobject.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
@@ -206,10 +205,10 @@
 // Tests editing an existing TemplateURL.
 TEST_F(EditSearchEngineControllerTest, EditTemplateURL) {
   TemplateURL url;
-  url.set_short_name(ASCIIToUTF16("Foobar"));
-  url.set_keyword(ASCIIToUTF16("keyword"));
+  url.set_short_name(L"Foobar");
+  url.set_keyword(L"keyword");
   std::string urlString = TemplateURLRef::DisplayURLToURLRef(
-      ASCIIToUTF16("http://foo-bar.com"));
+      L"http://foo-bar.com");
   url.SetURL(urlString, 0, 1);
   TestingProfile* profile = browser_helper_.profile();
   FakeEditSearchEngineController *controller =