Remove wstring from TemplateURL and friends.

Re-landing r71485 (which was reverted in r71500).

BUG=23581
TEST=no visible changes; all tests pass

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

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

1 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/webdata/web_database_unittest.cc b/chrome/browser/webdata/web_database_unittest.cc
index dc38100..41489e9 100644
--- a/chrome/browser/webdata/web_database_unittest.cc
+++ b/chrome/browser/webdata/web_database_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -305,8 +305,8 @@ TEST_F(WebDatabaseTest, Keywords) {
   ASSERT_EQ(sql::INIT_OK, db.Init(file_));
 
   TemplateURL template_url;
-  template_url.set_short_name(L"short_name");
-  template_url.set_keyword(L"keyword");
+  template_url.set_short_name(ASCIIToUTF16("short_name"));
+  template_url.set_keyword(ASCIIToUTF16("keyword"));
   GURL favicon_url("http://favicon.url/");
   GURL originating_url("http://google.com/");
   template_url.SetFavIconURL(favicon_url);
@@ -398,8 +398,8 @@ TEST_F(WebDatabaseTest, UpdateKeyword) {
   ASSERT_EQ(sql::INIT_OK, db.Init(file_));
 
   TemplateURL template_url;
-  template_url.set_short_name(L"short_name");
-  template_url.set_keyword(L"keyword");
+  template_url.set_short_name(ASCIIToUTF16("short_name"));
+  template_url.set_keyword(ASCIIToUTF16("keyword"));
   GURL favicon_url("http://favicon.url/");
   GURL originating_url("http://originating.url/");
   template_url.SetFavIconURL(favicon_url);
@@ -414,7 +414,7 @@ TEST_F(WebDatabaseTest, UpdateKeyword) {
   GURL originating_url2("http://originating.url/");
   template_url.set_originating_url(originating_url2);
   template_url.set_autogenerate_keyword(true);
-  EXPECT_EQ(L"url", template_url.keyword());
+  EXPECT_EQ(ASCIIToUTF16("url"), template_url.keyword());
   template_url.add_input_encoding("Shift_JIS");
   set_prepopulate_id(&template_url, 5);
   set_logo_id(&template_url, 2000);
@@ -468,8 +468,8 @@ TEST_F(WebDatabaseTest, KeywordWithNoFavicon) {
   ASSERT_EQ(sql::INIT_OK, db.Init(file_));
 
   TemplateURL template_url;
-  template_url.set_short_name(L"short_name");
-  template_url.set_keyword(L"keyword");
+  template_url.set_short_name(ASCIIToUTF16("short_name"));
+  template_url.set_keyword(ASCIIToUTF16("keyword"));
   template_url.SetURL("http://url/", 0, 0);
   template_url.set_safe_for_autoreplace(true);
   SetID(-100, &template_url);