Refactor the DataUseMeasurement class

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 fab1bca45883faefe4f971e2f78892b1b6eb9763..a63bce294dd07da460b6dcaf92aa9c2a811022d9 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -343,8 +343,7 @@ int ChromeNetworkDelegate::OnHeadersReceived(
 
 void ChromeNetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
                                              const GURL& new_location) {
-// Recording data use of request on redirects.
-  data_use_measurement_.ReportDataUseUMA(request);
+  data_use_measurement_.OnBeforeRedirect(*request, new_location);
   if (domain_reliability_monitor_)
     domain_reliability_monitor_->OnBeforeRedirect(request);
   extensions_delegate_->OnBeforeRedirect(request, new_location);
@@ -373,9 +372,7 @@ void ChromeNetworkDelegate::OnNetworkBytesSent(net::URLRequest* request,
 
 void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request,
                                         bool started) {
-  // TODO(amohammadkhan): Verify that there is no double recording in data use
-  // of redirected requests.
-  data_use_measurement_.ReportDataUseUMA(request);
+  data_use_measurement_.OnCompleted(*request, started);
   RecordNetworkErrorHistograms(request);
 
   if (request->status().status() == net::URLRequestStatus::SUCCESS) {