Move data use measurement to DataUseNetworkDelegate

components/data_use_measurement/core/data_use_network_delegate.cc

Index: components/data_use_measurement/core/data_use_network_delegate.cc
diff --git a/components/data_use_measurement/core/data_use_network_delegate.cc b/components/data_use_measurement/core/data_use_network_delegate.cc
index 75c34a74617529d301c513b322bbb4e48ede115c..5e80c1f0e4c5632fa09c52b578224ff6a886cb27 100644
--- a/components/data_use_measurement/core/data_use_network_delegate.cc
+++ b/components/data_use_measurement/core/data_use_network_delegate.cc
@@ -8,14 +8,19 @@
 #include <utility>
 
 #include "components/data_use_measurement/core/data_use_ascriber.h"
+#include "components/data_use_measurement/core/url_request_classifier.h"
 #include "net/url_request/url_request.h"
 
 namespace data_use_measurement {
 DataUseNetworkDelegate::DataUseNetworkDelegate(
     std::unique_ptr<NetworkDelegate> nested_network_delegate,
-    DataUseAscriber* ascriber)
+    DataUseAscriber* ascriber,
+    std::unique_ptr<URLRequestClassifier> url_request_classifier,
+    const metrics::UpdateUsagePrefCallbackType& metrics_data_use_forwarder)
     : net::LayeredNetworkDelegate(std::move(nested_network_delegate)),
-      ascriber_(ascriber) {
+      ascriber_(ascriber),
+      data_use_measurement_(std::move(url_request_classifier),
+                            metrics_data_use_forwarder) {
   DCHECK(ascriber);
 }
 
@@ -26,24 +31,28 @@ void DataUseNetworkDelegate::OnBeforeURLRequestInternal(
     const net::CompletionCallback& callback,
     GURL* new_url) {
   ascriber_->OnBeforeUrlRequest(request);
+  data_use_measurement_.OnBeforeURLRequest(request);
 }
 
 void DataUseNetworkDelegate::OnBeforeRedirectInternal(
     net::URLRequest* request,
     const GURL& new_location) {
   ascriber_->OnBeforeRedirect(request, new_location);
+  data_use_measurement_.OnBeforeRedirect(*request, new_location);
 }
 
 void DataUseNetworkDelegate::OnNetworkBytesReceivedInternal(
     net::URLRequest* request,
     int64_t bytes_received) {
   ascriber_->OnNetworkBytesReceived(request, bytes_received);
+  data_use_measurement_.OnNetworkBytesReceived(*request, bytes_received);
 }
 
 void DataUseNetworkDelegate::OnNetworkBytesSentInternal(
     net::URLRequest* request,
     int64_t bytes_sent) {
   ascriber_->OnNetworkBytesSent(request, bytes_sent);
+  data_use_measurement_.OnNetworkBytesSent(*request, bytes_sent);
 }
 
 void DataUseNetworkDelegate::OnURLRequestDestroyedInternal(
@@ -51,4 +60,9 @@ void DataUseNetworkDelegate::OnURLRequestDestroyedInternal(
   ascriber_->OnUrlRequestDestroyed(request);
 }
 
+void DataUseNetworkDelegate::OnCompletedInternal(net::URLRequest* request,
+                                                 bool started) {
+  data_use_measurement_.OnCompleted(*request, started);
+}
+
 }  // namespace data_use_measurement