Remove the Timing2 histograms that are deprecated.

chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc

Index: chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc
diff --git a/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc
index 9083e29271eb1b8425b396bdf6462ab366d50bb4..dbb8ac05af090d9e729de2e8a1d8634c5095f1d3 100644
--- a/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc
+++ b/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc
@@ -8,139 +8,68 @@
 
 namespace internal {
 const char kHistogramDocWriteFirstContentfulPaint[] =
-    "PageLoad.Clients.DocWrite.Evaluator.Timing2."
-    "NavigationToFirstContentfulPaint";
-const char kHistogramDocWriteParseStartToFirstContentfulPaint[] =
-    "PageLoad.Clients.DocWrite.Evaluator.Timing2."
-    "ParseStartToFirstContentfulPaint";
-const char kHistogramDocWriteParseDuration[] =
-    "PageLoad.Clients.DocWrite.Evaluator.Timing2.ParseDuration";
-const char kHistogramDocWriteParseBlockedOnScript[] =
-    "PageLoad.Clients.DocWrite.Evaluator.Timing2.ParseBlockedOnScriptLoad";
-const char kHistogramDocWriteParseBlockedOnScriptParseComplete[] =
-    "PageLoad.Clients.DocWrite.Evaluator.Timing2.ParseBlockedOnScriptLoad."
-    "ParseComplete";
-const char kHistogramDocWriteParseBlockedOnScriptLoadDocumentWrite[] =
-    "PageLoad.Clients.DocWrite.Evaluator.Timing2."
-    "ParseBlockedOnScriptLoadFromDocumentWrite";
-const char
-    kHistogramDocWriteParseBlockedOnScriptLoadDocumentWriteParseComplete[] =
-        "PageLoad.Clients.DocWrite.Evaluator.Timing2."
-        "ParseBlockedOnScriptLoadFromDocumentWrite.ParseComplete";
-
-const char kBackgroundHistogramDocWriteFirstContentfulPaint[] =
-    "PageLoad.Clients.DocWrite.Evaluator.Timing2."
-    "NavigationToFirstContentfulPaint."
-    "Background";
-const char kBackgroundHistogramDocWriteParseDuration[] =
-    "PageLoad.Clients.DocWrite.Evaluator.Timing2.ParseDuration.Background";
-const char kBackgroundHistogramDocWriteParseBlockedOnScript[] =
-    "PageLoad.Clients.DocWrite.Evaluator.Timing2.ParseBlockedOnScriptLoad."
-    "Background";
-const char kBackgroundHistogramDocWriteParseBlockedOnScriptLoadDocumentWrite[] =
-    "PageLoad.Clients.DocWrite.Evaluator.Timing2."
-    "ParseBlockedOnScriptLoadFromDocumentWrite.Background";
-
-// document.write blocking histograms
-const char kHistogramDocWriteBlockParseStartToFirstContentfulPaint[] =
-    "PageLoad.Clients.DocWrite.Block.Timing2.ParseStartToFirstContentfulPaint";
-const char kHistogramDocWriteBlockParseBlockedOnScript[] =
-    "PageLoad.Clients.DocWrite.Block.Timing2.ParseBlockedOnScriptLoad";
-const char kHistogramDocWriteBlockParseBlockedOnScriptLoadDocumentWrite[] =
-    "PageLoad.Clients.DocWrite.Block.Timing2."
-    "ParseBlockedOnScriptLoadFromDocumentWrite";
-const char kHistogramDocWriteBlockParseDuration[] =
-    "PageLoad.Clients.DocWrite.Block.Timing2.ParseDuration";
-const char kHistogramDocWriteBlockParseBlockedOnScriptParseComplete[] =
-    "PageLoad.Clients.DocWrite.Block.Timing2.ParseBlockedOnScriptLoad."
-    "ParseComplete";
-const char kDocWriteBlockParseBlockedOnScriptLoadDocumentWriteParseComplete[] =
-    "PageLoad.Clients.DocWrite.Block.Timing2."
-    "ParseBlockedOnScriptLoadFromDocumentWrite.ParseComplete";
-const char kHistogramDocWriteBlockReloadCount[] =
-    "PageLoad.Clients.DocWrite.Block.ReloadCount";
-
-const char kBackgroundHistogramDocWriteBlockParseBlockedOnScript[] =
-    "PageLoad.Clients.DocWrite.Block.Timing2.ParseBlockedOnScriptLoad."
-    "Background";
-const char kBackgroundHistogramDocWriteBlockParseBlockedOnScriptComplete[] =
-    "PageLoad.Clients.DocWrite.Block.Timing2.ParseBlockedOnScriptLoad."
-    "ParseComplete.Background";
-const char kBackgroundDocWriteBlockParseBlockedOnScriptLoadDocumentWrite[] =
-    "PageLoad.Clients.DocWrite.Block.Timing2."
-    "ParseBlockedOnScriptLoadFromDocumentWrite.Background";
-const char kBackgroundDocWriteBlockParseBlockedOnScriptLoadDocWriteComplete[] =
-    "PageLoad.Clients.DocWrite.Block.Timing2."
-    "ParseBlockedOnScriptLoadFromDocumentWrite.ParseComplete.Background";
-const char kBackgroundHistogramDocWriteBlockParseDuration[] =
-    "PageLoad.Clients.DocWrite.Block.Timing2.ParseDuration.Background";
-
-// Histograms that are logged immediately on receiving timing/metadata update.
-const char kHistogramDocWriteFirstContentfulPaintImmediate[] =
     "PageLoad.Clients.DocWrite.Evaluator.PaintTiming."
     "NavigationToFirstContentfulPaint";
-const char kHistogramDocWriteParseStartToFirstContentfulPaintImmediate[] =
+const char kHistogramDocWriteParseStartToFirstContentfulPaint[] =
     "PageLoad.Clients.DocWrite.Evaluator.PaintTiming."
     "ParseStartToFirstContentfulPaint";
-const char kHistogramDocWriteParseDurationImmediate[] =
+const char kHistogramDocWriteParseDuration[] =
     "PageLoad.Clients.DocWrite.Evaluator.ParseTiming.ParseDuration";
-const char kHistogramDocWriteParseBlockedOnScriptLoadImmediate[] =
+const char kHistogramDocWriteParseBlockedOnScriptLoad[] =
     "PageLoad.Clients.DocWrite.Evaluator.ParseTiming.ParseBlockedOnScriptLoad";
-const char kHistogramDocWriteParseBlockedOnScriptLoadDocumentWriteImmediate[] =
+const char kHistogramDocWriteParseBlockedOnScriptLoadDocumentWrite[] =
     "PageLoad.Clients.DocWrite.Evaluator.ParseTiming."
     "ParseBlockedOnScriptLoadFromDocumentWrite";
-const char kHistogramDocWriteParseBlockedOnScriptExecutionImmediate[] =
+const char kHistogramDocWriteParseBlockedOnScriptExecution[] =
     "PageLoad.Clients.DocWrite.Evaluator.ParseTiming."
     "ParseBlockedOnScriptExecution";
-const char
-    kHistogramDocWriteParseBlockedOnScriptExecutionDocumentWriteImmediate[] =
-        "PageLoad.Clients.DocWrite.Evaluator.ParseTiming."
-        "ParseBlockedOnScriptExecutionFromDocumentWrite";
-const char kBackgroundHistogramDocWriteFirstContentfulPaintImmediate[] =
+const char kHistogramDocWriteParseBlockedOnScriptExecutionDocumentWrite[] =
+    "PageLoad.Clients.DocWrite.Evaluator.ParseTiming."
+    "ParseBlockedOnScriptExecutionFromDocumentWrite";
+const char kBackgroundHistogramDocWriteFirstContentfulPaint[] =
     "PageLoad.Clients.DocWrite.Evaluator.PaintTiming."
     "NavigationToFirstContentfulPaint."
     "Background";
-const char kBackgroundHistogramDocWriteParseDurationImmediate[] =
+const char kBackgroundHistogramDocWriteParseDuration[] =
     "PageLoad.Clients.DocWrite.Evaluator.ParseTiming.ParseDuration.Background";
-const char kBackgroundHistogramDocWriteParseBlockedOnScriptLoadImmediate[] =
+const char kBackgroundHistogramDocWriteParseBlockedOnScriptLoad[] =
     "PageLoad.Clients.DocWrite.Evaluator.ParseTiming.ParseBlockedOnScriptLoad."
     "Background";
-const char
-    kBackgroundHistogramDocWriteParseBlockedOnScriptLoadDocumentWriteImmediate
-        [] = "PageLoad.Clients.DocWrite.Evaluator.ParseTiming."
-             "ParseBlockedOnScriptLoadFromDocumentWrite.Background";
+const char kBackgroundHistogramDocWriteParseBlockedOnScriptLoadDocumentWrite[] =
+    "PageLoad.Clients.DocWrite.Evaluator.ParseTiming."
+    "ParseBlockedOnScriptLoadFromDocumentWrite.Background";
 
-const char kHistogramDocWriteBlockFirstContentfulPaintImmediate[] =
+const char kHistogramDocWriteBlockFirstContentfulPaint[] =
     "PageLoad.Clients.DocWrite.Block.PaintTiming."
     "NavigationToFirstContentfulPaint";
-const char kHistogramDocWriteBlockParseStartToFirstContentfulPaintImmediate[] =
+const char kHistogramDocWriteBlockParseStartToFirstContentfulPaint[] =
     "PageLoad.Clients.DocWrite.Block.PaintTiming."
     "ParseStartToFirstContentfulPaint";
-const char kHistogramDocWriteBlockParseBlockedOnScriptLoadImmediate[] =
+const char kHistogramDocWriteBlockParseBlockedOnScriptLoad[] =
     "PageLoad.Clients.DocWrite.Block.ParseTiming.ParseBlockedOnScriptLoad";
-const char
-    kHistogramDocWriteBlockParseBlockedOnScriptLoadDocumentWriteImmediate[] =
-        "PageLoad.Clients.DocWrite.Block.ParseTiming."
-        "ParseBlockedOnScriptLoadFromDocumentWrite";
-const char kHistogramDocWriteBlockParseBlockedOnScriptExecutionImmediate[] =
+const char kHistogramDocWriteBlockParseBlockedOnScriptLoadDocumentWrite[] =
+    "PageLoad.Clients.DocWrite.Block.ParseTiming."
+    "ParseBlockedOnScriptLoadFromDocumentWrite";
+const char kHistogramDocWriteBlockParseBlockedOnScriptExecution[] =
     "PageLoad.Clients.DocWrite.Block.ParseTiming.ParseBlockedOnScriptExecution";
-const char
-    kHistogramDocWriteBlockParseBlockedOnScriptExecutionDocumentWriteImmediate
-        [] = "PageLoad.Clients.DocWrite.Block.ParseTiming."
-             "ParseBlockedOnScriptExecutionFromDocumentWrite";
-const char kHistogramDocWriteBlockParseDurationImmediate[] =
+const char kHistogramDocWriteBlockParseBlockedOnScriptExecutionDocumentWrite[] =
+    "PageLoad.Clients.DocWrite.Block.ParseTiming."
+    "ParseBlockedOnScriptExecutionFromDocumentWrite";
+const char kHistogramDocWriteBlockParseDuration[] =
     "PageLoad.Clients.DocWrite.Block.ParseTiming.ParseDuration";
 
-const char
-    kBackgroundHistogramDocWriteBlockParseBlockedOnScriptLoadImmediate[] =
-        "PageLoad.Clients.DocWrite.Block.ParseTiming.ParseBlockedOnScriptLoad."
-        "Background";
-const char
-    kBackgroundDocWriteBlockParseBlockedOnScriptLoadDocumentWriteImmediate[] =
-        "PageLoad.Clients.DocWrite.Block.ParseTiming."
-        "ParseBlockedOnScriptLoadFromDocumentWrite.Background";
-const char kBackgroundHistogramDocWriteBlockParseDurationImmediate[] =
+const char kBackgroundHistogramDocWriteBlockParseBlockedOnScriptLoad[] =
+    "PageLoad.Clients.DocWrite.Block.ParseTiming.ParseBlockedOnScriptLoad."
+    "Background";
+const char kBackgroundDocWriteBlockParseBlockedOnScriptLoadDocumentWrite[] =
+    "PageLoad.Clients.DocWrite.Block.ParseTiming."
+    "ParseBlockedOnScriptLoadFromDocumentWrite.Background";
+const char kBackgroundHistogramDocWriteBlockParseDuration[] =
     "PageLoad.Clients.DocWrite.Block.ParseTiming.ParseDuration.Background";
+
+const char kHistogramDocWriteBlockReloadCount[] =
+    "PageLoad.Clients.DocWrite.Block.ReloadCount";
+
 }  // namespace internal
 
 DocumentWritePageLoadMetricsObserver::DocumentWritePageLoadMetricsObserver()
