Report downloaded resources at most once

components/precache/core/precache_fetcher_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/core/precache_fetcher.h"
 
 #include <stdint.h>
 
 #include <cstring>
 #include <memory>
@@ skipping 397 matching lines @@
         FROM_HERE,
         base::Bind(
             &PrecacheFetcherTest::CheckUntilParallelFetchesBeyondCapacity,
             base::Unretained(this), precache_fetcher));
   }
 
   const scoped_refptr<base::SingleThreadTaskRunner>& task_runner() const {
     return task_runner_;
   }
 
+  // To allow friend access.
+  void Flush() { precache_database_.Flush(); }
+
   // Must be declared first so that it is destroyed last.
   base::MessageLoopForUI loop_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   scoped_refptr<net::TestURLRequestContextGetter> request_context_;
   TestURLFetcherCallback url_callback_;
   net::FakeURLFetcherFactory factory_;
   TestPrecacheDelegate precache_delegate_;
   base::ScopedTempDir scoped_temp_dir_;
   PrecacheDatabase precache_database_;
   int expected_total_response_bytes_;
@@ skipping 806 matching lines @@
                                 {GURL("http://used-resource-1/b.js")}));
   EXPECT_EQ("CmvACGJ4k08=", PrecacheFetcher::GetResourceURLBase64HashForTesting(
                                 {GURL("http://used-resource-1/c.js")}));
 
   EXPECT_EQ("dVSI/sC1cGkH8lzom+6xlA==",
             PrecacheFetcher::GetResourceURLBase64HashForTesting(
                 {GURL("http://used-resource-1/a.js"),
                  GURL("http://used-resource-1/b.js")}));
 }
 
-TEST_F(PrecacheFetcherTest, SendUsedUnusedResourceHash) {
+TEST_F(PrecacheFetcherTest, SendUsedDownloadedResourceHash) {
   SetDefaultFlags();
 
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work(
       new PrecacheUnfinishedWork());
   unfinished_work->set_start_time(base::Time::UnixEpoch().ToInternalValue());
   unfinished_work->add_top_host()->set_hostname("top-host-1.com");
   unfinished_work->add_top_host()->set_hostname("top-host-2.com");
   unfinished_work->add_top_host()->set_hostname("top-host-3.com");
 
   UpdatePrecacheReferrerHost("top-host-1.com", 1001);
@@ skipping 16 matching lines @@
   factory_.SetFakeResponse(GURL(kConfigURL), std::string(), net::HTTP_OK,
                            net::URLRequestStatus::SUCCESS);
   factory_.SetFakeResponse(
       GURL(std::string(kManifestURLPrefix) +
            "top-host-1.com?manifest=1001&used_resources=" +
            net::EscapeQueryParamValue(
                PrecacheFetcher::GetResourceURLBase64HashForTesting(
                    {GURL("http://used-resource-1/a.js"),
                     GURL("http://used-resource-1/b.js")}),
                true) +
-           "&unused_resources=" +
-           net::EscapeQueryParamValue(
-               PrecacheFetcher::GetResourceURLBase64HashForTesting(
-                   {GURL("http://unused-resource-1/c.js")}),
-               true)),
+           "&d=" + net::EscapeQueryParamValue(
+                       PrecacheFetcher::GetResourceURLBase64HashForTesting(
+                           {GURL("http://used-resource-1/a.js"),
+                            GURL("http://used-resource-1/b.js"),
+                            GURL("http://unused-resource-1/c.js")}),
+                       true)),
       std::string(), net::HTTP_OK, net::URLRequestStatus::SUCCESS);
   factory_.SetFakeResponse(
       GURL(std::string(kManifestURLPrefix) +
-           "top-host-2.com?manifest=1002&used_resources=&unused_resources=" +
+           "top-host-2.com?manifest=1002&used_resources=&d=" +
            net::EscapeQueryParamValue(
                PrecacheFetcher::GetResourceURLBase64HashForTesting(
                    {GURL("http://unused-resource-2/a.js"),
                     GURL("http://unused-resource-2/b.js")}),
                true)),
       std::string(), net::HTTP_OK, net::URLRequestStatus::SUCCESS);
   factory_.SetFakeResponse(
       GURL(std::string(kManifestURLPrefix) +
-           "top-host-3.com?manifest=1003&used_resources=&unused_resources="),
+           "top-host-3.com?manifest=1003&used_resources=&d="),
       std::string(), net::HTTP_OK, net::URLRequestStatus::SUCCESS);
 
   {
     PrecacheFetcher precache_fetcher(
         request_context_.get(), GURL(), std::string(),
         std::move(unfinished_work), kExperimentID,
         precache_database_.GetWeakPtr(), task_runner(), &precache_delegate_);
     precache_fetcher.Start();
 
     base::RunLoop().RunUntilIdle();
   }
