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

chrome/browser/webdata/web_database_unittest.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 <list>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 286 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(WebDatabaseTest);
 };
 
 TEST_F(WebDatabaseTest, Keywords) {
   WebDatabase db;
 
   ASSERT_EQ(sql::INIT_OK, db.Init(file_));
 
   TemplateURL template_url;
-  template_url.set_short_name(ASCIIToUTF16("short_name"));
-  template_url.set_keyword(ASCIIToUTF16("keyword"));
+  template_url.set_short_name(L"short_name");
+  template_url.set_keyword(L"keyword");
   GURL favicon_url("http://favicon.url/");
   GURL originating_url("http://google.com/");
   template_url.SetFavIconURL(favicon_url);
   template_url.SetURL("http://url/", 0, 0);
   template_url.set_safe_for_autoreplace(true);
   base::Time created_time = Time::Now();
   template_url.set_date_created(created_time);
   template_url.set_show_in_default_list(true);
   template_url.set_originating_url(originating_url);
   template_url.set_usage_count(32);
@@ skipping 71 matching lines @@
   ASSERT_EQ(10, db.GetDefaulSearchProviderID());
   ASSERT_EQ(11, db.GetBuitinKeywordVersion());
 }
 
 TEST_F(WebDatabaseTest, UpdateKeyword) {
   WebDatabase db;
 
   ASSERT_EQ(sql::INIT_OK, db.Init(file_));
 
   TemplateURL template_url;
-  template_url.set_short_name(ASCIIToUTF16("short_name"));
-  template_url.set_keyword(ASCIIToUTF16("keyword"));
+  template_url.set_short_name(L"short_name");
+  template_url.set_keyword(L"keyword");
   GURL favicon_url("http://favicon.url/");
   GURL originating_url("http://originating.url/");
   template_url.SetFavIconURL(favicon_url);
   template_url.SetURL("http://url/", 0, 0);
   template_url.set_safe_for_autoreplace(true);
   template_url.set_show_in_default_list(true);
   template_url.SetSuggestionsURL("url2", 0, 0);
   SetID(1, &template_url);
 
   EXPECT_TRUE(db.AddKeyword(template_url));
 
   GURL originating_url2("http://originating.url/");
   template_url.set_originating_url(originating_url2);
   template_url.set_autogenerate_keyword(true);
-  EXPECT_EQ(ASCIIToUTF16("url"), template_url.keyword());
+  EXPECT_EQ(L"url", template_url.keyword());
   template_url.add_input_encoding("Shift_JIS");
   set_prepopulate_id(&template_url, 5);
   set_logo_id(&template_url, 2000);
   template_url.SetInstantURL("http://instant2/", 0, 0);
   EXPECT_TRUE(db.UpdateKeyword(template_url));
 
   std::vector<TemplateURL*> template_urls;
   EXPECT_TRUE(db.GetKeywords(&template_urls));
 
   EXPECT_EQ(1U, template_urls.size());
@@ skipping 33 matching lines @@
 
   delete restored_url;
 }
 
 TEST_F(WebDatabaseTest, KeywordWithNoFavicon) {
   WebDatabase db;
 
   ASSERT_EQ(sql::INIT_OK, db.Init(file_));
 
   TemplateURL template_url;
-  template_url.set_short_name(ASCIIToUTF16("short_name"));
-  template_url.set_keyword(ASCIIToUTF16("keyword"));
+  template_url.set_short_name(L"short_name");
+  template_url.set_keyword(L"keyword");
   template_url.SetURL("http://url/", 0, 0);
   template_url.set_safe_for_autoreplace(true);
   SetID(-100, &template_url);
 
   EXPECT_TRUE(db.AddKeyword(template_url));
 
   std::vector<TemplateURL*> template_urls;
   EXPECT_TRUE(db.GetKeywords(&template_urls));
   EXPECT_EQ(1U, template_urls.size());
   const TemplateURL* restored_url = template_urls.front();
@@ skipping 2350 matching lines @@
                                                       &credit_card_a,
                                                       &cc_label_a,
                                                       &cc_number_encrypted_a,
                                                       &cc_date_modified_a));
     EXPECT_EQ(credit_card, credit_card_a);
     EXPECT_EQ(cc_label, cc_label_a);
     EXPECT_EQ(cc_number_encrypted, cc_number_encrypted_a);
     EXPECT_EQ(cc_date_modified, cc_date_modified_a);
   }
 }