metrics: Refactor CachedMetrics in components/gcm_driver/

Bug: 1046181
Change-Id: I58390007cfdc98199a21e2e07df31d7c575b8185
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2019477
Commit-Queue: bttk <bttk@chromium.org>
Reviewed-by: Peter Beverloo <peter@chromium.org>
Reviewed-by: Ender <ender@google.com>
Cr-Commit-Position: refs/heads/master@{#742387}

components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/LazySubscriptionsManager.java

@@ -16,7 +16,7 @@ import org.json.JSONObject;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.StrictModeContext;
-import org.chromium.base.metrics.CachedMetrics;
+import org.chromium.base.metrics.RecordHistogram;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -216,10 +216,8 @@ public class LazySubscriptionsManager {
                 queueJSON = filterMessageBasedOnCollapseKey(queueJSON, message.getCollapseKey());
             }
 
-            // Use {@link CachedMetrics} so this gets reported when native is
-            // loaded instead of calling native right away.
-            new CachedMetrics.Count100HistogramSample("PushMessaging.QueuedMessagesCount")
-                    .record(queueJSON.length());
+            RecordHistogram.recordCount100Histogram(
+                    "PushMessaging.QueuedMessagesCount", queueJSON.length());
 
             // If the queue is full remove the oldest message.
             if (queueJSON.length() == MESSAGES_QUEUE_SIZE) {

components/gcm_driver/android/junit/src/org/chromium/components/gcm_driver/LazySubscriptionsManagerTest.java

@@ -18,7 +18,6 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 import org.chromium.base.ContextUtils;
-import org.chromium.base.metrics.CachedMetrics;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.test.ShadowRecordHistogram;
 import org.chromium.base.test.BaseRobolectricTestRunner;
@@ -33,8 +32,6 @@ import java.util.Set;
 public class LazySubscriptionsManagerTest {
     @Before
     public void setUp() {
-        // This commits and clears any cached metrics.
-        CachedMetrics.commitCachedMetrics();
         ShadowRecordHistogram.reset();
     }