Precache should cancel when there is user traffic

components/data_use_measurement/content/data_use_measurement.cc

 // Copyright 2015 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/data_use_measurement/content/data_use_measurement.h"
 
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
@@ skipping 43 matching lines @@
           base::Bind(&DataUseMeasurement::OnApplicationStateChange,
                      base::Unretained(this))))
 #endif
 {
 }
 
 DataUseMeasurement::~DataUseMeasurement(){};
 
 void DataUseMeasurement::ReportDataUseUMA(
     const net::URLRequest* request) const {
-  const content::ResourceRequestInfo* info =
-      content::ResourceRequestInfo::ForRequest(request);
-  // Having |info| is the sign of a request for a web content from user. For now
-  // we could add a condition to check ProcessType in info is
-  // content::PROCESS_TYPE_RENDERER, but it won't be compatible with upcoming
-  // PlzNavigate architecture. So just existence of |info| is verified, and the
-  // current check should be compatible with upcoming changes in PlzNavigate.
-  bool is_user_traffic = info != nullptr;
 
   // Counts rely on URLRequest::GetTotalReceivedBytes() and
   // URLRequest::GetTotalSentBytes(), which does not include the send path,
   // network layer overhead, TLS overhead, and DNS.
   // TODO(amohammadkhan): Make these measured bytes more in line with number of
   // bytes in lower levels.
   int64_t total_upload_bytes = request->GetTotalSentBytes();
   int64_t total_received_bytes = request->GetTotalReceivedBytes();
+  bool is_user_traffic = IsUserInitiatedRequest(request);
 
   bool is_connection_cellular =
       net::NetworkChangeNotifier::IsConnectionCellular(
           net::NetworkChangeNotifier::GetConnectionType());
   RecordUMAHistogramCount(
       GetHistogramName(is_user_traffic ? "DataUse.TrafficSize.User"
                                        : "DataUse.TrafficSize.System",
                        UPSTREAM, is_connection_cellular),
       total_upload_bytes);
   RecordUMAHistogramCount(
@@ skipping 15 matching lines @@
   }
 
   // Update data use prefs for cellular connections.
   if (!metrics_data_use_forwarder_.is_null()) {
     metrics_data_use_forwarder_.Run(
         attached_service_data->GetServiceNameAsString(service_name),
         total_upload_bytes + total_received_bytes, is_connection_cellular);
   }
 }
 
+// static
+bool DataUseMeasurement::IsUserInitiatedRequest(
+    const net::URLRequest* request) {
+  // Having ResourceRequestInfo in the URL request is a sign that the request is
+  // for a web content from user. For now we could add a condition to check
+  // ProcessType in info is content::PROCESS_TYPE_RENDERER, but it won't be
+  // compatible with upcoming PlzNavigate architecture. So just existence of
+  // ResourceRequestInfo is verified, and the current check should be compatible
+  // with upcoming changes in PlzNavigate.
+  // TODO(626063): Verify this condition for different use cases.

[bengr, 2016/07/08 16:54:23]

// TODO(rajendrant): Verify this condition for different use cases. See
crbug.com/626063.

[Raj, 2016/07/08 20:05:50]

Done.

+  return content::ResourceRequestInfo::ForRequest(request) != nullptr;
+}
+
 #if defined(OS_ANDROID)
 void DataUseMeasurement::OnApplicationStateChangeForTesting(
     base::android::ApplicationState application_state) {
   app_state_ = application_state;
 }
 #endif
 
 DataUseMeasurement::AppState DataUseMeasurement::CurrentAppState() const {
 #if defined(OS_ANDROID)
   if (app_state_ != base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES)
@@ skipping 31 matching lines @@
       message_size);
   if (message_size > 0) {
     IncreaseSparseHistogramByValue(
         GetHistogramName("DataUse.MessageSize.AllServices", dir,
                          is_connection_cellular),
         service, message_size);
   }
 }
 
 }  // namespace data_use_measurement