chrome-devtools-frontend 1.0.1402249 → 1.0.1418433

package/front_end/models/trace/handlers/NetworkRequestsHandler.test.ts

@@ -33,29 +33,29 @@ describe('NetworkRequestsHandler', function() {
 
       // Page Request.
       const pageRequestExpected: DataArgsProcessedDataMap = new Map([
-        ['queueing', Trace.Types.Timing.MicroSeconds(25085)],
-        ['stalled', Trace.Types.Timing.MicroSeconds(5670)],
-        ['dnsLookup', Trace.Types.Timing.MicroSeconds(105)],
-        ['initialConnection', Trace.Types.Timing.MicroSeconds(498)],
-        ['ssl', Trace.Types.Timing.MicroSeconds(0)],
-        ['requestSent', Trace.Types.Timing.MicroSeconds(363)],
-        ['waiting', Trace.Types.Timing.MicroSeconds(1383)],
-        ['download', Trace.Types.Timing.MicroSeconds(4827)],
-        ['networkDuration', Trace.Types.Timing.MicroSeconds(38503)],
+        ['queueing', Trace.Types.Timing.Micro(25085)],
+        ['stalled', Trace.Types.Timing.Micro(5670)],
+        ['dnsLookup', Trace.Types.Timing.Micro(105)],
+        ['initialConnection', Trace.Types.Timing.Micro(498)],
+        ['ssl', Trace.Types.Timing.Micro(0)],
+        ['requestSent', Trace.Types.Timing.Micro(363)],
+        ['waiting', Trace.Types.Timing.Micro(1383)],
+        ['download', Trace.Types.Timing.Micro(4827)],
+        ['networkDuration', Trace.Types.Timing.Micro(38503)],
       ]);
       assertDataArgsProcessedDataStats(topLevelRequests.all, 'http://localhost:8080/', pageRequestExpected);
 
       // CSS Request (cached event (with resourceMarkAsCached event)),
       const cssRequestExpected: DataArgsProcessedDataMap = new Map([
-        ['queueing', Trace.Types.Timing.MicroSeconds(0)],
-        ['stalled', Trace.Types.Timing.MicroSeconds(2175)],
-        ['dnsLookup', Trace.Types.Timing.MicroSeconds(0)],
-        ['initialConnection', Trace.Types.Timing.MicroSeconds(0)],
-        ['ssl', Trace.Types.Timing.MicroSeconds(0)],
-        ['requestSent', Trace.Types.Timing.MicroSeconds(0)],
-        ['waiting', Trace.Types.Timing.MicroSeconds(0)],
-        ['download', Trace.Types.Timing.MicroSeconds(1294)],
-        ['networkDuration', Trace.Types.Timing.MicroSeconds(0)],
+        ['queueing', Trace.Types.Timing.Micro(0)],
+        ['stalled', Trace.Types.Timing.Micro(2175)],
+        ['dnsLookup', Trace.Types.Timing.Micro(0)],
+        ['initialConnection', Trace.Types.Timing.Micro(0)],
+        ['ssl', Trace.Types.Timing.Micro(0)],
+        ['requestSent', Trace.Types.Timing.Micro(0)],
+        ['waiting', Trace.Types.Timing.Micro(0)],
+        ['download', Trace.Types.Timing.Micro(1294)],
+        ['networkDuration', Trace.Types.Timing.Micro(0)],
       ]);
 
       const cssRequestBlockingStatusExpected: DataArgsMap = new Map([
@@ -67,15 +67,15 @@ describe('NetworkRequestsHandler', function() {
 
       // Blocking JS Request.
       const blockingJSRequestExpected: DataArgsProcessedDataMap = new Map([
-        ['queueing', Trace.Types.Timing.MicroSeconds(0)],
-        ['stalled', Trace.Types.Timing.MicroSeconds(2126)],
-        ['dnsLookup', Trace.Types.Timing.MicroSeconds(0)],
-        ['initialConnection', Trace.Types.Timing.MicroSeconds(0)],
-        ['ssl', Trace.Types.Timing.MicroSeconds(0)],
-        ['requestSent', Trace.Types.Timing.MicroSeconds(0)],
-        ['waiting', Trace.Types.Timing.MicroSeconds(0)],
-        ['download', Trace.Types.Timing.MicroSeconds(1207)],
-        ['networkDuration', Trace.Types.Timing.MicroSeconds(0)],
+        ['queueing', Trace.Types.Timing.Micro(0)],
+        ['stalled', Trace.Types.Timing.Micro(2126)],
+        ['dnsLookup', Trace.Types.Timing.Micro(0)],
+        ['initialConnection', Trace.Types.Timing.Micro(0)],
+        ['ssl', Trace.Types.Timing.Micro(0)],
+        ['requestSent', Trace.Types.Timing.Micro(0)],
+        ['waiting', Trace.Types.Timing.Micro(0)],
+        ['download', Trace.Types.Timing.Micro(1207)],
+        ['networkDuration', Trace.Types.Timing.Micro(0)],
       ]);
 
       const blockingJSBlockingStatusExpected: DataArgsMap = new Map([
@@ -88,15 +88,15 @@ describe('NetworkRequestsHandler', function() {
 
       // Module JS Request (cached).
       const moduleRequestExpected: DataArgsProcessedDataMap = new Map([
-        ['queueing', Trace.Types.Timing.MicroSeconds(7681)],
-        ['stalled', Trace.Types.Timing.MicroSeconds(1527)],
-        ['dnsLookup', Trace.Types.Timing.MicroSeconds(0)],
-        ['initialConnection', Trace.Types.Timing.MicroSeconds(0)],
-        ['ssl', Trace.Types.Timing.MicroSeconds(0)],
-        ['requestSent', Trace.Types.Timing.MicroSeconds(0)],
-        ['waiting', Trace.Types.Timing.MicroSeconds(20200)],
-        ['download', Trace.Types.Timing.MicroSeconds(19273)],
-        ['networkDuration', Trace.Types.Timing.MicroSeconds(48681)],
+        ['queueing', Trace.Types.Timing.Micro(7681)],
+        ['stalled', Trace.Types.Timing.Micro(1527)],
+        ['dnsLookup', Trace.Types.Timing.Micro(0)],
+        ['initialConnection', Trace.Types.Timing.Micro(0)],
+        ['ssl', Trace.Types.Timing.Micro(0)],
+        ['requestSent', Trace.Types.Timing.Micro(0)],
+        ['waiting', Trace.Types.Timing.Micro(20200)],
+        ['download', Trace.Types.Timing.Micro(19273)],
+        ['networkDuration', Trace.Types.Timing.Micro(48681)],
       ]);
 
       const moduleRequestBlockingStatusExpected: DataArgsMap = new Map([
@@ -111,15 +111,15 @@ describe('NetworkRequestsHandler', function() {
       assert.lengthOf(fontCSSRequests.all, 1, 'Incorrect number of requests');
 
       const fontCSSRequestExpected: DataArgsProcessedDataMap = new Map([
-        ['queueing', Trace.Types.Timing.MicroSeconds(0)],
-        ['stalled', Trace.Types.Timing.MicroSeconds(3178)],
-        ['dnsLookup', Trace.Types.Timing.MicroSeconds(0)],
-        ['initialConnection', Trace.Types.Timing.MicroSeconds(0)],
-        ['ssl', Trace.Types.Timing.MicroSeconds(0)],
-        ['requestSent', Trace.Types.Timing.MicroSeconds(0)],
-        ['waiting', Trace.Types.Timing.MicroSeconds(0)],
-        ['download', Trace.Types.Timing.MicroSeconds(1203)],
-        ['networkDuration', Trace.Types.Timing.MicroSeconds(0)],
+        ['queueing', Trace.Types.Timing.Micro(0)],
+        ['stalled', Trace.Types.Timing.Micro(3178)],
+        ['dnsLookup', Trace.Types.Timing.Micro(0)],
+        ['initialConnection', Trace.Types.Timing.Micro(0)],
+        ['ssl', Trace.Types.Timing.Micro(0)],
+        ['requestSent', Trace.Types.Timing.Micro(0)],
+        ['waiting', Trace.Types.Timing.Micro(0)],
+        ['download', Trace.Types.Timing.Micro(1203)],
+        ['networkDuration', Trace.Types.Timing.Micro(0)],
       ]);
 
       const fontCSSBlockingStatusExpected: DataArgsMap = new Map([
@@ -138,15 +138,15 @@ describe('NetworkRequestsHandler', function() {
       assert.lengthOf(fontDataRequests.all, 1, 'Incorrect number of requests');
 
       const fontDataRequestExpected: DataArgsProcessedDataMap = new Map([
-        ['queueing', Trace.Types.Timing.MicroSeconds(0)],
-        ['stalled', Trace.Types.Timing.MicroSeconds(1929)],
-        ['dnsLookup', Trace.Types.Timing.MicroSeconds(0)],
-        ['initialConnection', Trace.Types.Timing.MicroSeconds(0)],
-        ['ssl', Trace.Types.Timing.MicroSeconds(0)],
-        ['requestSent', Trace.Types.Timing.MicroSeconds(0)],
-        ['waiting', Trace.Types.Timing.MicroSeconds(0)],
-        ['download', Trace.Types.Timing.MicroSeconds(962)],
-        ['networkDuration', Trace.Types.Timing.MicroSeconds(0)],
+        ['queueing', Trace.Types.Timing.Micro(0)],
+        ['stalled', Trace.Types.Timing.Micro(1929)],
+        ['dnsLookup', Trace.Types.Timing.Micro(0)],
+        ['initialConnection', Trace.Types.Timing.Micro(0)],
+        ['ssl', Trace.Types.Timing.Micro(0)],
+        ['requestSent', Trace.Types.Timing.Micro(0)],
+        ['waiting', Trace.Types.Timing.Micro(0)],
+        ['download', Trace.Types.Timing.Micro(962)],
+        ['networkDuration', Trace.Types.Timing.Micro(0)],
       ]);
 
       const fontDataRequestBlockingStatusExpected: DataArgsMap = new Map([
@@ -231,15 +231,15 @@ describe('NetworkRequestsHandler', function() {
               url: 'http://localhost:3000/foo',
               priority: 'VeryHigh',
               requestMethod: 'GET',
-              ts: Trace.Types.Timing.MicroSeconds(1311223447642),
-              dur: Trace.Types.Timing.MicroSeconds(7845),
+              ts: Trace.Types.Timing.Micro(1311223447642),
+              dur: Trace.Types.Timing.Micro(7845),
             },
             {
               url: 'http://localhost:3000/bar',
               priority: 'VeryHigh',
               requestMethod: 'GET',
-              ts: Trace.Types.Timing.MicroSeconds(1311223455487),
-              dur: Trace.Types.Timing.MicroSeconds(3771),
+              ts: Trace.Types.Timing.Micro(1311223455487),
+              dur: Trace.Types.Timing.Micro(3771),
             },
           ],
           'Incorrect number of redirects (request 1)');
@@ -264,15 +264,15 @@ describe('NetworkRequestsHandler', function() {
               url: 'http://localhost:3000/foo.js',
               priority: 'Low',
               requestMethod: 'GET',
-              ts: Trace.Types.Timing.MicroSeconds(183611568786),
-              dur: Trace.Types.Timing.MicroSeconds(506233),
+              ts: Trace.Types.Timing.Micro(183611568786),
+              dur: Trace.Types.Timing.Micro(506233),
             },
             {
               url: 'http://localhost:3000/bar.js',
               priority: 'Low',
               requestMethod: 'GET',
-              ts: Trace.Types.Timing.MicroSeconds(183612075019),
-              dur: Trace.Types.Timing.MicroSeconds(802726),
+              ts: Trace.Types.Timing.Micro(183612075019),
+              dur: Trace.Types.Timing.Micro(802726),
             },
           ],
           'Incorrect number of redirects (request 1)');

package/front_end/models/trace/handlers/NetworkRequestsHandler.ts

@@ -218,12 +218,12 @@ export async function finalize(): Promise<void> {
       // We default to those of the sendRequests, however, since willSendRequest
       // is not guaranteed to be present in the data for every request.
       let ts = sendRequest.ts;
-      let dur = Types.Timing.MicroSeconds(nextSendRequest.ts - sendRequest.ts);
+      let dur = Types.Timing.Micro(nextSendRequest.ts - sendRequest.ts);
       if (request.willSendRequests && request.willSendRequests[i] && request.willSendRequests[i + 1]) {
         const willSendRequest = request.willSendRequests[i];
         const nextWillSendRequest = request.willSendRequests[i + 1];
         ts = willSendRequest.ts;
-        dur = Types.Timing.MicroSeconds(nextWillSendRequest.ts - willSendRequest.ts);
+        dur = Types.Timing.Micro(nextWillSendRequest.ts - willSendRequest.ts);
       }
 
       redirects.push({
@@ -279,8 +279,8 @@ export async function finalize(): Promise<void> {
     // The time where the request started, which is either the first willSendRequest
     // event if there is one, or, if there is not, the sendRequest.
     const startTime = (request.willSendRequests && request.willSendRequests.length) ?
-        Types.Timing.MicroSeconds(request.willSendRequests[0].ts) :
-        Types.Timing.MicroSeconds(firstSendRequest.ts);
+        Types.Timing.Micro(request.willSendRequests[0].ts) :
+        Types.Timing.Micro(firstSendRequest.ts);
 
     // End redirect time
     // =======================
@@ -288,8 +288,8 @@ export async function finalize(): Promise<void> {
     // Here we note the time of the *last* willSendRequest / sendRequest event,
     // which is used later on in the calculations for time queueing etc.
     const endRedirectTime = (request.willSendRequests && request.willSendRequests.length) ?
-        Types.Timing.MicroSeconds(request.willSendRequests[request.willSendRequests.length - 1].ts) :
-        Types.Timing.MicroSeconds(finalSendRequest.ts);
+        Types.Timing.Micro(request.willSendRequests[request.willSendRequests.length - 1].ts) :
+        Types.Timing.Micro(finalSendRequest.ts);
 
     // Finish time and end time
     // =======================
@@ -300,25 +300,25 @@ export async function finalize(): Promise<void> {
     // The end time, then, will be slightly after the finish time.
     const endTime = request.resourceFinish ? request.resourceFinish.ts : endRedirectTime;
     const finishTime = request.resourceFinish?.args.data.finishTime ?
-        Types.Timing.MicroSeconds(request.resourceFinish.args.data.finishTime * SECONDS_TO_MICROSECONDS) :
-        Types.Timing.MicroSeconds(endTime);
+        Types.Timing.Micro(request.resourceFinish.args.data.finishTime * SECONDS_TO_MICROSECONDS) :
+        Types.Timing.Micro(endTime);
 
     // Network duration
     // =======================
     // Time spent on the network.
-    const networkDuration = Types.Timing.MicroSeconds(timing ? (finishTime || endRedirectTime) - endRedirectTime : 0);
+    const networkDuration = Types.Timing.Micro(timing ? (finishTime || endRedirectTime) - endRedirectTime : 0);
 
     // Processing duration
     // =======================
     // Time spent from start to end.
-    const processingDuration = Types.Timing.MicroSeconds(endTime - (finishTime || endTime));
+    const processingDuration = Types.Timing.Micro(endTime - (finishTime || endTime));
 
     // Redirection duration
     // =======================
     // Time between the first willSendRequest / sendRequest and last. This we place in *front* of the
     // queueing, since the queueing time that we know about from the trace data is only the last request,
     // i.e., the one that occurs after all the redirects.
-    const redirectionDuration = Types.Timing.MicroSeconds(endRedirectTime - startTime);
+    const redirectionDuration = Types.Timing.Micro(endRedirectTime - startTime);
 
     // Queueing
     // =======================
@@ -326,8 +326,7 @@ export async function finalize(): Promise<void> {
     // arg recorded in the receiveResponse event. In the cases where the recorded start time is larger
     // that the requestTime we set queueing time to zero.
     const queueingFromTraceData = timing ? timing.requestTime * SECONDS_TO_MICROSECONDS - endRedirectTime : 0;
-    const queueing =
-        Types.Timing.MicroSeconds(Platform.NumberUtilities.clamp(queueingFromTraceData, 0, Number.MAX_VALUE));
+    const queueing = Types.Timing.Micro(Platform.NumberUtilities.clamp(queueingFromTraceData, 0, Number.MAX_VALUE));
 
     // Stalled
     // =======================
@@ -336,19 +335,19 @@ export async function finalize(): Promise<void> {
     // Otherwise it is whichever positive number comes first from the following timing info:
     // DNS start, Connection start, Send Start, or the time duration between our start time and
     // receiving a response.
-    const stalled = timing ? Types.Timing.MicroSeconds(firstPositiveValueInList([
+    const stalled = timing ? Types.Timing.Micro(firstPositiveValueInList([
       timing.dnsStart * MILLISECONDS_TO_MICROSECONDS,
       timing.connectStart * MILLISECONDS_TO_MICROSECONDS,
       timing.sendStart * MILLISECONDS_TO_MICROSECONDS,
       (request.receiveResponse.ts - endRedirectTime),
     ])) :
-                             Types.Timing.MicroSeconds(request.receiveResponse.ts - startTime);
+                             Types.Timing.Micro(request.receiveResponse.ts - startTime);
 
     // Sending HTTP request
     // =======================
     // Time when the HTTP request is sent.
     const sendStartTime = timing ?
-        Types.Timing.MicroSeconds(
+        Types.Timing.Micro(
             timing.requestTime * SECONDS_TO_MICROSECONDS + timing.sendStart * MILLISECONDS_TO_MICROSECONDS) :
         startTime;
 
@@ -356,37 +355,36 @@ export async function finalize(): Promise<void> {
     // =======================
     // Time from when the send finished going to when the headers were received.
     const waiting = timing ?
-        Types.Timing.MicroSeconds((timing.receiveHeadersEnd - timing.sendEnd) * MILLISECONDS_TO_MICROSECONDS) :
-        Types.Timing.MicroSeconds(0);
+        Types.Timing.Micro((timing.receiveHeadersEnd - timing.sendEnd) * MILLISECONDS_TO_MICROSECONDS) :
+        Types.Timing.Micro(0);
 
     // Download
     // =======================
     // Time from receipt of headers to the finish time.
     const downloadStart = timing ?
-        Types.Timing.MicroSeconds(
+        Types.Timing.Micro(
             timing.requestTime * SECONDS_TO_MICROSECONDS + timing.receiveHeadersEnd * MILLISECONDS_TO_MICROSECONDS) :
         startTime;
-    const download = timing ? Types.Timing.MicroSeconds(((finishTime || downloadStart) - downloadStart)) :
-                              Types.Timing.MicroSeconds(endTime - request.receiveResponse.ts);
+    const download = timing ? Types.Timing.Micro(((finishTime || downloadStart) - downloadStart)) :
+                              Types.Timing.Micro(endTime - request.receiveResponse.ts);
 
-    const totalTime = Types.Timing.MicroSeconds(networkDuration + processingDuration);
+    const totalTime = Types.Timing.Micro(networkDuration + processingDuration);
 
     // Collect a few values from the timing info.
     // If the Network request is cached, these fields will be zero, so the minus will zero out them.
-    const dnsLookup = timing ?
-        Types.Timing.MicroSeconds((timing.dnsEnd - timing.dnsStart) * MILLISECONDS_TO_MICROSECONDS) :
-        Types.Timing.MicroSeconds(0);
-    const ssl = timing ? Types.Timing.MicroSeconds((timing.sslEnd - timing.sslStart) * MILLISECONDS_TO_MICROSECONDS) :
-                         Types.Timing.MicroSeconds(0);
+    const dnsLookup = timing ? Types.Timing.Micro((timing.dnsEnd - timing.dnsStart) * MILLISECONDS_TO_MICROSECONDS) :
+                               Types.Timing.Micro(0);
+    const ssl = timing ? Types.Timing.Micro((timing.sslEnd - timing.sslStart) * MILLISECONDS_TO_MICROSECONDS) :
+                         Types.Timing.Micro(0);
     const proxyNegotiation = timing ?
-        Types.Timing.MicroSeconds((timing.proxyEnd - timing.proxyStart) * MILLISECONDS_TO_MICROSECONDS) :
-        Types.Timing.MicroSeconds(0);
+        Types.Timing.Micro((timing.proxyEnd - timing.proxyStart) * MILLISECONDS_TO_MICROSECONDS) :
+        Types.Timing.Micro(0);
     const requestSent = timing ?
-        Types.Timing.MicroSeconds((timing.sendEnd - timing.sendStart) * MILLISECONDS_TO_MICROSECONDS) :
-        Types.Timing.MicroSeconds(0);
+        Types.Timing.Micro((timing.sendEnd - timing.sendStart) * MILLISECONDS_TO_MICROSECONDS) :
+        Types.Timing.Micro(0);
     const initialConnection = timing ?
-        Types.Timing.MicroSeconds((timing.connectEnd - timing.connectStart) * MILLISECONDS_TO_MICROSECONDS) :
-        Types.Timing.MicroSeconds(0);
+        Types.Timing.Micro((timing.connectEnd - timing.connectStart) * MILLISECONDS_TO_MICROSECONDS) :
+        Types.Timing.Micro(0);
 
     // Finally get some of the general data from the trace events.
     const {frame, url, renderBlocking} = finalSendRequest.args.data;
@@ -456,12 +454,12 @@ export async function finalize(): Promise<void> {
             },
           },
           cat: 'loading',
-          name: 'SyntheticNetworkRequest',
+          name: Types.Events.Name.SYNTHETIC_NETWORK_REQUEST,
           ph: Types.Events.Phase.COMPLETE,
-          dur: Types.Timing.MicroSeconds(endTime - startTime),
-          tdur: Types.Timing.MicroSeconds(endTime - startTime),
-          ts: Types.Timing.MicroSeconds(startTime),
-          tts: Types.Timing.MicroSeconds(startTime),
+          dur: Types.Timing.Micro(endTime - startTime),
+          tdur: Types.Timing.Micro(endTime - startTime),
+          ts: Types.Timing.Micro(startTime),
+          tts: Types.Timing.Micro(startTime),
           pid: finalSendRequest.pid,
           tid: finalSendRequest.tid,
         });
@@ -488,7 +486,7 @@ export async function finalize(): Promise<void> {
     requestsByTime.push(networkEvent);
     requestsById.set(networkEvent.args.data.requestId, networkEvent);
     // Update entity relationships for network events.
-    HandlerHelpers.updateEventForEntities(networkEvent, entityMappings);
+    HandlerHelpers.addEventToEntityMapping(networkEvent, entityMappings);
     const initiatorUrl = networkEvent.args.data.initiator?.url ||
         Helpers.Trace.getZeroIndexedStackTraceForEvent(networkEvent)?.at(0)?.url;
     if (initiatorUrl) {
@@ -566,7 +564,7 @@ function createSyntheticWebSocketConnection(
     cat: mainEvent.cat,
     ph: Types.Events.Phase.COMPLETE,
     ts: startTs,
-    dur: duration as Types.Timing.MicroSeconds,
+    dur: duration as Types.Timing.Micro,
     pid: mainEvent.pid,
     tid: mainEvent.tid,
     s: mainEvent.s,

package/front_end/models/trace/handlers/PageLoadMetricsHandler.test.ts

@@ -60,7 +60,7 @@ describeWithEnvironment('PageLoadMetricsHandler', function() {
       if (!pageLoadEventsForMainFrame) {
         assert.fail('Page load events for main frame were unexpectedly null.');
       }
-      // Single FCP event that occured after the refresh.
+      // Single FCP event that occurred after the refresh.
       assert.strictEqual(pageLoadEventsForMainFrame.size, 1);
       const scoresByMetricName = [...pageLoadEventsForMainFrame.values()];
       const fcpCount =
@@ -88,7 +88,7 @@ describeWithEnvironment('PageLoadMetricsHandler', function() {
       if (!pageLoadEventsForMainFrame) {
         assert.fail('Page load events for main frame were unexpectedly null.');
       }
-      // Single FCP event that occured after the refresh.
+      // Single FCP event that occurred after the refresh.
       assert.strictEqual(pageLoadEventsForMainFrame.size, 1);
       const events = pageLoadEventsForMainFrame.get(navigationId);
       const allFoundMetricScoresForMainFrame = events ? Array.from(events.values()) : [];

package/front_end/models/trace/handlers/PageLoadMetricsHandler.ts

@@ -90,7 +90,7 @@ function storePageLoadMetricAgainstNavigationId(
   }
 
   if (Types.Events.isFirstContentfulPaint(event)) {
-    const fcpTime = Types.Timing.MicroSeconds(event.ts - navigation.ts);
+    const fcpTime = Types.Timing.Micro(event.ts - navigation.ts);
     const classification = scoreClassificationForFirstContentfulPaint(fcpTime);
     const metricScore = {event, metricName: MetricName.FCP, classification, navigation, timing: fcpTime};
     storeMetricScore(frameId, navigationId, metricScore);
@@ -98,7 +98,7 @@ function storePageLoadMetricAgainstNavigationId(
   }
 
   if (Types.Events.isFirstPaint(event)) {
-    const paintTime = Types.Timing.MicroSeconds(event.ts - navigation.ts);
+    const paintTime = Types.Timing.Micro(event.ts - navigation.ts);
     const classification = ScoreClassification.UNCLASSIFIED;
     const metricScore = {event, metricName: MetricName.FP, classification, navigation, timing: paintTime};
     storeMetricScore(frameId, navigationId, metricScore);
@@ -106,7 +106,7 @@ function storePageLoadMetricAgainstNavigationId(
   }
 
   if (Types.Events.isMarkDOMContent(event)) {
-    const dclTime = Types.Timing.MicroSeconds(event.ts - navigation.ts);
+    const dclTime = Types.Timing.Micro(event.ts - navigation.ts);
     const metricScore = {
       event,
       metricName: MetricName.DCL,
@@ -119,7 +119,7 @@ function storePageLoadMetricAgainstNavigationId(
   }
 
   if (Types.Events.isInteractiveTime(event)) {
-    const ttiValue = Types.Timing.MicroSeconds(event.ts - navigation.ts);
+    const ttiValue = Types.Timing.Micro(event.ts - navigation.ts);
     const tti = {
       event,
       metricName: MetricName.TTI,
@@ -129,8 +129,7 @@ function storePageLoadMetricAgainstNavigationId(
     };
     storeMetricScore(frameId, navigationId, tti);
 
-    const tbtValue =
-        Helpers.Timing.millisecondsToMicroseconds(Types.Timing.MilliSeconds(event.args.args.total_blocking_time_ms));
+    const tbtValue = Helpers.Timing.milliToMicro(Types.Timing.Milli(event.args.args.total_blocking_time_ms));
     const tbt = {
       event,
       metricName: MetricName.TBT,
@@ -143,7 +142,7 @@ function storePageLoadMetricAgainstNavigationId(
   }
 
   if (Types.Events.isMarkLoad(event)) {
-    const loadTime = Types.Timing.MicroSeconds(event.ts - navigation.ts);
+    const loadTime = Types.Timing.Micro(event.ts - navigation.ts);
     const metricScore = {
       event,
       metricName: MetricName.L,
@@ -160,7 +159,7 @@ function storePageLoadMetricAgainstNavigationId(
     if (!candidateIndex) {
       throw new Error('Largest Contenful Paint unexpectedly had no candidateIndex.');
     }
-    const lcpTime = Types.Timing.MicroSeconds(event.ts - navigation.ts);
+    const lcpTime = Types.Timing.Micro(event.ts - navigation.ts);
     const lcp = {
       event,
       metricName: MetricName.LCP,
@@ -263,10 +262,10 @@ function getNavigationForPageLoadEvent(event: Types.Events.PageLoadEvent): Types
  * Classifications sourced from
  * https://web.dev/fcp/
  */
-export function scoreClassificationForFirstContentfulPaint(fcpScoreInMicroseconds: Types.Timing.MicroSeconds):
+export function scoreClassificationForFirstContentfulPaint(fcpScoreInMicroseconds: Types.Timing.Micro):
     ScoreClassification {
-  const FCP_GOOD_TIMING = Helpers.Timing.secondsToMicroseconds(Types.Timing.Seconds(1.8));
-  const FCP_MEDIUM_TIMING = Helpers.Timing.secondsToMicroseconds(Types.Timing.Seconds(3.0));
+  const FCP_GOOD_TIMING = Helpers.Timing.secondsToMicro(Types.Timing.Seconds(1.8));
+  const FCP_MEDIUM_TIMING = Helpers.Timing.secondsToMicro(Types.Timing.Seconds(3.0));
   let scoreClassification = ScoreClassification.BAD;
   if (fcpScoreInMicroseconds <= FCP_MEDIUM_TIMING) {
     scoreClassification = ScoreClassification.OK;
@@ -282,10 +281,10 @@ export function scoreClassificationForFirstContentfulPaint(fcpScoreInMicrosecond
  * https://web.dev/interactive/#how-lighthouse-determines-your-tti-score
  */
 
-export function scoreClassificationForTimeToInteractive(ttiTimeInMicroseconds: Types.Timing.MicroSeconds):
+export function scoreClassificationForTimeToInteractive(ttiTimeInMicroseconds: Types.Timing.Micro):
     ScoreClassification {
-  const TTI_GOOD_TIMING = Helpers.Timing.secondsToMicroseconds(Types.Timing.Seconds(3.8));
-  const TTI_MEDIUM_TIMING = Helpers.Timing.secondsToMicroseconds(Types.Timing.Seconds(7.3));
+  const TTI_GOOD_TIMING = Helpers.Timing.secondsToMicro(Types.Timing.Seconds(3.8));
+  const TTI_MEDIUM_TIMING = Helpers.Timing.secondsToMicro(Types.Timing.Seconds(7.3));
   let scoreClassification = ScoreClassification.BAD;
   if (ttiTimeInMicroseconds <= TTI_MEDIUM_TIMING) {
     scoreClassification = ScoreClassification.OK;
@@ -301,10 +300,10 @@ export function scoreClassificationForTimeToInteractive(ttiTimeInMicroseconds: T
  * https://web.dev/lcp/#what-is-lcp
  */
 
-export function scoreClassificationForLargestContentfulPaint(lcpTimeInMicroseconds: Types.Timing.MicroSeconds):
+export function scoreClassificationForLargestContentfulPaint(lcpTimeInMicroseconds: Types.Timing.Micro):
     ScoreClassification {
-  const LCP_GOOD_TIMING = Helpers.Timing.secondsToMicroseconds(Types.Timing.Seconds(2.5));
-  const LCP_MEDIUM_TIMING = Helpers.Timing.secondsToMicroseconds(Types.Timing.Seconds(4));
+  const LCP_GOOD_TIMING = Helpers.Timing.secondsToMicro(Types.Timing.Seconds(2.5));
+  const LCP_MEDIUM_TIMING = Helpers.Timing.secondsToMicro(Types.Timing.Seconds(4));
   let scoreClassification = ScoreClassification.BAD;
   if (lcpTimeInMicroseconds <= LCP_MEDIUM_TIMING) {
     scoreClassification = ScoreClassification.OK;
@@ -318,7 +317,7 @@ export function scoreClassificationForLargestContentfulPaint(lcpTimeInMicrosecon
 /**
  * DCL does not have a classification.
  */
-export function scoreClassificationForDOMContentLoaded(_dclTimeInMicroseconds: Types.Timing.MicroSeconds):
+export function scoreClassificationForDOMContentLoaded(_dclTimeInMicroseconds: Types.Timing.Micro):
     ScoreClassification {
   return ScoreClassification.UNCLASSIFIED;
 }
@@ -328,10 +327,10 @@ export function scoreClassificationForDOMContentLoaded(_dclTimeInMicroseconds: T
  * https://web.dev/lighthouse-total-blocking-#time/
  */
 
-export function scoreClassificationForTotalBlockingTime(tbtTimeInMicroseconds: Types.Timing.MicroSeconds):
+export function scoreClassificationForTotalBlockingTime(tbtTimeInMicroseconds: Types.Timing.Micro):
     ScoreClassification {
-  const TBT_GOOD_TIMING = Helpers.Timing.millisecondsToMicroseconds(Types.Timing.MilliSeconds(200));
-  const TBT_MEDIUM_TIMING = Helpers.Timing.millisecondsToMicroseconds(Types.Timing.MilliSeconds(600));
+  const TBT_GOOD_TIMING = Helpers.Timing.milliToMicro(Types.Timing.Milli(200));
+  const TBT_MEDIUM_TIMING = Helpers.Timing.milliToMicro(Types.Timing.Milli(600));
   let scoreClassification = ScoreClassification.BAD;
   if (tbtTimeInMicroseconds <= TBT_MEDIUM_TIMING) {
     scoreClassification = ScoreClassification.OK;
@@ -384,20 +383,20 @@ export async function finalize(): Promise<void> {
       markerEvents.filter(event => getFrameIdForPageLoadEvent(event) === mainFrame).sort((a, b) => a.ts - b.ts);
 }
 
-export type PageLoadMetricsData = {
+export interface PageLoadMetricsData {
   /**
    * This represents the metric scores for all navigations, for all frames in a trace.
    * Given a frame id, the map points to another map from navigation id to metric scores.
    * The metric scores include the event related to the metric as well as the data regarding
    * the score itself.
    */
-  metricScoresByFrameId: Map<string, Map<string, Map<MetricName, MetricScore>>>,
+  metricScoresByFrameId: Map<string, Map<string, Map<MetricName, MetricScore>>>;
   /**
    * Page load events with no associated duration that happened in the
    * main frame.
    */
-  allMarkerEvents: Types.Events.PageLoadEvent[],
-};
+  allMarkerEvents: Types.Events.PageLoadEvent[];
+}
 
 export function data(): PageLoadMetricsData {
   return {
@@ -443,8 +442,8 @@ export interface MetricScore {
   metricName: MetricName;
   classification: ScoreClassification;
   event?: Types.Events.PageLoadEvent;
-  // The last navigation that occured before this metric score.
+  // The last navigation that occurred before this metric score.
   navigation?: Types.Events.NavigationStart;
   estimated?: boolean;
-  timing: Types.Timing.MicroSeconds;
+  timing: Types.Timing.Micro;
 }

package/front_end/models/trace/handlers/RendererHandler.ts

@@ -200,7 +200,7 @@ export function assignOrigin(
           try {
             new URL(processInfo.frame.url);
             process.url = processInfo.frame.url;
-          } catch (e) {
+          } catch {
             process.url = null;
           }
         }
@@ -248,7 +248,7 @@ export function assignThreadName(
 /**
  * Removes unneeded trace data opportunistically stored while handling events.
  * This currently does the following:
- *  - Deletes processes with an unkonwn origin.
+ *  - Deletes processes with an unknown origin.
  */
 export function sanitizeProcesses(processes: Map<Types.Events.ProcessID, RendererProcess>): void {
   const auctionWorklets = auctionWorkletsData().worklets;
@@ -356,7 +356,7 @@ export function buildHierarchy(
       // Update the entryToNode map with the entries from this thread
       for (const [entry, node] of treeData.entryToNode) {
         entryToNode.set(entry, node);
-        HandlerHelpers.updateEventForEntities(entry, entityMappings);
+        HandlerHelpers.addEventToEntityMapping(entry, entityMappings);
       }
     }
   }
@@ -378,7 +378,7 @@ export function makeCompleteEvent(event: Types.Events.Begin|Types.Events.End): T
     }
     // Update the begin event's duration using the timestamp of the end
     // event.
-    beginEvent.dur = Types.Timing.MicroSeconds(event.ts - beginEvent.ts);
+    beginEvent.dur = Types.Timing.Micro(event.ts - beginEvent.ts);
     return null;
   }
 
@@ -387,7 +387,7 @@ export function makeCompleteEvent(event: Types.Events.Begin|Types.Events.End): T
   const syntheticComplete: Types.Events.SyntheticComplete = {
     ...event,
     ph: Types.Events.Phase.COMPLETE,
-    dur: Types.Timing.MicroSeconds(0),
+    dur: Types.Timing.Micro(0),
   };
 
   completeEventStack.push(syntheticComplete);