Add UMA Precache.Freshness.Prefetch

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 13 matching lines @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/history/core/browser/history_constants.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/precache/core/precache_database.h"
 #include "components/precache/core/precache_switches.h"
 #include "components/precache/core/proto/unfinished_work.pb.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "net/http/http_response_headers.h"
+#include "net/http/http_response_info.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_status.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace precache {
 
 namespace {
 
 using ::testing::_;
 using ::testing::ContainerEq;
 using ::testing::ElementsAre;
+using ::testing::UnorderedElementsAre;
 using ::testing::Invoke;
 using ::testing::IsEmpty;
 using ::testing::Pair;
 using ::testing::SaveArg;
 
 const char kConfigURL[] = "http://config-url.com";
 const char kManifestURLPrefix[] = "http://manifest-url-prefix.com/";
 const char kGoodManifestURL[] =
     "http://manifest-url-prefix.com/good-manifest.com";
 const char kEvilManifestURL[] =
@@ skipping 123 matching lines @@
     // Make the fetch of the precache configuration settings fail. Precaching
     // should still complete normally in this case.
     factory_.SetFakeResponse(GURL(kConfigURL), "",
                              net::HTTP_INTERNAL_SERVER_ERROR,
                              net::URLRequestStatus::FAILED);
     precache_manager_.reset(
         new PrecacheManagerUnderTest(
             &browser_context_, nullptr /* sync_service */,
             &history_service_, db_path, std::move(precache_database)));
     base::RunLoop().RunUntilIdle();
+
+    info_.headers = new net::HttpResponseHeaders("");
   }
 
   // Must be declared first so that it is destroyed last.
   content::TestBrowserThreadBundle test_browser_thread_bundle_;
   base::ScopedTempDir scoped_temp_dir_;
   PrecacheDatabase* precache_database_;
   content::TestBrowserContext browser_context_;
   std::unique_ptr<PrecacheManagerUnderTest> precache_manager_;
   TestURLFetcherCallback url_callback_;
   net::FakeURLFetcherFactory factory_;
   TestPrecacheCompletionCallback precache_callback_;
   testing::NiceMock<MockHistoryService> history_service_;
   base::HistogramTester histograms_;
+  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(kGoodManifestURL), "", net::HTTP_OK,
@@ skipping 127 matching lines @@
   std::multiset<GURL> expected_requested_urls;
   expected_requested_urls.insert(GURL(kConfigURL));
   EXPECT_EQ(expected_requested_urls, url_callback_.requested_urls());
 }
 
 // TODO(rajendrant): Add unittests for
 // PrecacheUtil::UpdatePrecacheMetricsAndState() for more test coverage.
 TEST_F(PrecacheManagerTest, RecordStatsForFetchWithSizeZero) {
   // Fetches with size 0 should be ignored.
   precache_manager_->RecordStatsForFetch(GURL("http://url.com"), GURL(),
-                                        base::TimeDelta(), base::Time(), 0,
-                                        false);
+                                         base::TimeDelta(), base::Time(), info_,
+                                         0);
   base::RunLoop().RunUntilIdle();
   EXPECT_THAT(histograms_.GetTotalCountsForPrefix("Precache."), IsEmpty());
 }
 
 TEST_F(PrecacheManagerTest, RecordStatsForFetchWithNonHTTP) {
   // Fetches for URLs with schemes other than HTTP or HTTPS should be ignored.
   precache_manager_->RecordStatsForFetch(GURL("ftp://ftp.com"), GURL(),
-                                        base::TimeDelta(), base::Time(), 1000,
-                                        false);
+                                         base::TimeDelta(), base::Time(), info_,
+                                         1000);
   base::RunLoop().RunUntilIdle();
   EXPECT_THAT(histograms_.GetTotalCountsForPrefix("Precache."), IsEmpty());
 }
 
 TEST_F(PrecacheManagerTest, RecordStatsForFetchWithEmptyURL) {
   // Fetches for empty URLs should be ignored.
   precache_manager_->RecordStatsForFetch(GURL(), GURL(), base::TimeDelta(),
-                                        base::Time(), 1000, false);
+                                         base::Time(), info_, 1000);
   base::RunLoop().RunUntilIdle();
   EXPECT_THAT(histograms_.GetTotalCountsForPrefix("Precache."), IsEmpty());
 }
 
 TEST_F(PrecacheManagerTest, RecordStatsForFetchDuringPrecaching) {
   EXPECT_CALL(history_service_, TopHosts(NumTopHosts(), _))
       .WillOnce(ReturnHosts(history::TopHostsList()));
 
   precache_manager_->StartPrecaching(precache_callback_.GetCallback());
 
   EXPECT_TRUE(precache_manager_->IsPrecaching());
   precache_manager_->RecordStatsForFetch(GURL("http://url.com"), GURL(),
-                                        base::TimeDelta(), base::Time(), 1000,
-                                        false);
+                                         base::TimeDelta(), base::Time(), info_,
+                                         1000);
   base::RunLoop().RunUntilIdle();
   precache_manager_->CancelPrecaching();
 
   // For PrecacheFetcher and RecordURLPrecached.
   base::RunLoop().RunUntilIdle();
