Port some unit tests from chrome/browser/

chrome/browser/history/expire_history_backend_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/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/gfx/jpeg_codec.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
@@ skipping 274 matching lines @@
   // Verify the URL no longer exists.
   URLRow temp_row;
   EXPECT_FALSE(main_db_->GetURLRow(row.id(), &temp_row));
 
   // The indexed data should be gone.
   EXPECT_EQ(0, CountTextMatchesForURL(row.url()));
 
   // 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()));
 
   // Check the notifications. There should be a delete notification with this
   // URL in it. There should also be a "typed URL changed" notification if the
   // row is marked typed.
   bool found_delete_notification = false;
   bool found_typed_changed_notification = false;
   for (size_t i = 0; i < notifications_.size(); i++) {
@@ skipping 72 matching lines @@
   AddExampleData(url_ids, visit_times);
 
   // Verify things are the way we expect with a URL row, favicon, thumbnail.
   URLRow last_row;
   ASSERT_TRUE(main_db_->GetURLRow(url_ids[2], &last_row));
   EXPECT_TRUE(HasFavIcon(last_row.favicon_id()));
   EXPECT_TRUE(HasThumbnail(url_ids[2]));
 
   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
   // database manager are removed.
   text_db_->AddPageURL(last_row.url(), last_row.id(), visits[0].visit_id,
                        visits[0].visit_time);
 
   // Compute the text DB filename.
   std::wstring fts_filename = dir_;
   file_util::AppendToPath(&fts_filename,
@@ skipping 39 matching lines @@
   AddExampleData(url_ids, visit_times);
 
   // Verify things are the way we expect with a URL row, favicon, thumbnail.
   URLRow last_row;
   ASSERT_TRUE(main_db_->GetURLRow(url_ids[1], &last_row));
   EXPECT_TRUE(HasFavIcon(last_row.favicon_id()));
   EXPECT_TRUE(HasThumbnail(url_ids[1]));
 
   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.
   expirer_.DeleteURL(last_row.url());
 
   // All the normal data + the favicon should be gone.
   EnsureURLInfoGone(last_row);
   EXPECT_TRUE(HasFavIcon(last_row.favicon_id()));
 }
 
@@ skipping 12 matching lines @@
   // Attempt to delete the url.
   expirer_.DeleteURL(url_row.url());
 
   // Because the url is starred, it shouldn't be deleted.
   GURL url = url_row.url();
   ASSERT_TRUE(main_db_->GetRowForURL(url, &url_row));
 
   // 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()));
 
   // 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);
 }
 
 // Expires all URLs more recent than a given time, with no starred items.
 // Our time threshold is such that one URL should be updated (we delete one of
 // the two visits) and one is deleted.
 TEST_F(ExpireHistoryTest, FlushRecentURLsUnstarred) {
   URLID url_ids[3];
   Time visit_times[4];
   AddExampleData(url_ids, visit_times);
 
   URLRow url_row1, url_row2;
   ASSERT_TRUE(main_db_->GetURLRow(url_ids[1], &url_row1));
   ASSERT_TRUE(main_db_->GetURLRow(url_ids[2], &url_row2));
 
   // In this test we also make sure that any pending entries in the text
   // 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);
 
   // This should delete the last two visits.
   expirer_.ExpireHistoryBetween(visit_times[2], Time());
 
   // Run the text database expirer. This will flush any pending entries so we
   // can check that nothing was committed. We use a time far in the future so
   // that anything added recently will get flushed.
   TimeTicks expiration_time = TimeTicks::Now() + TimeDelta::FromDays(1);
   text_db_->FlushOldChangesForTime(expiration_time);
 
   // 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.
   URLRow temp_row;
   ASSERT_TRUE(main_db_->GetURLRow(url_ids[1], &temp_row));
   EXPECT_TRUE(visit_times[2] == url_row1.last_visit());  // Previous value.
   EXPECT_TRUE(visit_times[1] == temp_row.last_visit());  // New value.
   EXPECT_EQ(2, url_row1.visit_count());
   EXPECT_EQ(1, temp_row.visit_count());
   EXPECT_EQ(1, url_row1.typed_count());
@@ skipping 79 matching lines @@
   expirer_.ArchiveHistoryBefore(visit_times[2]);
   EXPECT_FALSE(main_db_->GetURLRow(url_ids[1], &temp_row));
   EXPECT_TRUE(main_db_->GetURLRow(url_ids[2], &temp_row));
 
   // Make sure the archived database has an entry for the second URL.
   URLRow archived_row;
   // Note that the ID is different in the archived DB, so look up by URL.
   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) {
   URLID url_ids[3];
   Time visit_times[4];
   AddExampleData(url_ids, visit_times);
 
   URLRow url_row0, url_row1;
   ASSERT_TRUE(main_db_->GetURLRow(url_ids[0], &url_row0));
   ASSERT_TRUE(main_db_->GetURLRow(url_ids[1], &url_row1));
 
   // Star the URLs.
   StarURL(url_row0.url());
   StarURL(url_row1.url());
 
   // Now archive the first three visits (first two URLs). The first two visits
   // should be, the third deleted, but the URL records should not.
   expirer_.ArchiveHistoryBefore(visit_times[2]);
 
   // The first URL should have its visit deleted, but it should still be present
   // in the main DB and not in the archived one since it is starred.
   URLRow temp_row;
   ASSERT_TRUE(main_db_->GetURLRow(url_ids[0], &temp_row));
   // Note that the ID is different in the archived DB, so look up by URL.
   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.
   EXPECT_TRUE(main_db_->GetURLRow(url_ids[2], &temp_row));
   EXPECT_FALSE(archived_db_->GetRowForURL(temp_row.url(), NULL));
 }
 
 // Tests the return values from ArchiveSomeOldHistory. The rest of the
 // functionality of this function is tested by the ArchiveHistoryBefore*
 // tests which use this function internally.
@@ skipping 14 matching lines @@
   // (max deleted).
   EXPECT_TRUE(expirer_.ArchiveSomeOldHistory(visit_times[2], 1));
 }
 
 // TODO(brettw) add some visits with no URL to make sure everything is updated
 // properly. Have the visits also refer to nonexistant FTS rows.
 //
 // Maybe also refer to invalid favicons.
 
 }  // namespace history