Send the list of used and unused resources for precache

components/precache/core/precache_url_table_unittest.cc

Index: components/precache/core/precache_url_table_unittest.cc
diff --git a/components/precache/core/precache_url_table_unittest.cc b/components/precache/core/precache_url_table_unittest.cc
index 9053e58a96d65245b500bf457e293e0f04809a94..e622609edd9ff6276193defeb2f0868bb054e0b1 100644
--- a/components/precache/core/precache_url_table_unittest.cc
+++ b/components/precache/core/precache_url_table_unittest.cc
@@ -6,10 +6,13 @@
 
 #include <map>
 #include <memory>
+#include <set>
 
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
 #include "sql/connection.h"
+#include "sql/statement.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace precache {
@@ -26,7 +29,7 @@ class PrecacheURLTableTest : public testing::Test {
     precache_url_table_.reset(new PrecacheURLTable());
     db_.reset(new sql::Connection());
     ASSERT_TRUE(db_->OpenInMemory());
-    precache_url_table_->Init(db_.get());
+    ASSERT_TRUE(precache_url_table_->Init(db_.get()));
   }
 
   std::unique_ptr<PrecacheURLTable> precache_url_table_;
@@ -35,7 +38,7 @@ class PrecacheURLTableTest : public testing::Test {
 
 TEST_F(PrecacheURLTableTest, AddURLWithNoExistingRow) {
   const base::Time kTime = base::Time::FromInternalValue(100);
-  precache_url_table_->AddURL(GURL("http://url.com"), kTime);
+  precache_url_table_->AddURL(GURL("http://url.com"), 1, true, kTime);
 
   std::map<GURL, base::Time> expected_map;
   expected_map[GURL("http://url.com")] = kTime;
@@ -48,8 +51,8 @@ TEST_F(PrecacheURLTableTest, AddURLWithNoExistingRow) {
 TEST_F(PrecacheURLTableTest, AddURLWithExistingRow) {
   const base::Time kOldTime = base::Time::FromInternalValue(50);
   const base::Time kNewTime = base::Time::FromInternalValue(100);
-  precache_url_table_->AddURL(GURL("http://url.com"), kOldTime);
-  precache_url_table_->AddURL(GURL("http://url.com"), kNewTime);
+  precache_url_table_->AddURL(GURL("http://url.com"), 1, true, kOldTime);
+  precache_url_table_->AddURL(GURL("http://url.com"), 1, true, kNewTime);
 
   std::map<GURL, base::Time> expected_map;
   expected_map[GURL("http://url.com")] = kNewTime;
@@ -59,14 +62,15 @@ TEST_F(PrecacheURLTableTest, AddURLWithExistingRow) {
   EXPECT_EQ(expected_map, actual_map);
 }
 
-TEST_F(PrecacheURLTableTest, DeleteURL) {
+TEST_F(PrecacheURLTableTest, SetURLAsNotPrecached) {
   const base::Time kStaysTime = base::Time::FromInternalValue(50);
   const base::Time kDeletedTime = base::Time::FromInternalValue(100);
 
-  precache_url_table_->AddURL(GURL("http://stays.com"), kStaysTime);
-  precache_url_table_->AddURL(GURL("http://deleted.com"), kDeletedTime);
+  precache_url_table_->AddURL(GURL("http://stays.com"), 1, true, kStaysTime);
+  precache_url_table_->AddURL(GURL("http://deleted.com"), 1, true,
+                              kDeletedTime);
 
-  precache_url_table_->DeleteURL(GURL("http://deleted.com"));
+  precache_url_table_->SetURLAsNotPrecached(GURL("http://deleted.com"));
 
   std::map<GURL, base::Time> expected_map;
   expected_map[GURL("http://stays.com")] = kStaysTime;
@@ -76,17 +80,17 @@ TEST_F(PrecacheURLTableTest, DeleteURL) {
   EXPECT_EQ(expected_map, actual_map);
 }
 
-TEST_F(PrecacheURLTableTest, HasURL) {
-  EXPECT_FALSE(precache_url_table_->HasURL(GURL("http://url.com")));
+TEST_F(PrecacheURLTableTest, IsURLPrecached) {
+  EXPECT_FALSE(precache_url_table_->IsURLPrecached(GURL("http://url.com")));
 
-  precache_url_table_->AddURL(GURL("http://url.com"),
+  precache_url_table_->AddURL(GURL("http://url.com"), 1, true,
                               base::Time::FromInternalValue(100));
 
-  EXPECT_TRUE(precache_url_table_->HasURL(GURL("http://url.com")));
+  EXPECT_TRUE(precache_url_table_->IsURLPrecached(GURL("http://url.com")));
 
-  precache_url_table_->DeleteURL(GURL("http://url.com"));
+  precache_url_table_->SetURLAsNotPrecached(GURL("http://url.com"));
 
-  EXPECT_FALSE(precache_url_table_->HasURL(GURL("http://url.com")));
+  EXPECT_FALSE(precache_url_table_->IsURLPrecached(GURL("http://url.com")));
 }
 
 TEST_F(PrecacheURLTableTest, DeleteAllPrecachedBefore) {
@@ -95,10 +99,10 @@ TEST_F(PrecacheURLTableTest, DeleteAllPrecachedBefore) {
   const base::Time kEndTime = base::Time::FromInternalValue(30);
   const base::Time kAfterTime = base::Time::FromInternalValue(40);
 
-  precache_url_table_->AddURL(GURL("http://old.com"), kOldTime);
-  precache_url_table_->AddURL(GURL("http://before.com"), kBeforeTime);
-  precache_url_table_->AddURL(GURL("http://end.com"), kEndTime);
-  precache_url_table_->AddURL(GURL("http://after.com"), kAfterTime);
+  precache_url_table_->AddURL(GURL("http://old.com"), 1, true, kOldTime);
+  precache_url_table_->AddURL(GURL("http://before.com"), 1, true, kBeforeTime);
+  precache_url_table_->AddURL(GURL("http://end.com"), 1, true, kEndTime);
+  precache_url_table_->AddURL(GURL("http://after.com"), 1, true, kAfterTime);
 
   precache_url_table_->DeleteAllPrecachedBefore(kEndTime);
 
@@ -111,6 +115,46 @@ TEST_F(PrecacheURLTableTest, DeleteAllPrecachedBefore) {
   EXPECT_EQ(expected_map, actual_map);
 }
 
+TEST_F(PrecacheURLTableTest, TableMigration) {
+  // Create the previous version of the URL table.
+  precache_url_table_.reset(new PrecacheURLTable());
+  db_.reset(new sql::Connection());
+  ASSERT_TRUE(db_->OpenInMemory());
+  ASSERT_TRUE(db_->Execute(
+      "CREATE TABLE IF NOT EXISTS precache_urls (url TEXT PRIMARY KEY, time "
+      "INTEGER)"));
+
+  // Populate data for the previous version.
+  const std::string old_urls[] = {"http://foo.com", "http://bar.com",
+                                  "http://foobar.com"};
+  for (const auto& url : old_urls) {
+    sql::Statement statement(db_->GetCachedStatement(
+        SQL_FROM_HERE, "INSERT INTO precache_urls (url, time) VALUES(?,100)"));
+    statement.BindString(0, url);
+    statement.Run();
+  }
+
+  // Verify the migration.
+  ASSERT_TRUE(precache_url_table_->Init(db_.get()));
+  EXPECT_TRUE(db_->DoesColumnExist("precache_urls", "was_used"));
+  EXPECT_TRUE(db_->DoesColumnExist("precache_urls", "is_precached"));
+  EXPECT_TRUE(db_->DoesColumnExist("precache_urls", "referrer_host_id"));
+
+  std::set<std::string> actual_urls;
+  sql::Statement statement(
+      db_->GetCachedStatement(SQL_FROM_HERE,
+                              "select url, referrer_host_id, was_used, "
+                              "is_precached from precache_urls"));
+  while (statement.Step()) {
+    actual_urls.insert(statement.ColumnString(0));
+    EXPECT_EQ(0, statement.ColumnInt(1));
+    EXPECT_EQ(0, statement.ColumnInt(2));
+    EXPECT_EQ(0, statement.ColumnInt(3));
+  }
+  EXPECT_THAT(std::set<std::string>(begin(old_urls), end(old_urls)),
+              ::testing::ContainerEq(actual_urls));
+}
+
 }  // namespace
 
 }  // namespace precache