Fix PrecacheFetcher behavior when reaching max_bytes.

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 <set>
@@ skipping 20 matching lines @@
 #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::ElementsAre;
 using ::testing::NotNull;
 using ::testing::Property;
 
 const char kConfigURL[] = "http://config-url.com";
 const char kManifestURLPrefix[] = "http://manifest-url-prefix.com/";
 const char kCustomConfigURL[] = "http://custom-config-url.com";
 const char kCustomManifestURLPrefix[] =
     "http://custom-manifest-url-prefix.com/";
 const char kManifestFetchFailureURL[] =
     "http://manifest-url-prefix.com/manifest-fetch-failure.com";
@@ skipping 471 matching lines @@
   loop_.RunUntilIdle();
 
   std::multiset<GURL> expected_requested_urls;
   expected_requested_urls.insert(GURL(kConfigURL));
   EXPECT_EQ(expected_requested_urls, url_callback_.requested_urls());
 
   EXPECT_FALSE(precache_delegate_.was_on_done_called());
 
   histogram.ExpectUniqueSample("Precache.Fetch.PercentCompleted", 0, 1);
   histogram.ExpectUniqueSample("Precache.Fetch.ResponseBytes.Total", 0, 1);
-  histogram.ExpectTotalCount("Precache.Fetch.TimeToComplete", 0);
+  histogram.ExpectTotalCount("Precache.Fetch.TimeToComplete", 1);
 }
 
 #if defined(PRECACHE_CONFIG_SETTINGS_URL)
 
 // If the default precache configuration settings URL is defined, then test that
 // it works with the PrecacheFetcher.
 TEST_F(PrecacheFetcherTest, PrecacheUsingDefaultConfigSettingsURL) {
   std::vector<std::string> starting_hosts(1, "starting-url.com");
 
   PrecacheConfigurationSettings config;
@@ skipping 125 matching lines @@
 // MockURLFetcherFactory or EmbeddedTestServer, and add a test that fetches are
 // cancelled midstream.
 
 TEST_F(PrecacheFetcherTest, MaxBytesTotal) {
   SetDefaultFlags();
   const size_t kNumResources = 15;  // > kMaxParallelFetches.
   const size_t kMaxBytesTotal = 1000;
   const size_t kBytesPerResource = kMaxBytesTotal / 3;
   // kBytesPerResource * kMaxParallelFeches > kMaxBytesTotal.
 
-  std::vector<std::string> starting_hosts;
-  starting_hosts.push_back("good-manifest.com");
-
   PrecacheConfigurationSettings config;
   config.set_max_bytes_total(kMaxBytesTotal);
 
   factory_.SetFakeResponse(GURL(kConfigURL), config.SerializeAsString(),
                            net::HTTP_OK, net::URLRequestStatus::SUCCESS);
 
   PrecacheManifest good_manifest;
   for (size_t i = 0; i < kNumResources; ++i) {
     const std::string url = "http://good-manifest.com/" + std::to_string(i);
     good_manifest.add_resource()->set_url(url);
     factory_.SetFakeResponse(GURL(url), std::string(kBytesPerResource, '.'),
                              net::HTTP_OK, net::URLRequestStatus::SUCCESS);
   }
 
   factory_.SetFakeResponse(GURL(kGoodManifestURL),
                            good_manifest.SerializeAsString(), net::HTTP_OK,
                            net::URLRequestStatus::SUCCESS);
 
   base::HistogramTester histogram;
 
   {
-    PrecacheFetcher precache_fetcher(starting_hosts, request_context_.get(),
-                                     GURL(), std::string(),
-                                     &precache_delegate_);
+    PrecacheFetcher precache_fetcher({"good-manifest.com"},
+                                     request_context_.get(), GURL(),
+                                     std::string(), &precache_delegate_);
     precache_fetcher.Start();
 
     loop_.RunUntilIdle();
 
     // Destroy the PrecacheFetcher after it has finished, to record metrics.
   }
 
   // We don't know which will make it and which won't due to the parallelism in
   // the pool of Fetchers.
   EXPECT_GT(kNumResources, url_callback_.requested_urls().size());
 
   EXPECT_TRUE(precache_delegate_.was_on_done_called());
 
-  histogram.ExpectUniqueSample("Precache.Fetch.PercentCompleted", 100, 1);
+  // good-manifest.com will not have been completed.
+  EXPECT_THAT(histogram.GetAllSamples("Precache.Fetch.PercentCompleted"),
+              ElementsAre(base::Bucket(0, 1)));
   histogram.ExpectTotalCount("Precache.Fetch.TimeToComplete", 1);
 }
 
 }  // namespace
 
 }  // namespace precache