-  EXPECT_THAT(histograms_.GetTotalCountsForPrefix("Precache."),
-              ElementsAre(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)));
+  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)));
 }
 
 TEST_F(PrecacheManagerTest, RecordStatsForFetchHTTP) {
   precache_manager_->RecordStatsForFetch(GURL("http://http-url.com"), GURL(),
-                                        base::TimeDelta(), base::Time(), 1000,
-                                        false);
+                                         base::TimeDelta(), base::Time(), info_,
+                                         1000);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_THAT(histograms_.GetTotalCountsForPrefix("Precache."),
               ElementsAre(Pair("Precache.DownloadedNonPrecache", 1),
                           Pair("Precache.Latency.NonPrefetch", 1),
                           Pair("Precache.Latency.NonPrefetch.NonTopHosts", 1)));
 }
 
 TEST_F(PrecacheManagerTest, RecordStatsForFetchHTTPS) {
   precache_manager_->RecordStatsForFetch(GURL("https://https-url.com"), GURL(),
-                                        base::TimeDelta(), base::Time(), 1000,
-                                        false);
+                                         base::TimeDelta(), base::Time(), info_,
+                                         1000);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_THAT(histograms_.GetTotalCountsForPrefix("Precache."),
               ElementsAre(Pair("Precache.DownloadedNonPrecache", 1),
                           Pair("Precache.Latency.NonPrefetch", 1),
                           Pair("Precache.Latency.NonPrefetch.NonTopHosts", 1)));
 }
 
 TEST_F(PrecacheManagerTest, RecordStatsForFetchInTopHosts) {
   EXPECT_CALL(history_service_,
               HostRankIfAvailable(GURL("http://referrer.com"), _))
       .WillOnce(Invoke(
           [](const GURL& url, const base::Callback<void(int)>& callback) {
             callback.Run(0);
           }));
   precache_manager_->RecordStatsForFetch(
       GURL("http://http-url.com"), GURL("http://referrer.com"),
-      base::TimeDelta(), base::Time(), 1000, false);
+      base::TimeDelta(), base::Time(), info_, 1000);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_THAT(histograms_.GetTotalCountsForPrefix("Precache."),
               ElementsAre(Pair("Precache.DownloadedNonPrecache", 1),
                           Pair("Precache.Latency.NonPrefetch", 1),
                           Pair("Precache.Latency.NonPrefetch.TopHosts", 1)));
 }
 
 TEST_F(PrecacheManagerTest, DeleteExpiredPrecacheHistory) {
   // TODO(twifkak): Split this into multiple tests.
   base::HistogramTester::CountsMap expected_histogram_count_map;
 
   // This test has to use Time::Now() because StartPrecaching uses Time::Now().
   const base::Time kCurrentTime = base::Time::Now();
   EXPECT_CALL(history_service_, TopHosts(NumTopHosts(), _))
       .Times(2)
       .WillRepeatedly(ReturnHosts(history::TopHostsList()));
 
   precache_manager_->StartPrecaching(precache_callback_.GetCallback());
   EXPECT_TRUE(precache_manager_->IsPrecaching());
 
   // Precache a bunch of URLs, with different fetch times.
   precache_manager_->RecordStatsForFetch(
       GURL("http://old-fetch.com"), GURL(), base::TimeDelta(),
-      kCurrentTime - base::TimeDelta::FromDays(61), 1000, false);
+      kCurrentTime - base::TimeDelta::FromDays(61), info_, 1000);
   precache_manager_->RecordStatsForFetch(
       GURL("http://recent-fetch.com"), GURL(), base::TimeDelta(),
-      kCurrentTime - base::TimeDelta::FromDays(59), 1000, false);
+      kCurrentTime - base::TimeDelta::FromDays(59), info_, 1000);
   precache_manager_->RecordStatsForFetch(
       GURL("http://yesterday-fetch.com"), GURL(), base::TimeDelta(),
-      kCurrentTime - base::TimeDelta::FromDays(1), 1000, false);
+      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;
   base::RunLoop().RunUntilIdle();
 
   precache_manager_->CancelPrecaching();
   base::RunLoop().RunUntilIdle();
 
   // Disable pause-resume.
   precache_database_->DeleteUnfinishedWork();
   base::RunLoop().RunUntilIdle();
 
   // For PrecacheFetcher and RecordURLPrecached.
