Refactor the DataUseMeasurement class

components/data_use_measurement/content/data_use_measurement_unittest.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 <memory>
 #include <string>
 
 #include "base/macros.h"
@@ skipping 47 matching lines @@
               data_use_measurement::DataUseUserData::SUGGESTIONS));
     } else {
       content::ResourceRequestInfo::AllocateForTesting(
           request.get(), content::RESOURCE_TYPE_MAIN_FRAME, nullptr, -2, -2, -2,
           true, false, true, true, false);
     }
 
     request->Start();
     loop_.RunUntilIdle();
 
-    data_use_measurement_.ReportDataUseUMA(request.get());
+    data_use_measurement_.OnCompleted(*request, true);
   }
 
   // This function makes a user request and confirms that its effect is
   // reflected in proper histograms.
   void TestForAUserRequest(const std::string& target_dimension) {
     base::HistogramTester histogram_tester;
     SendRequest(true);
     histogram_tester.ExpectTotalCount("DataUse.TrafficSize.System.Downstream." +
                                           target_dimension + kConnectionType,
                                       1);
@@ skipping 79 matching lines @@
 }
 #endif
 
 TEST_F(DataUseMeasurementTest, DataUseForwarderIsCalled) {
   EXPECT_FALSE(IsDataUseForwarderCalled());
   SendRequest(true);
   EXPECT_TRUE(IsDataUseForwarderCalled());
 }
 
 }  // namespace data_use_measurement