Move data use measurement to DataUseNetworkDelegate

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 3543941d9eca0e4546107858f5126443ec145019..81712b7a555d768f106a5763b4c81106a8b28f3b 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -144,8 +144,7 @@ void RecordNetworkErrorHistograms(const net::URLRequest* request,
 
 ChromeNetworkDelegate::ChromeNetworkDelegate(
     extensions::EventRouterForwarder* event_router,
-    BooleanPrefMember* enable_referrers,
-    const metrics::UpdateUsagePrefCallbackType& metrics_data_use_forwarder)
+    BooleanPrefMember* enable_referrers)
     : profile_(nullptr),
       enable_referrers_(enable_referrers),
       enable_do_not_track_(nullptr),
@@ -154,7 +153,6 @@ ChromeNetworkDelegate::ChromeNetworkDelegate(
       allowed_domains_for_apps_(nullptr),
       url_blacklist_manager_(nullptr),
       domain_reliability_monitor_(nullptr),
-      data_use_measurement_(metrics_data_use_forwarder),
       experimental_web_platform_features_enabled_(
           base::CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kEnableExperimentalWebPlatformFeatures)),
@@ -237,8 +235,6 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "456327 URLRequest::ChromeNetworkDelegate::OnBeforeURLRequest"));
 
-  data_use_measurement_.OnBeforeURLRequest(request);
-
   // TODO(joaodasilva): This prevents extensions from seeing URLs that are
   // blocked. However, an extension might redirect the request to another URL,
   // which is not blocked.
@@ -353,7 +349,6 @@ int ChromeNetworkDelegate::OnHeadersReceived(
 
 void ChromeNetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
                                              const GURL& new_location) {
-  data_use_measurement_.OnBeforeRedirect(*request, new_location);
   if (domain_reliability_monitor_)
     domain_reliability_monitor_->OnBeforeRedirect(request);
   extensions_delegate_->OnBeforeRedirect(request, new_location);
@@ -373,13 +368,11 @@ void ChromeNetworkDelegate::OnNetworkBytesReceived(net::URLRequest* request,
 #endif  // defined(ENABLE_TASK_MANAGER)
 
   ReportDataUsageStats(request, 0 /* tx_bytes */, bytes_received);
-  data_use_measurement_.OnNetworkBytesReceived(*request, bytes_received);
 }
 
 void ChromeNetworkDelegate::OnNetworkBytesSent(net::URLRequest* request,
                                                int64_t bytes_sent) {
   ReportDataUsageStats(request, bytes_sent, 0 /* rx_bytes */);
-  data_use_measurement_.OnNetworkBytesSent(*request, bytes_sent);
 }
 
 void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request,
@@ -389,7 +382,6 @@ void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request,
 
   // TODO(amohammadkhan): Verify that there is no double recording in data use
   // of redirected requests.
-  data_use_measurement_.OnCompleted(*request, started);
   RecordNetworkErrorHistograms(request, net_error);
 
   if (net_error == net::OK) {