Send the list of used and unused resources for precache

components/precache/content/precache_manager_unittest.cc

 // Copyright 2013 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 "components/precache/content/precache_manager.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
@@ skipping 198 matching lines @@
   net::HttpResponseInfo info_;
 };
 
 TEST_F(PrecacheManagerTest, StartAndFinishPrecaching) {
   EXPECT_FALSE(precache_manager_->IsPrecaching());
 
   MockHistoryService::TopHostsCallback top_hosts_callback;
   EXPECT_CALL(history_service_, TopHosts(NumTopHosts(), _))
       .WillOnce(SaveArg<1>(&top_hosts_callback));
 
+  factory_.SetFakeResponse(GURL(kConfigURL), "", net::HTTP_OK,
+                           net::URLRequestStatus::SUCCESS);
   factory_.SetFakeResponse(GURL(kGoodManifestURL), "", net::HTTP_OK,
                            net::URLRequestStatus::SUCCESS);
 
   precache_manager_->StartPrecaching(precache_callback_.GetCallback());
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(precache_manager_->IsPrecaching());
 
   top_hosts_callback.Run(
       history::TopHostsList(1, std::make_pair("good-manifest.com", 1)));
   base::RunLoop().RunUntilIdle();  // For PrecacheFetcher.
   EXPECT_FALSE(precache_manager_->IsPrecaching());
   EXPECT_TRUE(precache_callback_.was_on_done_called());
 
   std::multiset<GURL> expected_requested_urls;
   expected_requested_urls.insert(GURL(kConfigURL));
   expected_requested_urls.insert(GURL(kGoodManifestURL));
   EXPECT_EQ(expected_requested_urls, url_callback_.requested_urls());
 }
 
 TEST_F(PrecacheManagerTest, StartAndFinishPrecachingWithUnfinishedHosts) {
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work(
       new PrecacheUnfinishedWork());
   unfinished_work->add_top_host()->set_hostname("evil-manifest.com");
   unfinished_work->set_start_time(base::Time::Now().ToInternalValue());
   precache_database_->SaveUnfinishedWork(std::move(unfinished_work));
 
   EXPECT_FALSE(precache_manager_->IsPrecaching());
 
+  factory_.SetFakeResponse(GURL(kConfigURL), "", net::HTTP_OK,
+                           net::URLRequestStatus::SUCCESS);
   factory_.SetFakeResponse(
       GURL(kEvilManifestURL), "",
       net::HTTP_OK, net::URLRequestStatus::SUCCESS);
 
   ASSERT_TRUE(precache_database_->GetLastPrecacheTimestamp().is_null());
 
   precache_manager_->StartPrecaching(precache_callback_.GetCallback());
   EXPECT_TRUE(precache_manager_->IsPrecaching());
 
   base::RunLoop().RunUntilIdle();  // For PrecacheFetcher.
@@ skipping 139 matching lines @@
   precache_manager_->CancelPrecaching();
 
   // For PrecacheFetcher and RecordURLPrecached.
   base::RunLoop().RunUntilIdle();
   EXPECT_THAT(
       histograms_.GetTotalCountsForPrefix("Precache."),
       UnorderedElementsAre(Pair("Precache.DownloadedPrecacheMotivated", 1),
                            Pair("Precache.Fetch.PercentCompleted", 1),
                            Pair("Precache.Fetch.ResponseBytes.Network", 1),
                            Pair("Precache.Fetch.ResponseBytes.Total", 1),
-                           Pair("Precache.Fetch.TimeToComplete", 1),
-                           Pair("Precache.Latency.Prefetch", 1),
-                           Pair("Precache.Freshness.Prefetch", 1)));
+                           Pair("Precache.Fetch.TimeToComplete",
+                                1)));  // Pair("Precache.Latency.Prefetch", 1),

[bengr, 2016/08/11 18:49:14]

Please remove the dead code.

Why are these no longer needed?

[Raj, 2016/08/12 19:04:20]

Fixed test.

+  // Pair("Precache.Freshness.Prefetch", 1)));
 }
 
 TEST_F(PrecacheManagerTest, RecordStatsForFetchHTTP) {
   precache_manager_->RecordStatsForFetch(GURL("http://http-url.com"), GURL(),
                                          base::TimeDelta(), base::Time(), info_,
                                          1000);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_THAT(histograms_.GetTotalCountsForPrefix("Precache."),
               UnorderedElementsAre(
@@ skipping 58 matching lines @@
       GURL("http://recent-fetch.com"), GURL(), base::TimeDelta(),
       kCurrentTime - base::TimeDelta::FromDays(59), info_, 1000);
   precache_manager_->RecordStatsForFetch(
       GURL("http://yesterday-fetch.com"), GURL(), base::TimeDelta(),
       kCurrentTime - base::TimeDelta::FromDays(1), info_, 1000);
   expected_histogram_count_map["Precache.DownloadedPrecacheMotivated"] += 3;
   expected_histogram_count_map["Precache.Fetch.PercentCompleted"]++;
   expected_histogram_count_map["Precache.Fetch.ResponseBytes.Network"]++;
   expected_histogram_count_map["Precache.Fetch.ResponseBytes.Total"]++;
   expected_histogram_count_map["Precache.Fetch.TimeToComplete"]++;
-  expected_histogram_count_map["Precache.Latency.Prefetch"] += 3;
-  expected_histogram_count_map["Precache.Freshness.Prefetch"] += 3;
+  // expected_histogram_count_map["Precache.Latency.Prefetch"] += 3;

[bengr, 2016/08/11 18:49:14]

Please remove the dead code.

Why are these no longer needed?

[Raj, 2016/08/12 19:04:20]

Fixed test.

+  // expected_histogram_count_map["Precache.Freshness.Prefetch"] += 3;
   base::RunLoop().RunUntilIdle();
 
   precache_manager_->CancelPrecaching();
   base::RunLoop().RunUntilIdle();
 
   // Disable pause-resume.
   precache_database_->DeleteUnfinishedWork();
   base::RunLoop().RunUntilIdle();
 
   // For PrecacheFetcher and RecordURLPrecached.
@@ skipping 47 matching lines @@
   expected_histogram_count_map["Precache.Saved"] += 2;
   expected_histogram_count_map["Precache.TimeSinceLastPrecache"] += 2;
   expected_histogram_count_map["Precache.Saved.Freshness"] = 2;
 
   base::RunLoop().RunUntilIdle();
   EXPECT_THAT(histograms_.GetTotalCountsForPrefix("Precache."),
               ContainerEq(expected_histogram_count_map));
 }
 
 }  // namespace precache