[Sheriff] Metrics failure fix in PriceDropMetricsLoggerTest

We should not be using getHistogramValueCountForTesting in
batched tests but rather mHistogramTestRule.getHistogramTotalCount
as per the getHistogramValueCountForTesting documentation
"Does not reset between batched tests".

(cherry picked from commit c9cb140)

Bug: 1404197
Change-Id: Ic956fe4ea04ca93b19ce89096e5b83dcf17e134b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4140167
Reviewed-by: Ayman Almadhoun <ayman@chromium.org>
Commit-Queue: David Maunder <davidjm@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1089507}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4148570
Commit-Queue: Tomasz Wiszkowski <ender@google.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Tomasz Wiszkowski <ender@google.com>
Owners-Override: Tomasz Wiszkowski <ender@google.com>
Cr-Commit-Position: refs/branch-heads/5481@{#190}
Cr-Branched-From: 130f3e4-refs/heads/main@{#1084008}

chrome/android/javatests/src/org/chromium/chrome/browser/tab/state/PriceDropMetricsLoggerTest.java

@@ -17,7 +17,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.UiThreadTest;
 import org.chromium.base.test.metrics.HistogramTestRule;
@@ -83,13 +82,13 @@ public void testMetricsStaleTabNavigation() {
         mPriceDropMetricsLogger.logPriceDropMetrics(
                 "NavigationComplete", TimeUnit.DAYS.toMillis(45));
         Assert.assertEquals(1,
-                RecordHistogram.getHistogramTotalCountForTesting(
+                mHistogramTestRule.getHistogramTotalCount(
                         "Commerce.PriceDrops.StaleTabNavigationComplete.IsProductDetailPage"));
         Assert.assertEquals(1,
-                RecordHistogram.getHistogramTotalCountForTesting(
+                mHistogramTestRule.getHistogramTotalCount(
                         "Commerce.PriceDrops.StaleTabNavigationComplete.ContainsPrice"));
         Assert.assertEquals(1,
-                RecordHistogram.getHistogramTotalCountForTesting(
+                mHistogramTestRule.getHistogramTotalCount(
                         "Commerce.PriceDrops.StaleTabNavigationComplete.ContainsPriceDrop"));
     }
 
@@ -99,13 +98,13 @@ public void testMetricsStaleTabNavigation() {
     public void testMetrics2StaleTabEnterTabSwitcher() {
         mPriceDropMetricsLogger.logPriceDropMetrics("EnterTabSwitcher", TimeUnit.DAYS.toMillis(45));
         Assert.assertEquals(1,
-                RecordHistogram.getHistogramTotalCountForTesting(
+                mHistogramTestRule.getHistogramTotalCount(
                         "Commerce.PriceDrops.StaleTabEnterTabSwitcher.IsProductDetailPage"));
         Assert.assertEquals(1,
-                RecordHistogram.getHistogramTotalCountForTesting(
+                mHistogramTestRule.getHistogramTotalCount(
                         "Commerce.PriceDrops.StaleTabEnterTabSwitcher.ContainsPrice"));
         Assert.assertEquals(1,
-                RecordHistogram.getHistogramTotalCountForTesting(
+                mHistogramTestRule.getHistogramTotalCount(
                         "Commerce.PriceDrops.StaleTabEnterTabSwitcher.ContainsPriceDrop"));
     }
 
@@ -116,13 +115,13 @@ public void testMetricsActiveTabNavigationComplete() {
         mPriceDropMetricsLogger.logPriceDropMetrics(
                 "NavigationComplete", TimeUnit.HOURS.toMillis(12));
         Assert.assertEquals(1,
-                RecordHistogram.getHistogramTotalCountForTesting(
+                mHistogramTestRule.getHistogramTotalCount(
                         "Commerce.PriceDrops.ActiveTabNavigationComplete.IsProductDetailPage"));
         Assert.assertEquals(1,
-                RecordHistogram.getHistogramTotalCountForTesting(
+                mHistogramTestRule.getHistogramTotalCount(
                         "Commerce.PriceDrops.ActiveTabNavigationComplete.ContainsPrice"));
         Assert.assertEquals(1,
-                RecordHistogram.getHistogramTotalCountForTesting(
+                mHistogramTestRule.getHistogramTotalCount(
                         "Commerce.PriceDrops.ActiveTabNavigationComplete.ContainsPriceDrop"));
     }
 
@@ -133,13 +132,13 @@ public void testMetricsActiveTabEnterTabSwitcher() {
         mPriceDropMetricsLogger.logPriceDropMetrics(
                 "EnterTabSwitcher", TimeUnit.HOURS.toMillis(12));
         Assert.assertEquals(1,
-                RecordHistogram.getHistogramTotalCountForTesting(
+                mHistogramTestRule.getHistogramTotalCount(
                         "Commerce.PriceDrops.ActiveTabEnterTabSwitcher.IsProductDetailPage"));
         Assert.assertEquals(1,
-                RecordHistogram.getHistogramTotalCountForTesting(
+                mHistogramTestRule.getHistogramTotalCount(
                         "Commerce.PriceDrops.ActiveTabEnterTabSwitcher.ContainsPrice"));
         Assert.assertEquals(1,
-                RecordHistogram.getHistogramTotalCountForTesting(
+                mHistogramTestRule.getHistogramTotalCount(
                         "Commerce.PriceDrops.ActiveTabEnterTabSwitcher.ContainsPriceDrop"));
     }