Move data use measurement to DataUseNetworkDelegate

components/data_use_measurement/core/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 "components/data_use_measurement/core/data_use_measurement.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
-#include "content/public/browser/resource_request_info.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/upload_data_stream.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 
 #if defined(OS_ANDROID)
 #include "net/android/traffic_stats.h"
 #endif
 
 namespace data_use_measurement {
@@ skipping 34 matching lines @@
       base::TimeDelta::FromHours(1),         // Maximum sample
       50,                                    // Bucket count.
       base::HistogramBase::kUmaTargetedHistogramFlag);
   histogram_pointer->AddCount(latency.InMilliseconds(), count);
 }
 #endif
 
 }  // namespace
 
 DataUseMeasurement::DataUseMeasurement(
+    const IsUserInitiatedRequestCallbackType&
+        is_user_initiated_request_callback,
     const metrics::UpdateUsagePrefCallbackType& metrics_data_use_forwarder)
-    : metrics_data_use_forwarder_(metrics_data_use_forwarder)
+    : is_user_initiated_request_callback_(is_user_initiated_request_callback),
+      metrics_data_use_forwarder_(metrics_data_use_forwarder)
 #if defined(OS_ANDROID)
       ,
       app_state_(base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES),
       app_listener_(new base::android::ApplicationStatusListener(
           base::Bind(&DataUseMeasurement::OnApplicationStateChange,
                      base::Unretained(this)))),
       rx_bytes_os_(0),
       tx_bytes_os_(0),
       bytes_transferred_since_last_traffic_stats_query_(0),
       no_reads_since_background_(false)
@@ skipping 44 matching lines @@
   // of redirected requests.
   UpdateDataUsePrefs(request);
 #if defined(OS_ANDROID)
   MaybeRecordNetworkBytesOS();
 #endif
 }
 
 void DataUseMeasurement::ReportDataUseUMA(const net::URLRequest& request,
                                           TrafficDirection dir,
                                           int64_t bytes) {
-  bool is_user_traffic = IsUserInitiatedRequest(request);
+  bool is_user_traffic = is_user_initiated_request_callback_.Run(request);
   bool is_connection_cellular =
       net::NetworkChangeNotifier::IsConnectionCellular(
           net::NetworkChangeNotifier::GetConnectionType());
 
   DataUseUserData* attached_service_data = static_cast<DataUseUserData*>(
       request.GetUserData(DataUseUserData::kUserDataKey));
   DataUseUserData::ServiceName service_name = DataUseUserData::NOT_TAGGED;
   DataUseUserData::AppState old_app_state = DataUseUserData::FOREGROUND;
   DataUseUserData::AppState new_app_state = DataUseUserData::UNKNOWN;
 
@@ skipping 52 matching lines @@
 
   // Update data use prefs for cellular connections.
   if (!metrics_data_use_forwarder_.is_null()) {
     metrics_data_use_forwarder_.Run(
         DataUseUserData::GetServiceNameAsString(service_name),
         request.GetTotalSentBytes() + request.GetTotalReceivedBytes(),
         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(rajendrant): Verify this condition for different use cases. See
-  // crbug.com/626063.
-  return content::ResourceRequestInfo::ForRequest(&request) != nullptr;
-}
-
 #if defined(OS_ANDROID)
 void DataUseMeasurement::OnApplicationStateChangeForTesting(
     base::android::ApplicationState application_state) {
   OnApplicationStateChange(application_state);
 }
 #endif
 
 DataUseUserData::AppState DataUseMeasurement::CurrentAppState() const {
 #if defined(OS_ANDROID)
   if (app_state_ != base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES)
@@ skipping 74 matching lines @@
       message_size);
   if (message_size > 0) {
     IncreaseSparseHistogramByValue(
         GetHistogramName("DataUse.MessageSize.AllServices", dir, app_state,
                          is_connection_cellular),
         service, message_size);
   }
 }
 
 }  // namespace data_use_measurement