Port some unit tests from chrome/browser/

chrome/browser/history/expire_history_backend_unittest.cc

Index: chrome/browser/history/expire_history_backend_unittest.cc
diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc
index 305a094f0fe7d2d0eaeec019734c4d2a2797fbf2..bfcb0871e04ad9164f309ec41d86f6d6a0ab3910 100644
--- a/chrome/browser/history/expire_history_backend_unittest.cc
+++ b/chrome/browser/history/expire_history_backend_unittest.cc
@@ -292,7 +292,7 @@ void ExpireHistoryTest::EnsureURLInfoGone(const URLRow& row) {
   // There should be no visits.
   VisitVector visits;
   main_db_->GetVisitsForURL(row.id(), &visits);
-  EXPECT_EQ(0, visits.size());
+  EXPECT_EQ(0U, visits.size());
 
   // Thumbnail should be gone.
   EXPECT_FALSE(HasThumbnail(row.id()));
@@ -385,7 +385,7 @@ TEST_F(ExpireHistoryTest, DeleteURLAndFavicon) {
 
   VisitVector visits;
   main_db_->GetVisitsForURL(url_ids[2], &visits);
-  ASSERT_EQ(1, visits.size());
+  ASSERT_EQ(1U, visits.size());
   EXPECT_EQ(1, CountTextMatchesForURL(last_row.url()));
 
   // In this test we also make sure that any pending entries in the text
@@ -445,7 +445,7 @@ TEST_F(ExpireHistoryTest, DeleteURLWithoutFavicon) {
 
   VisitVector visits;
   main_db_->GetVisitsForURL(url_ids[1], &visits);
-  EXPECT_EQ(2, visits.size());
+  EXPECT_EQ(2U, visits.size());
   EXPECT_EQ(1, CountTextMatchesForURL(last_row.url()));
 
   // Delete the URL and its dependencies.
@@ -478,13 +478,13 @@ TEST_F(ExpireHistoryTest, DontDeleteStarredURL) {
   // And the favicon should exist.
   EXPECT_TRUE(HasFavIcon(url_row.favicon_id()));
 
-  // But there should be no fts. 
+  // But there should be no fts.
   ASSERT_EQ(0, CountTextMatchesForURL(url_row.url()));
 
   // And no visits.
   VisitVector visits;
   main_db_->GetVisitsForURL(url_row.id(), &visits);
-  ASSERT_EQ(0, visits.size());
+  ASSERT_EQ(0U, visits.size());
 
   // Should still have the thumbnail.
   ASSERT_TRUE(HasThumbnail(url_row.id()));
@@ -492,7 +492,7 @@ TEST_F(ExpireHistoryTest, DontDeleteStarredURL) {
   // Unstar the URL and delete again.
   bookmark_model_.SetURLStarred(url, std::wstring(), false);
   expirer_.DeleteURL(url);
-  
+
   // Now it should be completely deleted.
   EnsureURLInfoGone(url_row);
 }
@@ -513,7 +513,7 @@ TEST_F(ExpireHistoryTest, FlushRecentURLsUnstarred) {
   // database manager are removed.
   VisitVector visits;
   main_db_->GetVisitsForURL(url_ids[2], &visits);
-  ASSERT_EQ(1, visits.size());
+  ASSERT_EQ(1U, visits.size());
   text_db_->AddPageURL(url_row2.url(), url_row2.id(), visits[0].visit_id,
                        visits[0].visit_time);
 
@@ -529,7 +529,7 @@ TEST_F(ExpireHistoryTest, FlushRecentURLsUnstarred) {
   // Verify that the middle URL had its last visit deleted only.
   visits.clear();
   main_db_->GetVisitsForURL(url_ids[1], &visits);
-  EXPECT_EQ(1, visits.size());
+  EXPECT_EQ(1U, visits.size());
   EXPECT_EQ(0, CountTextMatchesForURL(url_row1.url()));
 
   // Verify that the middle URL visit time and visit counts were updated.
@@ -629,7 +629,7 @@ TEST_F(ExpireHistoryTest, ArchiveHistoryBeforeUnstarred) {
   EXPECT_TRUE(archived_db_->GetRowForURL(url_row1.url(), &archived_row));
   VisitVector archived_visits;
   archived_db_->GetVisitsForURL(archived_row.id(), &archived_visits);
-  EXPECT_EQ(1, archived_visits.size());
+  EXPECT_EQ(1U, archived_visits.size());
 }
 
 TEST_F(ExpireHistoryTest, ArchiveHistoryBeforeStarred) {
@@ -657,19 +657,19 @@ TEST_F(ExpireHistoryTest, ArchiveHistoryBeforeStarred) {
   EXPECT_FALSE(archived_db_->GetRowForURL(temp_row.url(), NULL));
   VisitVector visits;
   main_db_->GetVisitsForURL(temp_row.id(), &visits);
-  EXPECT_EQ(0, visits.size());
+  EXPECT_EQ(0U, visits.size());
 
   // The second URL should have its first visit deleted and its second visit
   // archived. It should be present in both the main DB (because it's starred)
   // and the archived DB (for the archived visit).
   ASSERT_TRUE(main_db_->GetURLRow(url_ids[1], &temp_row));
   main_db_->GetVisitsForURL(temp_row.id(), &visits);
-  EXPECT_EQ(0, visits.size());
+  EXPECT_EQ(0U, visits.size());
 
   // Note that the ID is different in the archived DB, so look up by URL.
   ASSERT_TRUE(archived_db_->GetRowForURL(temp_row.url(), &temp_row));
   archived_db_->GetVisitsForURL(temp_row.id(), &visits);
-  ASSERT_EQ(1, visits.size());
+  ASSERT_EQ(1U, visits.size());
   EXPECT_TRUE(visit_times[2] == visits[0].visit_time);
 
   // The third URL should be unchanged.