@@ skipping 12 matching lines @@
   expected_histogram_count_map["Precache.Fetch.PercentCompleted"]++;
   expected_histogram_count_map["Precache.Fetch.ResponseBytes.Network"]++;
   expected_histogram_count_map["Precache.Fetch.ResponseBytes.Total"]++;
   // For PrecacheFetcher and RecordURLPrecached.
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(precache_manager_->IsPrecaching());
 
   // A fetch for the same URL as the expired precache was served from the cache,
   // but it isn't reported as saved bytes because it had expired in the precache
   // history.
+  info_.was_cached = true;  // From now on all fetches are cached.
   precache_manager_->RecordStatsForFetch(GURL("http://old-fetch.com"), GURL(),
-                                        base::TimeDelta(), kCurrentTime, 1000,
-                                        true);
+                                         base::TimeDelta(), kCurrentTime, info_,
+                                         1000);
   expected_histogram_count_map["Precache.Fetch.TimeToComplete"]++;
   expected_histogram_count_map["Precache.Latency.NonPrefetch"]++;
   expected_histogram_count_map["Precache.Latency.NonPrefetch.NonTopHosts"]++;
 
   base::RunLoop().RunUntilIdle();
   EXPECT_THAT(histograms_.GetTotalCountsForPrefix("Precache."),
               ContainerEq(expected_histogram_count_map));
 
   // The other precaches should not have expired, so the following fetches from
   // the cache should count as saved bytes.
-  precache_manager_->RecordStatsForFetch(GURL("http://recent-fetch.com"), GURL(),
-                                        base::TimeDelta(), kCurrentTime, 1000,
-                                        true);
+  precache_manager_->RecordStatsForFetch(GURL("http://recent-fetch.com"),
+                                         GURL(), base::TimeDelta(),

[bengr, 2016/07/21 00:03:27]

#include "base/time/time.h"

+                                         kCurrentTime, info_, 1000);
   precache_manager_->RecordStatsForFetch(GURL("http://yesterday-fetch.com"),
-                                        GURL(), base::TimeDelta(), kCurrentTime,
-                                        1000, true);
+                                         GURL(), base::TimeDelta(),
+                                         kCurrentTime, info_, 1000);
   expected_histogram_count_map["Precache.Latency.NonPrefetch"] += 2;
   expected_histogram_count_map["Precache.Latency.NonPrefetch.NonTopHosts"] += 2;
   expected_histogram_count_map["Precache.Saved"] += 2;
+  expected_histogram_count_map["Precache.Saved.Freshness"] = 2;
 
   base::RunLoop().RunUntilIdle();
   EXPECT_THAT(histograms_.GetTotalCountsForPrefix("Precache."),
               ContainerEq(expected_histogram_count_map));
 }
 
 }  // namespace precache