@@ -199,37 +128,20 @@ void DocumentWritePageLoadMetricsObserver::OnLoadingBehaviorObserved(
   }
 }
 
-void DocumentWritePageLoadMetricsObserver::OnComplete(
-    const page_load_metrics::PageLoadTiming& timing,
-    const page_load_metrics::PageLoadExtraInfo& info) {
-  if (timing.IsEmpty())
-    return;
-
-  if (info.metadata.behavior_flags &
-      blink::WebLoadingBehaviorFlag::WebLoadingBehaviorDocumentWriteEvaluator) {
-    LogDocumentWriteEvaluatorData(timing, info);
-  }
-  if (info.metadata.behavior_flags &
-      blink::WebLoadingBehaviorFlag::WebLoadingBehaviorDocumentWriteBlock) {
-    LogDocumentWriteBlockData(timing, info);
-  }
-}
-
 void DocumentWritePageLoadMetricsObserver::
     LogDocumentWriteEvaluatorFirstContentfulPaint(
         const page_load_metrics::PageLoadTiming& timing,
         const page_load_metrics::PageLoadExtraInfo& info) {
   if (WasStartedInForegroundOptionalEventInForeground(
           timing.first_contentful_paint, info)) {
+    PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteFirstContentfulPaint,
+                        timing.first_contentful_paint.value());
     PAGE_LOAD_HISTOGRAM(
-        internal::kHistogramDocWriteFirstContentfulPaintImmediate,
-        timing.first_contentful_paint.value());
-    PAGE_LOAD_HISTOGRAM(
-        internal::kHistogramDocWriteParseStartToFirstContentfulPaintImmediate,
+        internal::kHistogramDocWriteParseStartToFirstContentfulPaint,
         timing.first_contentful_paint.value() - timing.parse_start.value());
   } else {
     PAGE_LOAD_HISTOGRAM(
-        internal::kBackgroundHistogramDocWriteFirstContentfulPaintImmediate,
+        internal::kBackgroundHistogramDocWriteFirstContentfulPaint,
         timing.first_contentful_paint.value());
   }
 }
