ServiceWorker: Keep the worker alive until FetchEvent.waitUntil settles

content/browser/service_worker/service_worker_metrics.cc

Index: content/browser/service_worker/service_worker_metrics.cc
diff --git a/content/browser/service_worker/service_worker_metrics.cc b/content/browser/service_worker/service_worker_metrics.cc
index eaf8071ffa4f87e00f6e4352b14509e80400d36f..07585564f47f1ef4c7e1859b4b4db11ddaa5cd13 100644
--- a/content/browser/service_worker/service_worker_metrics.cc
+++ b/content/browser/service_worker/service_worker_metrics.cc
@@ -67,6 +67,10 @@ std::string EventTypeToSuffix(ServiceWorkerMetrics::EventType event_type) {
       return "_UNKNOWN";
     case ServiceWorkerMetrics::EventType::FOREIGN_FETCH:
       return "_FOREIGN_FETCH";
+    case ServiceWorkerMetrics::EventType::FETCH_WAITUNTIL:
+      return "_FETCH_WAITUNTIL";
+    case ServiceWorkerMetrics::EventType::FOREIGN_FETCH_WAITUNTIL:
+      return "_FOREIGN_FETCH_WAITUNTIL";
     case ServiceWorkerMetrics::EventType::NUM_TYPES:
       NOTREACHED() << static_cast<int>(event_type);
   }
@@ -186,6 +190,10 @@ const char* ServiceWorkerMetrics::EventTypeToString(EventType event_type) {
       return "Unknown";
     case EventType::FOREIGN_FETCH:
       return "Foreign Fetch";
+    case EventType::FETCH_WAITUNTIL:
+      return "Fetch WaitUntil";
+    case EventType::FOREIGN_FETCH_WAITUNTIL:
+      return "Foreign Fetch WaitUntil";
     case EventType::NUM_TYPES:
       break;
   }
@@ -417,6 +425,10 @@ void ServiceWorkerMetrics::RecordEventDuration(EventType event,
                                    time);
       }
       break;
+    case EventType::FETCH_WAITUNTIL:
+      UMA_HISTOGRAM_MEDIUM_TIMES("ServiceWorker.FetchEvent.WaitUntil.Time",
+                                 time);
+      break;
     case EventType::FOREIGN_FETCH:
       if (was_handled) {
         UMA_HISTOGRAM_MEDIUM_TIMES(
@@ -426,6 +438,10 @@ void ServiceWorkerMetrics::RecordEventDuration(EventType event,
             "ServiceWorker.ForeignFetchEvent.Fallback.Time", time);
       }
       break;
+    case EventType::FOREIGN_FETCH_WAITUNTIL:
+      UMA_HISTOGRAM_MEDIUM_TIMES(
+          "ServiceWorker.ForeignFetchEvent.WaitUntil.Time", time);
+      break;
     case EventType::SYNC:
       UMA_HISTOGRAM_MEDIUM_TIMES("ServiceWorker.BackgroundSyncEvent.Time",
                                  time);