Precache should cancel when there is user traffic

chrome/browser/net/chrome_network_delegate.cc

Index: chrome/browser/net/chrome_network_delegate.cc
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
index a872946b8c2b498880af95ca5f8a01da65128b5e..c3079577477dfa550a6add28a1e5a3a7e5b849b6 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -40,6 +40,7 @@
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/data_usage/core/data_use_aggregator.h"
+#include "components/data_use_measurement/content/data_use_measurement.h"
 #include "components/domain_reliability/monitor.h"
 #include "components/policy/core/browser/url_blacklist_manager.h"
 #include "components/prefs/pref_member.h"
@@ -108,13 +109,14 @@ void ForceGoogleSafeSearchCallbackWrapper(
 }
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
-void RecordPrecacheStatsOnUIThread(const GURL& url,
-                                   const GURL& referrer,
-                                   base::TimeDelta latency,
-                                   const base::Time& fetch_time,
-                                   int64_t size,
-                                   bool was_cached,
-                                   void* profile_id) {
+void UpdatePrecacheMetricsAndStateOnUIThread(const GURL& url,
+                                             const GURL& referrer,
+                                             base::TimeDelta latency,
+                                             const base::Time& fetch_time,
+                                             int64_t size,
+                                             bool was_cached,
+                                             bool is_user_traffic,
+                                             void* profile_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!g_browser_process->profile_manager()->IsValidProfile(profile_id))
@@ -127,8 +129,8 @@ void RecordPrecacheStatsOnUIThread(const GURL& url,
   if (!precache_manager || !precache_manager->IsPrecachingAllowed())
     return;
 
-  precache_manager->RecordStatsForFetch(url, referrer, latency, fetch_time,
-                                        size, was_cached);
+  precache_manager->UpdatePrecacheMetricsAndState(
+      url, referrer, latency, fetch_time, size, was_cached, is_user_traffic);
 }
 #endif  // BUILDFLAG(ANDROID_JAVA_UI)
 
@@ -539,9 +541,12 @@ void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request,
     // precaching is allowed.
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
-        base::Bind(&RecordPrecacheStatsOnUIThread, request->url(),
-                   GURL(request->referrer()), latency, base::Time::Now(),
-                   received_content_length, request->was_cached(), profile_));
+        base::Bind(
+            &UpdatePrecacheMetricsAndStateOnUIThread, request->url(),
+            GURL(request->referrer()), latency, base::Time::Now(),
+            received_content_length, request->was_cached(),
+            data_use_measurement::DataUseMeasurement::IsUserTraffic(request),
+            profile_));
 #endif  // BUILDFLAG(ANDROID_JAVA_UI)
     extensions_delegate_->OnCompleted(request, started);
   } else if (request->status().status() == net::URLRequestStatus::FAILED ||