Move data use measurement to DataUseNetworkDelegate

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 48a61fcad2e32007cb4012e9cca19c35849d0007..51c4aa84f55d8a804df7089530694c5a4a298509 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -49,7 +49,9 @@
 #include "components/data_usage/core/data_use_aggregator.h"
 #include "components/data_usage/core/data_use_amortizer.h"
 #include "components/data_usage/core/data_use_annotator.h"
+#include "components/data_use_measurement/content/data_use_measurement_util.h"
 #include "components/data_use_measurement/core/data_use_ascriber.h"
+#include "components/data_use_measurement/core/data_use_measurement.h"
 #include "components/metrics/metrics_service.h"
 #include "components/net_log/chrome_net_log.h"
 #include "components/network_session_configurator/network_session_configurator.h"
@@ -514,8 +516,7 @@ void IOThread::Init() {
 
   std::unique_ptr<ChromeNetworkDelegate> chrome_network_delegate(
       new ChromeNetworkDelegate(extension_event_router_forwarder(),
-                                &system_enable_referrers_,
-                                metrics_data_use_forwarder_));
+                                &system_enable_referrers_));
   // By default, data usage is considered off the record.
   chrome_network_delegate->set_data_use_aggregator(
       globals_->data_use_aggregator.get(),
@@ -531,7 +532,9 @@ void IOThread::Init() {
 
   globals_->system_network_delegate =
       globals_->data_use_ascriber->CreateNetworkDelegate(
-          std::move(chrome_network_delegate));
+          std::move(chrome_network_delegate),
+          data_use_measurement::GetIsUserInitiatedRequestCallback(),

[Not at Google. Contact bengr, 2016/11/09 22:04:10]

This method call seems awkward in this file. We should be able to avoid this
class knowing anything about the details of the data use network delegate.

Here is a possible approach:
Abstracted this to an interface, say RequestClassifier, which exposes the method
IsUserInitiatedRequest(..). A new pure virtual method in DataUseAscriber could
create instances of RequestClassifier. This method could be implemented in
ChromeDataUseAscriber to return a implementation of RequestClassifier that
depends on resource_request_info.h.

With this approach, this file will not need to know about the callback at all,
and the only change will be to pass metrics_data_use_forwarder_.

+          metrics_data_use_forwarder_);
 
   globals_->host_resolver = CreateGlobalHostResolver(net_log_);