@@ -273,105 +185,32 @@ void DocumentWritePageLoadMetricsObserver::LogDocumentWriteEvaluatorParseStop(
       timing.parse_stop.value() - timing.parse_start.value();
   if (WasStartedInForegroundOptionalEventInForeground(timing.parse_stop,
                                                       info)) {
-    PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteParseDurationImmediate,
+    PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteParseDuration,
                         parse_duration);
+    PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteParseBlockedOnScriptLoad,
+                        timing.parse_blocked_on_script_load_duration.value());
     PAGE_LOAD_HISTOGRAM(
-        internal::kHistogramDocWriteParseBlockedOnScriptLoadImmediate,
-        timing.parse_blocked_on_script_load_duration.value());
-    PAGE_LOAD_HISTOGRAM(
-        internal::
-            kHistogramDocWriteParseBlockedOnScriptLoadDocumentWriteImmediate,
+        internal::kHistogramDocWriteParseBlockedOnScriptLoadDocumentWrite,
         timing.parse_blocked_on_script_load_from_document_write_duration
             .value());
     PAGE_LOAD_HISTOGRAM(
-        internal::kHistogramDocWriteParseBlockedOnScriptExecutionImmediate,
+        internal::kHistogramDocWriteParseBlockedOnScriptExecution,
         timing.parse_blocked_on_script_execution_duration.value());
     PAGE_LOAD_HISTOGRAM(
-        internal::
-            kHistogramDocWriteParseBlockedOnScriptExecutionDocumentWriteImmediate,
+        internal::kHistogramDocWriteParseBlockedOnScriptExecutionDocumentWrite,
         timing.parse_blocked_on_script_execution_from_document_write_duration
             .value());
   } else {
-    PAGE_LOAD_HISTOGRAM(
-        internal::kBackgroundHistogramDocWriteParseDurationImmediate,
-        parse_duration);
-    PAGE_LOAD_HISTOGRAM(
-        internal::kBackgroundHistogramDocWriteParseBlockedOnScriptLoadImmediate,
-        timing.parse_blocked_on_script_load_duration.value());
-    PAGE_LOAD_HISTOGRAM(
-        internal::
-            kBackgroundHistogramDocWriteParseBlockedOnScriptLoadDocumentWriteImmediate,
-        timing.parse_blocked_on_script_load_from_document_write_duration
-            .value());
-  }
-}
-
-void DocumentWritePageLoadMetricsObserver::LogDocumentWriteEvaluatorData(
-    const page_load_metrics::PageLoadTiming& timing,
-    const page_load_metrics::PageLoadExtraInfo& info) {
-  bool foreground_paint = WasStartedInForegroundOptionalEventInForeground(
-      timing.first_contentful_paint, info);
-
-  if (timing.first_contentful_paint) {
-    if (foreground_paint) {
-      PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteFirstContentfulPaint,
-                          timing.first_contentful_paint.value());
-    } else {
-      PAGE_LOAD_HISTOGRAM(
-          internal::kBackgroundHistogramDocWriteFirstContentfulPaint,
-          timing.first_contentful_paint.value());
-    }
-  }
-
-  // Log parse based metrics.
-  if (!timing.parse_start)
-    return;
-
-  if (foreground_paint) {
-    PAGE_LOAD_HISTOGRAM(
-        internal::kHistogramDocWriteParseStartToFirstContentfulPaint,
-        timing.first_contentful_paint.value() - timing.parse_start.value());
-  }
-
-  if (WasParseInForeground(timing.parse_start, timing.parse_stop, info)) {
-    PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteParseBlockedOnScript,
-                        timing.parse_blocked_on_script_load_duration.value());
-    PAGE_LOAD_HISTOGRAM(
-        internal::kHistogramDocWriteParseBlockedOnScriptLoadDocumentWrite,
-        timing.parse_blocked_on_script_load_from_document_write_duration
-            .value());
-  } else {
-    PAGE_LOAD_HISTOGRAM(
-        internal::kBackgroundHistogramDocWriteParseBlockedOnScript,
-        timing.parse_blocked_on_script_load_duration.value());
-    PAGE_LOAD_HISTOGRAM(
-        internal::
-            kBackgroundHistogramDocWriteParseBlockedOnScriptLoadDocumentWrite,
-        timing.parse_blocked_on_script_load_from_document_write_duration
-            .value());
-  }
-
-  // These metrics require a full parse.
-  if (!timing.parse_stop)
-    return;
-
-  base::TimeDelta parse_duration =
-      timing.parse_stop.value() - timing.parse_start.value();
-  if (WasStartedInForegroundOptionalEventInForeground(timing.parse_stop,
-                                                      info)) {
-    PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteParseDuration,
+    PAGE_LOAD_HISTOGRAM(internal::kBackgroundHistogramDocWriteParseDuration,
                         parse_duration);
     PAGE_LOAD_HISTOGRAM(
-        internal::kHistogramDocWriteParseBlockedOnScriptParseComplete,
+        internal::kBackgroundHistogramDocWriteParseBlockedOnScriptLoad,
         timing.parse_blocked_on_script_load_duration.value());
     PAGE_LOAD_HISTOGRAM(
         internal::
-            kHistogramDocWriteParseBlockedOnScriptLoadDocumentWriteParseComplete,
+            kBackgroundHistogramDocWriteParseBlockedOnScriptLoadDocumentWrite,
         timing.parse_blocked_on_script_load_from_document_write_duration
             .value());
-  } else {
-    PAGE_LOAD_HISTOGRAM(internal::kBackgroundHistogramDocWriteParseDuration,
-                        parse_duration);
   }
 }
 
