[PageLoad Metrics] Add NavigationTo* FCP and FMP to H2/QUIC/H11 metrics

chrome/browser/page_load_metrics/observers/protocol_page_load_metrics_observer.cc

Index: chrome/browser/page_load_metrics/observers/protocol_page_load_metrics_observer.cc
diff --git a/chrome/browser/page_load_metrics/observers/protocol_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/protocol_page_load_metrics_observer.cc
index be3764b48b2ec31945ce28e63eae17a3776418e8..94b5f6d31bdb128959143ebb6cfb42ae7e059889 100644
--- a/chrome/browser/page_load_metrics/observers/protocol_page_load_metrics_observer.cc
+++ b/chrome/browser/page_load_metrics/observers/protocol_page_load_metrics_observer.cc
@@ -80,12 +80,20 @@ void ProtocolPageLoadMetricsObserver::OnFirstContentfulPaint(
     case net::HttpResponseInfo::CONNECTION_INFO_HTTP1_1:
       PAGE_LOAD_HISTOGRAM(
           "PageLoad.Clients.Protocol.H11.PaintTiming."
+          "NavigationToFirstContentfulPaint",
+          timing.first_contentful_paint.value());
+      PAGE_LOAD_HISTOGRAM(
+          "PageLoad.Clients.Protocol.H11.PaintTiming."
           "ParseStartToFirstContentfulPaint",
           timing.first_contentful_paint.value() - timing.parse_start.value());
       break;
     case net::HttpResponseInfo::CONNECTION_INFO_HTTP2:
       PAGE_LOAD_HISTOGRAM(
           "PageLoad.Clients.Protocol.H2.PaintTiming."
+          "NavigationToFirstContentfulPaint",
+          timing.first_contentful_paint.value());
+      PAGE_LOAD_HISTOGRAM(
+          "PageLoad.Clients.Protocol.H2.PaintTiming."
           "ParseStartToFirstContentfulPaint",
           timing.first_contentful_paint.value() - timing.parse_start.value());
       break;
@@ -97,6 +105,10 @@ void ProtocolPageLoadMetricsObserver::OnFirstContentfulPaint(
     case net::HttpResponseInfo::CONNECTION_INFO_QUIC_36:
       PAGE_LOAD_HISTOGRAM(
           "PageLoad.Clients.Protocol.QUIC.PaintTiming."
+          "NavigationToFirstContentfulPaint",
+          timing.first_contentful_paint.value());
+      PAGE_LOAD_HISTOGRAM(
+          "PageLoad.Clients.Protocol.QUIC.PaintTiming."
           "ParseStartToFirstContentfulPaint",
           timing.first_contentful_paint.value() - timing.parse_start.value());
       break;
@@ -119,12 +131,20 @@ void ProtocolPageLoadMetricsObserver::OnFirstMeaningfulPaint(
     case net::HttpResponseInfo::CONNECTION_INFO_HTTP1_1:
       PAGE_LOAD_HISTOGRAM(
           "PageLoad.Clients.Protocol.H11.Experimental.PaintTiming."
+          "NavigationToFirstMeaningfulPaint",
+          timing.first_meaningful_paint.value());
+      PAGE_LOAD_HISTOGRAM(
+          "PageLoad.Clients.Protocol.H11.Experimental.PaintTiming."
           "ParseStartToFirstMeaningfulPaint",
           timing.first_meaningful_paint.value() - timing.parse_start.value());
       break;
     case net::HttpResponseInfo::CONNECTION_INFO_HTTP2:
       PAGE_LOAD_HISTOGRAM(
           "PageLoad.Clients.Protocol.H2.Experimental.PaintTiming."
+          "NavigationToFirstMeaningfulPaint",
+          timing.first_meaningful_paint.value());
+      PAGE_LOAD_HISTOGRAM(
+          "PageLoad.Clients.Protocol.H2.Experimental.PaintTiming."
           "ParseStartToFirstMeaningfulPaint",
           timing.first_meaningful_paint.value() - timing.parse_start.value());
       break;
@@ -136,6 +156,10 @@ void ProtocolPageLoadMetricsObserver::OnFirstMeaningfulPaint(
     case net::HttpResponseInfo::CONNECTION_INFO_QUIC_36:
       PAGE_LOAD_HISTOGRAM(
           "PageLoad.Clients.Protocol.QUIC.Experimental.PaintTiming."
+          "NavigationToFirstMeaningfulPaint",
+          timing.first_meaningful_paint.value());
+      PAGE_LOAD_HISTOGRAM(
+          "PageLoad.Clients.Protocol.QUIC.Experimental.PaintTiming."
           "ParseStartToFirstMeaningfulPaint",
           timing.first_meaningful_paint.value() - timing.parse_start.value());
       break;