+
+  // If we run the precache again, no download should be reported.
+  factory_.ClearFakeResponses();
+  factory_.SetFakeResponse(GURL(kConfigURL), std::string(), net::HTTP_OK,
+                           net::URLRequestStatus::SUCCESS);
+  // Since we returned an empty proto, the manifest id was set to 0.
+  // The d='s are empty because precache fetches are tried first solely from the
+  // cache and, since any matching request to the fake factory succeeds, it is
+  // hardcoded to be cached even though we didn't specify it as such in the fake
+  // response.
+  factory_.SetFakeResponse(GURL(std::string(kManifestURLPrefix) +
+                                "top-host-1.com?manifest=0&used_resources=&d="),
+                           std::string(), net::HTTP_OK,
+                           net::URLRequestStatus::SUCCESS);
+  factory_.SetFakeResponse(GURL(std::string(kManifestURLPrefix) +
+                                "top-host-2.com?manifest=0&used_resources=&d="),
+                           std::string(), net::HTTP_OK,
+                           net::URLRequestStatus::SUCCESS);
+  factory_.SetFakeResponse(GURL(std::string(kManifestURLPrefix) +
+                                "top-host-3.com?manifest=0&used_resources=&d="),
+                           std::string(), net::HTTP_OK,
+                           net::URLRequestStatus::SUCCESS);
+  // Flush so that previous UpdatePrecacheReferrerHost calls make it through.
+  // Otherwise, manifest_id may be non 0 for some of the hosts.
+  Flush();
+  {
+    std::unique_ptr<PrecacheUnfinishedWork> more_work(
+        new PrecacheUnfinishedWork());
+    more_work->set_start_time(base::Time::UnixEpoch().ToInternalValue());
+    more_work->add_top_host()->set_hostname("top-host-1.com");
+    more_work->add_top_host()->set_hostname("top-host-2.com");
+    more_work->add_top_host()->set_hostname("top-host-3.com");
+    PrecacheFetcher precache_fetcher(
+        request_context_.get(), GURL(), std::string(), std::move(more_work),
+        kExperimentID, precache_database_.GetWeakPtr(), task_runner(),
+        &precache_delegate_);
+    precache_fetcher.Start();
+
+    base::RunLoop().RunUntilIdle();
+  }
 }
 
 TEST_F(PrecacheFetcherTest, GloballyRankResources) {
   SetDefaultFlags();
 
   const size_t kNumTopHosts = 5;
   const size_t kNumResources = 5;
 
   std::vector<GURL> expected_requested_urls;
 
@@ skipping 473 matching lines @@
   EXPECT_EQ(expected_requested_urls, url_callback_.requested_urls());
 
   EXPECT_TRUE(precache_delegate_.was_on_done_called());
 
   histogram.ExpectTotalCount("Precache.Fetch.PercentCompleted", 2);
   histogram.ExpectTotalCount("Precache.Fetch.ResponseBytes.Total", 2);
   histogram.ExpectTotalCount("Precache.Fetch.TimeToComplete", 2);
 }
 
 }  // namespace precache