Update ServiceWorker page load histograms to log immediately.

chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc

Index: chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc
diff --git a/chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc
index e6b7e155a896adf5f0c3b866b5e2f7749efe591d..efe546911d3aa630914232d088af4af9787327e7 100644
--- a/chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc
+++ b/chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc
@@ -10,56 +10,71 @@
 namespace internal {
 
 const char kHistogramServiceWorkerFirstContentfulPaint[] =
-    "PageLoad.Clients.ServiceWorker.Timing2.NavigationToFirstContentfulPaint";
+    "PageLoad.Clients.ServiceWorker.PaintTiming."
+    "NavigationToFirstContentfulPaint";
 const char kBackgroundHistogramServiceWorkerFirstContentfulPaint[] =
-    "PageLoad.Clients.ServiceWorker.Timing2.NavigationToFirstContentfulPaint."
-    "Background";
+    "PageLoad.Clients.ServiceWorker.PaintTiming."
+    "NavigationToFirstContentfulPaint.Background";
 const char kHistogramServiceWorkerParseStartToFirstContentfulPaint[] =
-    "PageLoad.Clients.ServiceWorker.Timing2.ParseStartToFirstContentfulPaint";
+    "PageLoad.Clients.ServiceWorker.PaintTiming."
+    "ParseStartToFirstContentfulPaint";
 const char kHistogramServiceWorkerDomContentLoaded[] =
-    "PageLoad.Clients.ServiceWorker.Timing2."
+    "PageLoad.Clients.ServiceWorker.DocumentTiming."
     "NavigationToDOMContentLoadedEventFired";
 const char kHistogramServiceWorkerLoad[] =
-    "PageLoad.Clients.ServiceWorker.Timing2.NavigationToLoadEventFired";
+    "PageLoad.Clients.ServiceWorker.DocumentTiming.NavigationToLoadEventFired";
 
 }  // namespace internal
 
+namespace {
+
+bool IsServiceWorkerControlled(
+    const page_load_metrics::PageLoadExtraInfo& info) {
+  return (info.metadata.behavior_flags &
+          blink::WebLoadingBehaviorFlag::
+              WebLoadingBehaviorServiceWorkerControlled) != 0;
+}
+
+}  // namespace
+
 ServiceWorkerPageLoadMetricsObserver::ServiceWorkerPageLoadMetricsObserver() {}
 
-void ServiceWorkerPageLoadMetricsObserver::OnComplete(
+void ServiceWorkerPageLoadMetricsObserver::OnFirstContentfulPaint(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
-  if (info.metadata.behavior_flags &
-      blink::WebLoadingBehaviorFlag::
-          WebLoadingBehaviorServiceWorkerControlled) {
-    LogServiceWorkerHistograms(timing, info);
+  if (!IsServiceWorkerControlled(info))
+    return;
+  if (WasStartedInForegroundEventInForeground(timing.first_contentful_paint,
+                                              info)) {
+    PAGE_LOAD_HISTOGRAM(internal::kHistogramServiceWorkerFirstContentfulPaint,
+                        timing.first_contentful_paint);
+    PAGE_LOAD_HISTOGRAM(
+        internal::kHistogramServiceWorkerParseStartToFirstContentfulPaint,
+        timing.first_contentful_paint - timing.parse_start);
+  } else {
+    PAGE_LOAD_HISTOGRAM(
+        internal::kBackgroundHistogramServiceWorkerFirstContentfulPaint,
+        timing.first_contentful_paint);
   }
 }
 
-void ServiceWorkerPageLoadMetricsObserver::LogServiceWorkerHistograms(
+void ServiceWorkerPageLoadMetricsObserver::OnDomContentLoadedEventStart(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
-  if (!timing.first_contentful_paint.is_zero()) {
-    bool foreground_paint = WasStartedInForegroundEventInForeground(
-        timing.first_contentful_paint, info);
-    if (foreground_paint) {
-      PAGE_LOAD_HISTOGRAM(internal::kHistogramServiceWorkerFirstContentfulPaint,
-                          timing.first_contentful_paint);
-      PAGE_LOAD_HISTOGRAM(
-          internal::kHistogramServiceWorkerParseStartToFirstContentfulPaint,
-          timing.first_contentful_paint - timing.parse_start);
-    } else {
-      PAGE_LOAD_HISTOGRAM(
-          internal::kBackgroundHistogramServiceWorkerFirstContentfulPaint,
-          timing.first_contentful_paint);
-    }
-  }
-
+  if (!IsServiceWorkerControlled(info))
+    return;
   if (WasStartedInForegroundEventInForeground(
           timing.dom_content_loaded_event_start, info)) {
     PAGE_LOAD_HISTOGRAM(internal::kHistogramServiceWorkerDomContentLoaded,
                         timing.dom_content_loaded_event_start);
   }
+}
+
+void ServiceWorkerPageLoadMetricsObserver::OnLoadEventStart(
+    const page_load_metrics::PageLoadTiming& timing,
+    const page_load_metrics::PageLoadExtraInfo& info) {
+  if (!IsServiceWorkerControlled(info))
+    return;
   if (WasStartedInForegroundEventInForeground(timing.load_event_start, info)) {
     PAGE_LOAD_HISTOGRAM(internal::kHistogramServiceWorkerLoad,
                         timing.load_event_start);