Send the list of used and unused resources for precache

components/precache/core/precache_session_table_unittest.cc

Index: components/precache/core/precache_session_table_unittest.cc
diff --git a/components/precache/core/precache_session_table_unittest.cc b/components/precache/core/precache_session_table_unittest.cc
index 7ab84234df0819797e05d205785448277f9adcd6..a354032a5574613e459d4fab2e024c2533b4b938 100644
--- a/components/precache/core/precache_session_table_unittest.cc
+++ b/components/precache/core/precache_session_table_unittest.cc
@@ -56,9 +56,6 @@ TEST_F(PrecacheSessionTableTest, SaveAndGetUnfinishedWork) {
   s->set_top_resources_count(12);
   s->set_max_bytes_per_resource(501);
   s->set_max_bytes_total(1001);
-  unfinished_work->add_manifest()->set_url("http://a.com/");
-  unfinished_work->add_manifest()->set_url("http://b.com/");
-  unfinished_work->add_manifest()->set_url("http://c.com/");
   unfinished_work->add_resource()->set_url("http://x.com/");
   unfinished_work->add_resource()->set_url("http://y.com/");
   unfinished_work->add_resource()->set_url("http://z.com/");
@@ -72,6 +69,7 @@ TEST_F(PrecacheSessionTableTest, SaveAndGetUnfinishedWork) {
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work2 =
       precache_session_table_->GetUnfinishedWork();
 
+  EXPECT_EQ(2, unfinished_work2->top_host_size());
   EXPECT_EQ("foo.com", unfinished_work2->top_host(0).hostname());
   EXPECT_EQ("bar.com", unfinished_work2->top_host(1).hostname());
   EXPECT_EQ(11, unfinished_work2->config_settings().top_sites_count());
@@ -81,10 +79,6 @@ TEST_F(PrecacheSessionTableTest, SaveAndGetUnfinishedWork) {
   EXPECT_EQ(501ul,
             unfinished_work2->config_settings().max_bytes_per_resource());
   EXPECT_EQ(1001ul, unfinished_work2->config_settings().max_bytes_total());
-  EXPECT_EQ(3, unfinished_work2->manifest_size());
-  EXPECT_EQ("http://a.com/", unfinished_work2->manifest(0).url());
-  EXPECT_EQ("http://b.com/", unfinished_work2->manifest(1).url());
-  EXPECT_EQ("http://c.com/", unfinished_work2->manifest(2).url());
   EXPECT_EQ(3, unfinished_work2->resource_size());
   EXPECT_EQ("http://x.com/", unfinished_work2->resource(0).url());
   EXPECT_EQ("http://y.com/", unfinished_work2->resource(1).url());
@@ -100,24 +94,24 @@ TEST_F(PrecacheSessionTableTest, SaveAndGetUnfinishedWork) {
 TEST_F(PrecacheSessionTableTest, SaveAgainAndGet) {
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work(
       new PrecacheUnfinishedWork());
-  unfinished_work->add_manifest()->set_url("http://a.com/");
+  unfinished_work->add_top_host()->set_hostname("a.com");
   precache_session_table_->SaveUnfinishedWork(std::move(unfinished_work));
 
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work2(
       new PrecacheUnfinishedWork());
-  unfinished_work2->add_manifest()->set_url("http://b.com/");
+  unfinished_work2->add_top_host()->set_hostname("b.com");
   precache_session_table_->SaveUnfinishedWork(std::move(unfinished_work2));
 
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work3 =
       precache_session_table_->GetUnfinishedWork();
-  EXPECT_EQ("http://b.com/", unfinished_work3->manifest(0).url());
+  EXPECT_EQ("b.com", unfinished_work3->top_host(0).hostname());
 }
 
 // Test that reading does not remove unfinished work from storage.
 TEST_F(PrecacheSessionTableTest, SaveAndGetAgain) {
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work(
       new PrecacheUnfinishedWork());
-  unfinished_work->add_manifest()->set_url("http://a.com/");
+  unfinished_work->add_top_host()->set_hostname("a.com");
   precache_session_table_->SaveUnfinishedWork(std::move(unfinished_work));
 
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work2 =
@@ -126,7 +120,7 @@ TEST_F(PrecacheSessionTableTest, SaveAndGetAgain) {
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work3 =
       precache_session_table_->GetUnfinishedWork();
 
-  EXPECT_EQ("http://a.com/", unfinished_work3->manifest(0).url());
+  EXPECT_EQ("a.com", unfinished_work3->top_host(0).hostname());
 }
 
 // Test that storing a large proto works.
@@ -134,29 +128,29 @@ TEST_F(PrecacheSessionTableTest, SaveManyURLs) {
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work(
       new PrecacheUnfinishedWork());
   for (int i = 0; i < 1000; ++i)
-    unfinished_work->add_manifest()->set_url("http://a.com/");
+    unfinished_work->add_top_host()->set_hostname("a.com");
   precache_session_table_->SaveUnfinishedWork(std::move(unfinished_work));
 
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work2 =
       precache_session_table_->GetUnfinishedWork();
 
-  EXPECT_EQ(1000, unfinished_work2->manifest_size());
+  EXPECT_EQ(1000, unfinished_work2->top_host_size());
   for (int i = 0; i < 1000; ++i)
-    EXPECT_EQ("http://a.com/", unfinished_work2->manifest(i).url());
+    EXPECT_EQ("a.com", unfinished_work2->top_host(i).hostname());
 }
 
 // Test that reading after deletion returns no unfinished work.
 TEST_F(PrecacheSessionTableTest, SaveDeleteGet) {
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work(
       new PrecacheUnfinishedWork());
-  unfinished_work->add_manifest()->set_url("http://a.com/");
+  unfinished_work->add_top_host()->set_hostname("a.com");
   precache_session_table_->SaveUnfinishedWork(std::move(unfinished_work));
   precache_session_table_->DeleteUnfinishedWork();
 
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work2 =
       precache_session_table_->GetUnfinishedWork();
 
-  EXPECT_EQ(0, unfinished_work2->manifest_size());
+  EXPECT_EQ(0, unfinished_work2->top_host_size());
 }
 
 }  // namespace