Upstream some simple trace_engine package fixes

These were the only simple changes from the trace engine branch[1].

[1] main...paulirish:devtools-frontend:trace-engine-lib

Bug: none
Change-Id: I6faa74726725ef42f8b8488d7cc645a4136c2ed4
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6897347
Reviewed-by: Paul Irish <[email protected]>
Auto-Submit: Connor Clark <[email protected]>
Commit-Queue: Connor Clark <[email protected]>
Commit-Queue: Paul Irish <[email protected]>

Author: Connor Clark

front_end/models/trace/ModelImpl.ts

@@ -118,7 +118,8 @@ export class Model extends EventTarget {
         metadata,
         resolveSourceMap: config?.resolveSourceMap,
       };
-      if (window.location.href.includes('devtools/bundled') || window.location.search.includes('debugFrontend')) {
+      if (!parseConfig.logger &&
+          (window.location.href.includes('devtools/bundled') || window.location.search.includes('debugFrontend'))) {
         // Someone is debugging DevTools, enable the logger.
         const times: Record<string, number> = {};
         parseConfig.logger = {

front_end/models/trace/handlers/PageLoadMetricsHandler.ts

@@ -159,7 +159,7 @@ function storePageLoadMetricAgainstNavigationId(
   if (Types.Events.isLargestContentfulPaintCandidate(event)) {
     const candidateIndex = event.args.data?.candidateIndex;
     if (!candidateIndex) {
-      throw new Error('Largest Contenful Paint unexpectedly had no candidateIndex.');
+      throw new Error('Largest Contentful Paint unexpectedly had no candidateIndex.');
     }
     const lcpTime = Types.Timing.Micro(event.ts - navigation.ts);
     const lcp = {