Precache per-resource cap should be applied on network bytes used

components/precache/core/precache_fetcher.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 <algorithm>
 #include <limits>
 #include <utility>
 #include <vector>
@@ skipping 268 matching lines @@
     // Config and manifest requests do not need to be revalidated. It's okay if
     // they expire from the cache minutes after we request them.
     network_url_fetcher_->SetLoadFlags(kNoTracking);
   }
   network_url_fetcher_->Start();
 }
 
 void PrecacheFetcher::Fetcher::OnURLFetchDownloadProgress(
     const net::URLFetcher* source,
     int64_t current,
-    int64_t total) {
-  // If going over the per-resource download cap.
+    int64_t total,
+    int64_t current_network_bytes) {
+  // If network bytes going over the per-resource download cap.
   if (fetch_stage_ == FetchStage::NETWORK &&
-      // |current| is guaranteed to be non-negative, so this cast is safe.
-      static_cast<size_t>(std::max(current, total)) > max_bytes_) {
+      // |current_network_bytes| is guaranteed to be non-negative, so this cast
+      // is safe.
+      static_cast<size_t>(current_network_bytes) > max_bytes_) {
     VLOG(1) << "Cancelling " << url_ << ": (" << current << "/" << total
             << ") is over " << max_bytes_;
 
     // Call the completion callback, to attempt the next download, or to trigger
     // cleanup in precache_delegate_->OnDone().
-    response_bytes_ = network_response_bytes_ = current;
+    response_bytes_ = current;
+    network_response_bytes_ = current_network_bytes;
     was_cached_ = source->WasCached();
 
     UMA_HISTOGRAM_CUSTOM_COUNTS("Precache.Fetch.ResponseBytes.NetworkWasted",
                                 network_response_bytes_, 1,
                                 1024 * 1024 /* 1 MB */, 100);
-
     // Cancel the download.
     network_url_fetcher_.reset();
     callback_.Run(*this);
   }
 }
 
 void PrecacheFetcher::Fetcher::OnURLFetchComplete(
     const net::URLFetcher* source) {
   CHECK(source);
   if (fetch_stage_ == FetchStage::CACHE &&
@@ skipping 438 matching lines @@
       remaining = 0;
     quota_.set_remaining(
         used_bytes > quota_.remaining() ? 0U : quota_.remaining() - used_bytes);
     db_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&PrecacheDatabase::SaveQuota, precache_database_, quota_));
   }
 }
 
 }  // namespace precache