metrics: Refactor CachedMetrics in components/module_installer/

Bug: 1046181
Change-Id: Ib732d475ecb33830a9e0be81a3b65b1d4e344a87
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2019479
Commit-Queue: bttk <bttk@chromium.org>
Reviewed-by: Ender <ender@google.com>
Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742394}

components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitAvailabilityLogger.java

@@ -14,7 +14,6 @@ import com.google.android.play.core.splitinstall.SplitInstallManagerFactory;
 import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus;
 
 import org.chromium.base.ContextUtils;
-import org.chromium.base.metrics.CachedMetrics.EnumeratedHistogramSample;
 import org.chromium.base.metrics.RecordHistogram;
 
 import java.util.HashMap;
@@ -72,8 +71,7 @@ public class SplitAvailabilityLogger {
 
     private static void recordAvailabilityStatus(String moduleName, int status) {
         String key = "Android.FeatureModules.AvailabilityStatus." + moduleName;
-        EnumeratedHistogramSample sample = new EnumeratedHistogramSample(key, COUNT);
-        sample.record(status);
+        RecordHistogram.recordEnumeratedHistogram(key, status, COUNT);
     }
 
     /**

components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitInstallFailureLogger.java

@@ -6,7 +6,7 @@ package org.chromium.components.module_installer.logger;
 
 import com.google.android.play.core.splitinstall.model.SplitInstallErrorCode;
 
-import org.chromium.base.metrics.CachedMetrics.EnumeratedHistogramSample;
+import org.chromium.base.metrics.RecordHistogram;
 
 class SplitInstallFailureLogger {
     // FeatureModuleInstallStatus defined in //tools/metrics/histograms/enums.xml.
@@ -99,7 +99,6 @@ class SplitInstallFailureLogger {
 
     private void log(String moduleName, int code) {
         String name = "Android.FeatureModules.InstallStatus." + moduleName;
-        EnumeratedHistogramSample sample = new EnumeratedHistogramSample(name, COUNT);
-        sample.record(code);
+        RecordHistogram.recordEnumeratedHistogram(name, code, COUNT);
     }
 }

components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitInstallStatusLogger.java

@@ -6,7 +6,7 @@ package org.chromium.components.module_installer.logger;
 
 import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus;
 
-import org.chromium.base.metrics.CachedMetrics.EnumeratedHistogramSample;
+import org.chromium.base.metrics.RecordHistogram;
 
 class SplitInstallStatusLogger {
     // FeatureModuleInstallingStatus defined in //tools/metrics/histograms/enums.xml.
@@ -67,7 +67,6 @@ class SplitInstallStatusLogger {
 
     private void recordInstallStatus(String moduleName, int status) {
         String name = "Android.FeatureModules.InstallingStatus." + moduleName;
-        EnumeratedHistogramSample sample = new EnumeratedHistogramSample(name, COUNT);
-        sample.record(status);
+        RecordHistogram.recordEnumeratedHistogram(name, status, COUNT);
     }
 }

components/module_installer/android/junit/src/org/chromium/components/module_installer/logger/LoggerTestUtil.java

@@ -7,7 +7,6 @@ package org.chromium.components.module_installer.logger;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThan;
 
-import org.chromium.base.metrics.CachedMetrics;
 import org.chromium.base.metrics.RecordHistogram;
 
 /**
@@ -24,10 +23,6 @@ public class LoggerTestUtil {
      * @return The smallest recorded sample.
      */
     public static int getHistogramStatus(String name, int boundary) {
-        // Make sure the metrics are flushed.
-        // Needed by the EnumeratedHistogramSample but not for RecordHistogram.
-        CachedMetrics.commitCachedMetrics();
-
         int sampleCount = RecordHistogram.getHistogramTotalCountForTesting(name);
         assertThat(sampleCount, greaterThan(0));