@@ -381,12 +220,10 @@ void DocumentWritePageLoadMetricsObserver::
         const page_load_metrics::PageLoadExtraInfo& info) {
   if (WasStartedInForegroundOptionalEventInForeground(
           timing.first_contentful_paint, info)) {
+    PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteBlockFirstContentfulPaint,
+                        timing.first_contentful_paint.value());
     PAGE_LOAD_HISTOGRAM(
-        internal::kHistogramDocWriteBlockFirstContentfulPaintImmediate,
-        timing.first_contentful_paint.value());
-    PAGE_LOAD_HISTOGRAM(
-        internal::
-            kHistogramDocWriteBlockParseStartToFirstContentfulPaintImmediate,
+        internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint,
         timing.first_contentful_paint.value() - timing.parse_start.value());
   }
 }
@@ -398,99 +235,32 @@ void DocumentWritePageLoadMetricsObserver::LogDocumentWriteBlockParseStop(
       timing.parse_stop.value() - timing.parse_start.value();
   if (WasStartedInForegroundOptionalEventInForeground(timing.parse_stop,
                                                       info)) {
-    PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteBlockParseDurationImmediate,
+    PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteBlockParseDuration,
                         parse_duration);
     PAGE_LOAD_HISTOGRAM(
-        internal::kHistogramDocWriteBlockParseBlockedOnScriptLoadImmediate,
+        internal::kHistogramDocWriteBlockParseBlockedOnScriptLoad,
         timing.parse_blocked_on_script_load_duration.value());
     PAGE_LOAD_HISTOGRAM(
-        internal::
-            kHistogramDocWriteBlockParseBlockedOnScriptLoadDocumentWriteImmediate,
+        internal::kHistogramDocWriteBlockParseBlockedOnScriptLoadDocumentWrite,
         timing.parse_blocked_on_script_load_from_document_write_duration
             .value());
     PAGE_LOAD_HISTOGRAM(
-        internal::kHistogramDocWriteBlockParseBlockedOnScriptExecutionImmediate,
+        internal::kHistogramDocWriteBlockParseBlockedOnScriptExecution,
         timing.parse_blocked_on_script_execution_duration.value());
     PAGE_LOAD_HISTOGRAM(
         internal::
-            kHistogramDocWriteBlockParseBlockedOnScriptExecutionDocumentWriteImmediate,
+            kHistogramDocWriteBlockParseBlockedOnScriptExecutionDocumentWrite,
         timing.parse_blocked_on_script_execution_from_document_write_duration
             .value());
   } else {
     PAGE_LOAD_HISTOGRAM(
-        internal::kBackgroundHistogramDocWriteBlockParseDurationImmediate,
-        parse_duration);
-    PAGE_LOAD_HISTOGRAM(
-        internal::
-            kBackgroundHistogramDocWriteBlockParseBlockedOnScriptLoadImmediate,
-        timing.parse_blocked_on_script_load_duration.value());
-    PAGE_LOAD_HISTOGRAM(
-        internal::
-            kBackgroundDocWriteBlockParseBlockedOnScriptLoadDocumentWriteImmediate,
-        timing.parse_blocked_on_script_load_from_document_write_duration
-            .value());
-  }
-}
-
-void DocumentWritePageLoadMetricsObserver::LogDocumentWriteBlockData(
-    const page_load_metrics::PageLoadTiming& timing,
-    const page_load_metrics::PageLoadExtraInfo& info) {
-  if (!timing.parse_start) {
-    return;
-  }
-
-  if (WasStartedInForegroundOptionalEventInForeground(
-          timing.first_contentful_paint, info)) {
-    PAGE_LOAD_HISTOGRAM(
-        internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint,
-        timing.first_contentful_paint.value() - timing.parse_start.value());
-  }
-
-  if (WasParseInForeground(timing.parse_start, timing.parse_stop, info)) {
-    PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteBlockParseBlockedOnScript,
-                        timing.parse_blocked_on_script_load_duration.value());
-    PAGE_LOAD_HISTOGRAM(
-        internal::kHistogramDocWriteBlockParseBlockedOnScriptLoadDocumentWrite,
-        timing.parse_blocked_on_script_load_from_document_write_duration
-            .value());
-  } else {
-    PAGE_LOAD_HISTOGRAM(
-        internal::kBackgroundHistogramDocWriteBlockParseBlockedOnScript,
-        timing.parse_blocked_on_script_load_duration.value());
-    PAGE_LOAD_HISTOGRAM(
-        internal::kBackgroundDocWriteBlockParseBlockedOnScriptLoadDocumentWrite,
-        timing.parse_blocked_on_script_load_from_document_write_duration
-            .value());
-  }
-
-  if (!timing.parse_stop) {
-    return;
-  }
-
-  base::TimeDelta parse_duration =
-      timing.parse_stop.value() - timing.parse_start.value();
-  if (WasStartedInForegroundOptionalEventInForeground(timing.parse_stop,
-                                                      info)) {
-    PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteBlockParseDuration,
-                        parse_duration);
-    PAGE_LOAD_HISTOGRAM(
-        internal::kHistogramDocWriteBlockParseBlockedOnScriptParseComplete,
-        timing.parse_blocked_on_script_load_duration.value());
-    PAGE_LOAD_HISTOGRAM(
-        internal::
-            kDocWriteBlockParseBlockedOnScriptLoadDocumentWriteParseComplete,
-        timing.parse_blocked_on_script_load_from_document_write_duration
-            .value());
-  } else {
-    PAGE_LOAD_HISTOGRAM(
         internal::kBackgroundHistogramDocWriteBlockParseDuration,
         parse_duration);
     PAGE_LOAD_HISTOGRAM(
-        internal::kBackgroundHistogramDocWriteBlockParseBlockedOnScriptComplete,
+        internal::kBackgroundHistogramDocWriteBlockParseBlockedOnScriptLoad,
         timing.parse_blocked_on_script_load_duration.value());
     PAGE_LOAD_HISTOGRAM(
-        internal::
-            kBackgroundDocWriteBlockParseBlockedOnScriptLoadDocWriteComplete,
+        internal::kBackgroundDocWriteBlockParseBlockedOnScriptLoadDocumentWrite,
         timing.parse_blocked_on_script_load_from_document_write_duration
             .value());
   }