Remove the Timing2 histograms that are deprecated.

chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer_unittest.cc

Index: chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer_unittest.cc
diff --git a/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer_unittest.cc
index 6225f863d01ded0b8b86d743d728230e98c9d775..4b9c2640a6914e212471e0a592b8df3e6d28f0b9 100644
--- a/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer_unittest.cc
+++ b/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer_unittest.cc
@@ -21,30 +21,15 @@ class DocumentWritePageLoadMetricsObserverTest
         internal::kHistogramDocWriteParseStartToFirstContentfulPaint, 0);
   }
 
-  void AssertNoPreloadImmediateHistogramsLogged() {
-    histogram_tester().ExpectTotalCount(
-        internal::kHistogramDocWriteParseStartToFirstContentfulPaintImmediate,
-        0);
-  }
-
   void AssertNoBlockHistogramsLogged() {
     histogram_tester().ExpectTotalCount(
         internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 0);
   }
-
-  void AssertNoBlockImmediateHistogramsLogged() {
-    histogram_tester().ExpectTotalCount(
-        internal::
-            kHistogramDocWriteBlockParseStartToFirstContentfulPaintImmediate,
-        0);
-  }
 };
 
 TEST_F(DocumentWritePageLoadMetricsObserverTest, NoMetrics) {
   AssertNoPreloadHistogramsLogged();
-  AssertNoPreloadImmediateHistogramsLogged();
   AssertNoBlockHistogramsLogged();
-  AssertNoBlockImmediateHistogramsLogged();
 }
 
 TEST_F(DocumentWritePageLoadMetricsObserverTest, PossiblePreload) {
@@ -61,13 +46,10 @@ TEST_F(DocumentWritePageLoadMetricsObserverTest, PossiblePreload) {
   NavigateAndCommit(GURL("https://www.google.com"));
   SimulateTimingAndMetadataUpdate(timing, metadata);
 
-  // Verify that the immediate metrics get logged.
-  histogram_tester().ExpectTotalCount(
-      internal::kHistogramDocWriteParseStartToFirstContentfulPaintImmediate, 1);
   histogram_tester().ExpectTotalCount(
-      internal::kHistogramDocWriteParseStartToFirstContentfulPaint, 0);
+      internal::kHistogramDocWriteParseStartToFirstContentfulPaint, 1);
   histogram_tester().ExpectBucketCount(
-      internal::kHistogramDocWriteParseStartToFirstContentfulPaintImmediate,
+      internal::kHistogramDocWriteParseStartToFirstContentfulPaint,
       contentful_paint.InMilliseconds(), 1);
 
   NavigateAndCommit(GURL("https://www.example.com"));
@@ -89,8 +71,6 @@ TEST_F(DocumentWritePageLoadMetricsObserverTest, NoPossiblePreload) {
   page_load_metrics::PageLoadMetadata metadata;
   NavigateAndCommit(GURL("https://www.google.com"));
   SimulateTimingAndMetadataUpdate(timing, metadata);
-  AssertNoPreloadImmediateHistogramsLogged();
-
   NavigateAndCommit(GURL("https://www.example.com"));
   AssertNoPreloadHistogramsLogged();
 }
@@ -109,26 +89,16 @@ TEST_F(DocumentWritePageLoadMetricsObserverTest, PossibleBlock) {
   NavigateAndCommit(GURL("https://www.google.com"));
   SimulateTimingAndMetadataUpdate(timing, metadata);
 
-  // Verify that the immediate metrics get logged.
-  histogram_tester().ExpectTotalCount(
-      internal::
-          kHistogramDocWriteBlockParseStartToFirstContentfulPaintImmediate,
-      1);
   histogram_tester().ExpectTotalCount(
-      internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 0);
+      internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 1);
   histogram_tester().ExpectBucketCount(
-      internal::
-          kHistogramDocWriteBlockParseStartToFirstContentfulPaintImmediate,
+      internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint,
       contentful_paint.InMilliseconds(), 1);
 
   NavigateAndCommit(GURL("https://www.example.com"));
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 1);
-  histogram_tester().ExpectTotalCount(
-      internal::
-          kHistogramDocWriteBlockParseStartToFirstContentfulPaintImmediate,
-      1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint,
       contentful_paint.InMilliseconds(), 1);
@@ -176,7 +146,6 @@ TEST_F(DocumentWritePageLoadMetricsObserverTest, NoPossibleBlock) {
   page_load_metrics::PageLoadMetadata metadata;
   NavigateAndCommit(GURL("https://www.google.com"));
   SimulateTimingAndMetadataUpdate(timing, metadata);
-  AssertNoBlockImmediateHistogramsLogged();
 
   NavigateAndCommit(GURL("https://www.example.com"));
   AssertNoBlockHistogramsLogged();