Port some unit tests from chrome/browser/

chrome/browser/history/url_database_unittest.cc

 // Copyright (c) 2006-2008 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 "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/common/sqlite_compiled_statement.h"
 #include "chrome/common/sqlite_utils.h"
@@ skipping 57 matching lines @@
   std::wstring db_file_;
   sqlite3* db_;
   SqliteStatementCache* statement_cache_;
 };
 
 }  // namespace
 
 // Test add and query for the URL table in the HistoryDatabase
 TEST_F(URLDatabaseTest, AddURL) {
   // first, add two URLs
-  const GURL url1(L"http://www.google.com/");
+  const GURL url1("http://www.google.com/");
   URLRow url_info1(url1);
   url_info1.set_title(L"Google");
   url_info1.set_visit_count(4);
   url_info1.set_typed_count(2);
   url_info1.set_last_visit(Time::Now() - TimeDelta::FromDays(1));
   url_info1.set_hidden(false);
   EXPECT_TRUE(AddURL(url_info1));
 
-  const GURL url2(L"http://mail.google.com/");
+  const GURL url2("http://mail.google.com/");
   URLRow url_info2(url2);
   url_info2.set_title(L"Google Mail");
   url_info2.set_visit_count(3);
   url_info2.set_typed_count(0);
   url_info2.set_last_visit(Time::Now() - TimeDelta::FromDays(2));
   url_info2.set_hidden(true);
   EXPECT_TRUE(AddURL(url_info2));
 
   // query both of them
   URLRow info;
@@ skipping 24 matching lines @@
   //EXPECT_TRUE(db.DeleteDomain(kDomainID));
 
   // Make sure the urls have been properly removed
   // FIXME(ACW) commented out because remove no longer works.
   //EXPECT_TRUE(db.GetURLInfo(url1, NULL) == NULL);
   //EXPECT_TRUE(db.GetURLInfo(url2, NULL) == NULL);
 }
 
 // Tests adding, querying and deleting keyword visits.
 TEST_F(URLDatabaseTest, KeywordSearchTermVisit) {
-  const GURL url1(L"http://www.google.com/");
+  const GURL url1("http://www.google.com/");
   URLRow url_info1(url1);
   url_info1.set_title(L"Google");
   url_info1.set_visit_count(4);
   url_info1.set_typed_count(2);
   url_info1.set_last_visit(Time::Now() - TimeDelta::FromDays(1));
   url_info1.set_hidden(false);
   URLID url_id = AddURL(url_info1);
   ASSERT_TRUE(url_id != 0);
 
   // Add a keyword visit.
   ASSERT_TRUE(SetKeywordSearchTermsForURL(url_id, 1, L"visit"));
 
   // Make sure we get it back.
   std::vector<KeywordSearchTermVisit> matches;
   GetMostRecentKeywordSearchTerms(1, L"visit", 10, &matches);
-  ASSERT_EQ(1, matches.size());
+  ASSERT_EQ(1U, matches.size());
   ASSERT_EQ(L"visit", matches[0].term);
 
   // Delete the keyword visit.
   DeleteAllSearchTermsForKeyword(1);
 
   // Make sure we don't get it back when querying.
   matches.clear();
   GetMostRecentKeywordSearchTerms(1, L"visit", 10, &matches);
-  ASSERT_EQ(0, matches.size());
+  ASSERT_EQ(0U, matches.size());
 }
 
 // Make sure deleting a URL also deletes a keyword visit.
 TEST_F(URLDatabaseTest, DeleteURLDeletesKeywordSearchTermVisit) {
-  const GURL url1(L"http://www.google.com/");
+  const GURL url1("http://www.google.com/");
   URLRow url_info1(url1);
   url_info1.set_title(L"Google");
   url_info1.set_visit_count(4);
   url_info1.set_typed_count(2);
   url_info1.set_last_visit(Time::Now() - TimeDelta::FromDays(1));
   url_info1.set_hidden(false);
   URLID url_id = AddURL(url_info1);
   ASSERT_TRUE(url_id != 0);
 
   // Add a keyword visit.
   ASSERT_TRUE(SetKeywordSearchTermsForURL(url_id, 1, L"visit"));
 
   // Delete the url.
   ASSERT_TRUE(DeleteURLRow(url_id));
 
   // Make sure the keyword visit was deleted.
   std::vector<KeywordSearchTermVisit> matches;
   GetMostRecentKeywordSearchTerms(1, L"visit", 10, &matches);
-  ASSERT_EQ(0, matches.size());
+  ASSERT_EQ(0U, matches.size());
 }
 
 }  // namespace history