chrome-devtools-frontend 1.0.947377 → 1.0.948295

package/front_end/core/root/Runtime.ts

@@ -7,9 +7,6 @@ const originalAssert = console.assert;
 
 const queryParamsObject = new URLSearchParams(location.search);
 
-// The following variable are initialized all the way at the bottom of this file
-let importScriptPathPrefix: string;
-
 let runtimePlatform = '';
 
 let runtimeInstance: Runtime|undefined;
@@ -32,62 +29,16 @@ export function getRemoteBase(location: string = self.location.toString()): {
   return {base: `${url.origin}/remote/serve_file/${version[1]}/`, version: version[1]};
 }
 
-export const mappingForLayoutTests = new Map<string, string>([
-  ['panels/animation', 'animation'],
-  ['panels/browser_debugger', 'browser_debugger'],
-  ['panels/changes', 'changes'],
-  ['panels/console', 'console'],
-  ['panels/elements', 'elements'],
-  ['panels/emulation', 'emulation'],
-  ['panels/mobile_throttling', 'mobile_throttling'],
-  ['panels/network', 'network'],
-  ['panels/profiler', 'profiler'],
-  ['panels/application', 'resources'],
-  ['panels/search', 'search'],
-  ['panels/sources', 'sources'],
-  ['panels/snippets', 'snippets'],
-  ['panels/settings', 'settings'],
-  ['panels/timeline', 'timeline'],
-  ['panels/web_audio', 'web_audio'],
-  ['models/persistence', 'persistence'],
-  ['models/workspace_diff', 'workspace_diff'],
-  ['entrypoints/main', 'main'],
-  ['third_party/diff', 'diff'],
-  ['ui/legacy/components/inline_editor', 'inline_editor'],
-  ['ui/legacy/components/data_grid', 'data_grid'],
-  ['ui/legacy/components/perf_ui', 'perf_ui'],
-  ['ui/legacy/components/source_frame', 'source_frame'],
-  ['ui/legacy/components/color_picker', 'color_picker'],
-  ['ui/legacy/components/cookie_table', 'cookie_table'],
-  ['ui/legacy/components/quick_open', 'quick_open'],
-  ['ui/legacy/components/utils', 'components'],
-]);
-
 export class Runtime {
-  readonly #modules: Module[];
-  modulesMap: {
-    [x: string]: Module,
-  };
-  private constructor(descriptors: ModuleDescriptor[]) {
-    this.#modules = [];
-    this.modulesMap = {};
-
-    for (const descriptor of descriptors) {
-      this.registerModule(descriptor);
-    }
+  private constructor() {
   }
 
   static instance(opts: {
     forceNew: boolean|null,
-    moduleDescriptors: Array<ModuleDescriptor>|null,
-  }|undefined = {forceNew: null, moduleDescriptors: null}): Runtime {
-    const {forceNew, moduleDescriptors} = opts;
+  }|undefined = {forceNew: null}): Runtime {
+    const {forceNew} = opts;
     if (!runtimeInstance || forceNew) {
-      if (!moduleDescriptors) {
-        throw new Error(`Unable to create runtime: moduleDescriptors must be provided: ${new Error().stack}`);
-      }
-
-      runtimeInstance = new Runtime(moduleDescriptors);
+      runtimeInstance = new Runtime();
     }
 
     return runtimeInstance;
@@ -198,51 +149,11 @@ export class Runtime {
     return '\n/*# sourceURL=' + sourceURL + ' */';
   }
 
-  module(moduleName: string): Module {
-    return this.modulesMap[moduleName];
-  }
-
-  private registerModule(descriptor: ModuleDescriptor): void {
-    const module = new Module(this, descriptor);
-    this.#modules.push(module);
-    this.modulesMap[descriptor['name']] = module;
-    const mappedName = mappingForLayoutTests.get(descriptor['name']);
-    if (mappedName !== undefined) {
-      this.modulesMap[mappedName] = module;
-    }
-  }
-
-  loadModulePromise(moduleName: string): Promise<boolean> {
-    return this.modulesMap[moduleName].loadPromise();
-  }
-
-  loadAutoStartModules(moduleNames: string[]): Promise<boolean[]> {
-    const promises = [];
-    for (const moduleName of moduleNames) {
-      promises.push(this.loadModulePromise(moduleName));
-    }
-    return Promise.all(promises);
-  }
-
-  getModulesMap(): {[x: string]: Module} {
-    return this.modulesMap;
-  }
-
   loadLegacyModule(modulePath: string): Promise<void> {
     return import(`../../${modulePath}`);
   }
 }
 
-export class ModuleDescriptor {
-  name!: string;
-  dependencies!: string[]|undefined;
-  modules!: string[];
-  resources!: string[];
-  condition!: string|undefined;
-  experiment!: string|null;
-  constructor() {
-  }
-}
 export interface Option {
   title: string;
   value: string|boolean;
@@ -250,92 +161,6 @@ export interface Option {
   text?: string;
 }
 
-function computeContainingFolderName(name: string): string {
-  if (name.includes('/')) {
-    return name.substring(name.lastIndexOf('/') + 1, name.length);
-  }
-  return name;
-}
-
-export class Module {
-  readonly #manager: Runtime;
-  readonly descriptor: ModuleDescriptor;
-  readonly #nameInternal: string;
-  #loadedForTest: boolean;
-  #pendingLoadPromise?: Promise<boolean>;
-  constructor(manager: Runtime, descriptor: ModuleDescriptor) {
-    this.#manager = manager;
-    this.descriptor = descriptor;
-    this.#nameInternal = descriptor.name;
-    this.#loadedForTest = false;
-  }
-
-  name(): string {
-    return this.#nameInternal;
-  }
-
-  enabled(): boolean {
-    return Runtime.isDescriptorEnabled(this.descriptor);
-  }
-
-  resource(name: string): string {
-    const fullName = this.#nameInternal + '/' + name;
-    const content = cachedResources.get(fullName);
-    if (!content) {
-      throw new Error(fullName + ' not preloaded. Check module.json');
-    }
-    return content;
-  }
-
-  loadPromise(): Promise<boolean> {
-    if (!this.enabled()) {
-      return Promise.reject(new Error('Module ' + this.#nameInternal + ' is not enabled'));
-    }
-
-    if (this.#pendingLoadPromise) {
-      return this.#pendingLoadPromise;
-    }
-
-    const dependencies = this.descriptor.dependencies;
-    const dependencyPromises = [];
-    for (let i = 0; dependencies && i < dependencies.length; ++i) {
-      dependencyPromises.push(this.#manager.getModulesMap()[dependencies[i]].loadPromise());
-    }
-
-    this.#pendingLoadPromise = Promise.all(dependencyPromises).then(this.loadModules.bind(this)).then(() => {
-      this.#loadedForTest = true;
-      return this.#loadedForTest;
-    });
-
-    return this.#pendingLoadPromise;
-  }
-
-  private async loadModules(): Promise<void> {
-    const containingFolderName = computeContainingFolderName(this.#nameInternal);
-
-    const moduleFileName = `${containingFolderName}_module.js`;
-    const entrypointFileName = `${containingFolderName}.js`;
-
-    // If a module has resources, they are part of the `_module.js` files that are generated
-    // by `build_release_applications`. These need to be loaded before any other code is
-    // loaded, to make sure that the resource content is properly cached in `cachedResources`.
-    if (this.descriptor.modules && this.descriptor.modules.includes(moduleFileName)) {
-      await import(`../../${this.#nameInternal}/${moduleFileName}`);
-    }
-
-    await import(`../../${this.#nameInternal}/${entrypointFileName}`);
-  }
-
-  private modularizeURL(resourceName: string): string {
-    return Runtime.normalizePath(this.#nameInternal + '/' + resourceName);
-  }
-
-  fetchResource(resourceName: string): Promise<string> {
-    const sourceURL = getResourceURL(this.modularizeURL(resourceName));
-    return loadResourcePromise(sourceURL);
-  }
-}
-
 export class ExperimentsSupport {
   #experiments: Experiment[];
   #experimentNames: Set<string>;
@@ -509,37 +334,9 @@ export function loadResourcePromise(url: string): Promise<string> {
   }
 }
 
-function getResourceURL(scriptName: string, base?: string): string {
-  const sourceURL = (base || importScriptPathPrefix) + scriptName;
-  const schemaIndex = sourceURL.indexOf('://') + 3;
-  let pathIndex = sourceURL.indexOf('/', schemaIndex);
-  if (pathIndex === -1) {
-    pathIndex = sourceURL.length;
-  }
-  return sourceURL.substring(0, pathIndex) + Runtime.normalizePath(sourceURL.substring(pathIndex));
-}
-
-(function(): void {
-const baseUrl = self.location ? self.location.origin + self.location.pathname : '';
-importScriptPathPrefix = baseUrl.substring(0, baseUrl.lastIndexOf('/') + 1);
-})();
-
 // This must be constructed after the query parameters have been parsed.
 export const experiments = new ExperimentsSupport();
 
-export const cachedResources = new Map<string, string>();
-
-// Only exported for LightHouse, which uses it in `report-generator.js`.
-// Do not use this global in DevTools' implementation.
-// TODO(crbug.com/1127292): remove this global
-// @ts-ignore
-globalThis.EXPORTED_CACHED_RESOURCES_ONLY_FOR_LIGHTHOUSE = cachedResources;
-
-export let appStartedPromiseCallback: () => void;
-export const appStarted = new Promise<void>(fulfill => {
-  appStartedPromiseCallback = fulfill;
-});
-
 // TODO(crbug.com/1167717): Make this a const enum again
 // eslint-disable-next-line rulesdir/const_enum
 export enum ExperimentName {

package/front_end/core/sdk/Cookie.ts

@@ -263,24 +263,3 @@ export enum Attributes {
   Priority = 'priority',
   PartitionKey = 'partitionKey',
 }
-
-/**
- * A `CookieReference` uniquely identifies a cookie by the triple (#name,domain,#path). Additionally, a context may be
- * included to make it clear which site under Application>Cookies should be opened when revealing a `CookieReference`.
- */
-export class CookieReference {
-  readonly #domainInternal: string;
-  readonly #contextUrlInternal: string|undefined;
-  constructor(_name: string, domain: string, _path: string, contextUrl: string|undefined) {
-    this.#domainInternal = domain;
-    this.#contextUrlInternal = contextUrl;
-  }
-
-  domain(): string {
-    return this.#domainInternal;
-  }
-
-  contextUrl(): string|undefined {
-    return this.#contextUrlInternal;
-  }
-}

package/front_end/core/sdk/sdk-legacy.ts

@@ -73,9 +73,6 @@ SDK.ConsoleMessage.FrontendMessageSource = SDKModule.ConsoleModel.FrontendMessag
 /** @constructor */
 SDK.Cookie = SDKModule.Cookie.Cookie;
 
-/** @constructor */
-SDK.CookieReference = SDKModule.Cookie.CookieReference;
-
 /** @constructor */
 SDK.CookieParser = SDKModule.CookieParser.CookieParser;
 

package/front_end/entrypoints/devtools_app/{devtools_app-meta-files.ts → devtools_app.ts}

@@ -1,7 +1,7 @@
-// Copyright 2021 The Chromium Authors. All rights reserved.
+// Copyright 2018 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-
+import '../shell/shell.js';
 import '../../panels/css_overview/css_overview-meta.js';
 import '../../panels/elements/elements-meta.js';
 import '../../panels/browser_debugger/browser_debugger-meta.js';
@@ -25,3 +25,10 @@ import '../../panels/timeline/timeline-meta.js';
 import '../../panels/web_audio/web_audio-meta.js';
 import '../../panels/webauthn/webauthn-meta.js';
 import '../../panels/layer_viewer/layer_viewer-meta.js';
+
+import * as Root from '../../core/root/root.js';
+import * as Main from '../main/main.js';
+
+// @ts-ignore Exposed for legacy layout tests
+self.runtime = Root.Runtime.Runtime.instance({forceNew: true});
+new Main.MainImpl.MainImpl();

package/front_end/entrypoints/heap_snapshot_worker/HeapSnapshot.ts

@@ -909,7 +909,8 @@ export abstract class HeapSnapshot {
       return matchedStringIndexes;
     }
 
-    const regexp = searchConfig.isRegex ? new RegExp(query) : createPlainTextSearchRegex(query, 'i');
+    const regexp =
+        searchConfig.isRegex ? new RegExp(query) : Platform.StringUtilities.createPlainTextSearchRegex(query, 'i');
 
     function filterRegexp(matchedStringIndexes: Set<number>, string: string, index: number): Set<number> {
       if (regexp.test(string)) {

package/front_end/entrypoints/js_app/{JsMain.ts → js_app.ts}

@@ -1,12 +1,15 @@
 // Copyright 2018 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+import '../shell/shell.js';
+import '../../panels/js_profiler/js_profiler-meta.js';
 
 import * as Common from '../../core/common/common.js';
 import * as Host from '../../core/host/host.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as Components from '../../ui/legacy/components/utils/utils.js';
+import * as Main from '../main/main.js';
 
 const UIStrings = {
   /**
@@ -15,7 +18,7 @@ const UIStrings = {
   main: 'Main',
 };
 
-const str_ = i18n.i18n.registerUIStrings('entrypoints/js_app/JsMain.ts', UIStrings);
+const str_ = i18n.i18n.registerUIStrings('entrypoints/js_app/js_app.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 
 let jsMainImplInstance: JsMainImpl;
@@ -41,3 +44,4 @@ export class JsMainImpl implements Common.Runnable.Runnable {
 }
 
 Common.Runnable.registerEarlyInitializationRunnable(JsMainImpl.instance);
+new Main.MainImpl.MainImpl();

package/front_end/entrypoints/main/MainImpl.ts

@@ -139,7 +139,6 @@ export class MainImpl {
 
   private async loaded(): Promise<void> {
     console.timeStamp('Main._loaded');
-    await Root.Runtime.appStarted;
     Root.Runtime.Runtime.setPlatform(Host.Platform.platform());
     const prefs = await new Promise<{[key: string]: string}>(resolve => {
       Host.InspectorFrontendHost.InspectorFrontendHostInstance.getPreferences(resolve);

package/front_end/entrypoints/ndb_app/{ndb_app.js → ndb_app.ts}

@@ -4,7 +4,5 @@
 import '../shell/shell.js';
 
 import * as Main from '../main/main.js';
-import * as Startup from '../startup/startup.js';
 
 new Main.MainImpl.MainImpl();
-Startup.RuntimeInstantiator.startApplication('ndb_app');

package/front_end/entrypoints/node_app/node_app.ts

@@ -73,9 +73,7 @@ UI.ViewManager.registerViewExtension({
   },
 });
 
-const runtimeInstance = Root.Runtime.Runtime.instance({forceNew: true, moduleDescriptors: []});
 // @ts-ignore Exposed for legacy layout tests
-self.runtime = runtimeInstance;
+self.runtime = Root.Runtime.Runtime.instance({forceNew: true});
 Common.Runnable.registerEarlyInitializationRunnable(NodeMainImpl.instance);
 new Main.MainImpl.MainImpl();
-Root.Runtime.appStartedPromiseCallback();

package/front_end/entrypoints/shell/{shell.js → shell.ts}

@@ -3,9 +3,7 @@
 // found in the LICENSE file.
 
 import '../../Images/Images.js';
-import '../startup/startup.js';
 import '../../core/root/root-legacy.js';
-import '../../core/platform/platform.js';
 import '../../core/dom_extension/dom_extension.js';
 
 import '../../panels/sources/sources-meta.js';

package/front_end/entrypoints/worker_app/worker_app.ts

@@ -17,8 +17,6 @@ import './WorkerMain.js';
 import * as Root from '../../core/root/root.js';
 import * as Main from '../main/main.js';
 
-const runtimeInstance = Root.Runtime.Runtime.instance({forceNew: true, moduleDescriptors: []});
 // @ts-ignore Exposed for legacy layout tests
-self.runtime = runtimeInstance;
+self.runtime = Root.Runtime.Runtime.instance({forceNew: true});
 new Main.MainImpl.MainImpl();
-Root.Runtime.appStartedPromiseCallback();

package/front_end/legacy/legacy-defs.d.ts

@@ -1,9 +1,6 @@
 // Copyright 2020 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-interface StringConstructor {
-  sprintf(format: string, ...var_arg: any): string;
-}
 
 interface Window {
   UI: {themeSupport: unknown}
@@ -124,7 +121,6 @@ interface Node {
 
 declare function isEnterOrSpaceKey(event: Event): boolean;
 declare function isEscKey(event: Event): boolean;
-declare function createPlainTextSearchRegex(query: string, flags?: string): RegExp;
 declare function onInvokeElement(element: Element, callback: (event: Event) => void): void;
 
 interface ServicePort {

package/front_end/legacy_test_runner/test_runner/TestRunner.js

@@ -23,6 +23,10 @@ self.Platform = self.Platform || {};
 self.Platform.StringUtilities = Platform.StringUtilities;
 self.Platform.MapUtilities = Platform.MapUtilities;
 self.Platform.ArrayUtilities = Platform.ArrayUtilities;
+self.createPlainTextSearchRegex = Platform.StringUtilities.createPlainTextSearchRegex;
+String.sprintf = Platform.StringUtilities.sprintf;
+String.regexSpecialCharacters = Platform.StringUtilities.regexSpecialCharacters;
+String.caseInsensetiveComparator = Platform.StringUtilities.caseInsensetiveComparator;
 
 /**
  * @return {boolean}
@@ -229,23 +233,36 @@ export function addSnifferPromise(receiver, methodName) {
   });
 }
 
-/** @type {function():void} */
-let _resolveOnFinishInits;
-
-/**
- * @param {string} module
- * @return {!Promise<undefined>}
- */
-export async function loadModule(module) {
-  const promise = new Promise(resolve => {
-    _resolveOnFinishInits = resolve;
-  });
-  await self.runtime.loadModulePromise(module);
-  if (!_pendingInits) {
-    return;
-  }
-  return promise;
-}
+const mappingForLayoutTests = new Map([
+  ['panels/animation', 'animation'],
+  ['panels/browser_debugger', 'browser_debugger'],
+  ['panels/changes', 'changes'],
+  ['panels/console', 'console'],
+  ['panels/elements', 'elements'],
+  ['panels/emulation', 'emulation'],
+  ['panels/mobile_throttling', 'mobile_throttling'],
+  ['panels/network', 'network'],
+  ['panels/profiler', 'profiler'],
+  ['panels/application', 'resources'],
+  ['panels/search', 'search'],
+  ['panels/sources', 'sources'],
+  ['panels/snippets', 'snippets'],
+  ['panels/settings', 'settings'],
+  ['panels/timeline', 'timeline'],
+  ['panels/web_audio', 'web_audio'],
+  ['models/persistence', 'persistence'],
+  ['models/workspace_diff', 'workspace_diff'],
+  ['entrypoints/main', 'main'],
+  ['third_party/diff', 'diff'],
+  ['ui/legacy/components/inline_editor', 'inline_editor'],
+  ['ui/legacy/components/data_grid', 'data_grid'],
+  ['ui/legacy/components/perf_ui', 'perf_ui'],
+  ['ui/legacy/components/source_frame', 'source_frame'],
+  ['ui/legacy/components/color_picker', 'color_picker'],
+  ['ui/legacy/components/cookie_table', 'cookie_table'],
+  ['ui/legacy/components/quick_open', 'quick_open'],
+  ['ui/legacy/components/utils', 'components'],
+]);
 
 /**
  * @param {string} module
@@ -253,7 +270,7 @@ export async function loadModule(module) {
  */
 export async function loadLegacyModule(module) {
   let containingFolder = module;
-  for (const [remappedFolder, originalFolder] of Root.Runtime.mappingForLayoutTests.entries()) {
+  for (const [remappedFolder, originalFolder] of mappingForLayoutTests.entries()) {
     if (originalFolder === module) {
       containingFolder = remappedFolder;
     }
@@ -667,9 +684,6 @@ export function addIframe(path, options = {}) {
   `);
 }
 
-/** @type {number} */
-let _pendingInits = 0;
-
 /**
  * The old test framework executed certain snippets in the inspected page
  * context as part of loading a test helper file.
@@ -685,12 +699,7 @@ let _pendingInits = 0;
  * @param {string} code
  */
 export async function deprecatedInitAsync(code) {
-  _pendingInits++;
   await TestRunner.RuntimeAgent.invoke_evaluate({expression: code, objectGroup: 'console'});
-  _pendingInits--;
-  if (!_pendingInits && _resolveOnFinishInits !== undefined) {
-    _resolveOnFinishInits();
-  }
 }
 
 /**
@@ -1290,36 +1299,6 @@ export class MockSetting {
   }
 }
 
-/**
- * @return {!Array<!Root.Runtime.Module>}
- */
-export function loadedModules() {
-  return self.runtime.modules.filter(module => module.loadedForTest)
-      .filter(module => module.name() !== 'help')
-      .filter(module => module.name().indexOf('test_runner') === -1);
-}
-
-/**
- * @param {!Array<!Root.Runtime.Module>} relativeTo
- * @return {!Array<!Root.Runtime.Module>}
- */
-export function dumpLoadedModules(relativeTo) {
-  const previous = new Set(relativeTo || []);
-  function moduleSorter(left, right) {
-    return Platform.StringUtilities.naturalOrderComparator(left.descriptor.name, right.descriptor.name);
-  }
-
-  addResult('Loaded modules:');
-  const sortedLoadedModules = loadedModules().sort(moduleSorter);
-  for (const module of sortedLoadedModules) {
-    if (previous.has(module)) {
-      continue;
-    }
-    addResult('    ' + module.descriptor.name);
-  }
-  return sortedLoadedModules;
-}
-
 /**
  * @param {string} urlSuffix
  * @param {!Workspace.Workspace.projectTypes=} projectType
@@ -1511,13 +1490,10 @@ TestRunner.override = override;
 TestRunner.clearSpecificInfoFromStackFrames = clearSpecificInfoFromStackFrames;
 TestRunner.hideInspectorView = hideInspectorView;
 TestRunner.mainFrame = mainFrame;
-TestRunner.loadedModules = loadedModules;
-TestRunner.dumpLoadedModules = dumpLoadedModules;
 TestRunner.waitForUISourceCode = waitForUISourceCode;
 TestRunner.waitForUISourceCodeRemoved = waitForUISourceCodeRemoved;
 TestRunner.url = url;
 TestRunner.dumpSyntaxHighlight = dumpSyntaxHighlight;
-TestRunner.loadModule = loadModule;
 TestRunner.loadLegacyModule = loadLegacyModule;
 TestRunner.loadTestModule = loadTestModule;
 TestRunner.evaluateInPageRemoteObject = evaluateInPageRemoteObject;

package/front_end/models/issues_manager/CorsIssue.ts

@@ -13,7 +13,7 @@ const UIStrings = {
   /**
   *@description Label for the link for CORS private network issues
   */
-  corsForPrivateNetworksRfc: 'CORS for private networks (RFC1918)',
+  corsPrivateNetworkAccess: 'Private Network Access',
   /**
   *@description Label for the link for CORS network issues
   */
@@ -26,7 +26,6 @@ const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 // eslint-disable-next-line rulesdir/const_enum
 export enum IssueCode {
   InsecurePrivateNetwork = 'CorsIssue::InsecurePrivateNetwork',
-  InsecurePrivateNetworkPreflight = 'CorsIssue::InsecurePrivateNetworkPreflight',
   InvalidHeaderValues = 'CorsIssue::InvalidHeaders',
   WildcardOriginNotAllowed = 'CorsIssue::WildcardOriginWithCredentials',
   PreflightResponseInvalid = 'CorsIssue::PreflightResponseInvalid',
@@ -37,14 +36,15 @@ export enum IssueCode {
   RedirectContainsCredentials = 'CorsIssue::RedirectContainsCredentials',
   DisallowedByMode = 'CorsIssue::DisallowedByMode',
   CorsDisabledScheme = 'CorsIssue::CorsDisabledScheme',
+  // TODO(https://crbug.com/1263483): Remove this once it's removed from CDP.
   PreflightMissingAllowExternal = 'CorsIssue::PreflightMissingAllowExternal',
+  // TODO(https://crbug.com/1263483): Remove this once it's removed from CDP.
   PreflightInvalidAllowExternal = 'CorsIssue::PreflightInvalidAllowExternal',
   InvalidResponse = 'CorsIssue::InvalidResponse',
   NoCorsRedirectModeNotFollow = 'CorsIssue::NoCorsRedirectModeNotFollow',
   InvalidPrivateNetworkAccess = 'CorsIssue::InvalidPrivateNetworkAccess',
   UnexpectedPrivateNetworkAccess = 'CorsIssue::UnexpectedPrivateNetworkAccess',
-  PreflightMissingAllowPrivateNetwork = 'CorsIssue::PreflightMissingAllowPrivateNetwork',
-  PreflightInvalidAllowPrivateNetwork = 'CorsIssue::PreflightInvalidAllowPrivateNetwork',
+  PreflightAllowPrivateNetworkError = 'CorsIssue::PreflightAllowPrivateNetworkError',
 }
 
 function getIssueCode(details: Protocol.Audits.CorsIssueDetails): IssueCode {
@@ -87,8 +87,7 @@ function getIssueCode(details: Protocol.Audits.CorsIssueDetails): IssueCode {
     case Protocol.Network.CorsError.InvalidResponse:
       return IssueCode.InvalidResponse;
     case Protocol.Network.CorsError.InsecurePrivateNetwork:
-      return details.clientSecurityState?.initiatorIsSecureContext ? IssueCode.InsecurePrivateNetworkPreflight :
-                                                                     IssueCode.InsecurePrivateNetwork;
+      return IssueCode.InsecurePrivateNetwork;
     case Protocol.Network.CorsError.NoCorsRedirectModeNotFollow:
       return IssueCode.NoCorsRedirectModeNotFollow;
     case Protocol.Network.CorsError.InvalidPrivateNetworkAccess:
@@ -96,9 +95,8 @@ function getIssueCode(details: Protocol.Audits.CorsIssueDetails): IssueCode {
     case Protocol.Network.CorsError.UnexpectedPrivateNetworkAccess:
       return IssueCode.UnexpectedPrivateNetworkAccess;
     case Protocol.Network.CorsError.PreflightMissingAllowPrivateNetwork:
-      return IssueCode.PreflightMissingAllowPrivateNetwork;
     case Protocol.Network.CorsError.PreflightInvalidAllowPrivateNetwork:
-      return IssueCode.PreflightInvalidAllowPrivateNetwork;
+      return IssueCode.PreflightAllowPrivateNetworkError;
   }
 }
 
@@ -127,15 +125,15 @@ export class CorsIssue extends Issue<IssueCode> {
           file: 'corsInsecurePrivateNetwork.md',
           links: [{
             link: 'https://developer.chrome.com/blog/private-network-access-update',
-            linkTitle: i18nString(UIStrings.corsForPrivateNetworksRfc),
+            linkTitle: i18nString(UIStrings.corsPrivateNetworkAccess),
           }],
         };
-      case IssueCode.InsecurePrivateNetworkPreflight:
+      case IssueCode.PreflightAllowPrivateNetworkError:
         return {
-          file: 'corsInsecurePrivateNetworkPreflight.md',
+          file: 'corsPreflightAllowPrivateNetworkError.md',
           links: [{
             link: 'https://developer.chrome.com/blog/private-network-access-update',
-            linkTitle: i18nString(UIStrings.corsForPrivateNetworksRfc),
+            linkTitle: i18nString(UIStrings.corsPrivateNetworkAccess),
           }],
         };
       case IssueCode.InvalidHeaderValues:
@@ -231,8 +229,6 @@ export class CorsIssue extends Issue<IssueCode> {
       case IssueCode.InvalidResponse:
       case IssueCode.InvalidPrivateNetworkAccess:
       case IssueCode.UnexpectedPrivateNetworkAccess:
-      case IssueCode.PreflightMissingAllowPrivateNetwork:
-      case IssueCode.PreflightInvalidAllowPrivateNetwork:
         return null;
     }
   }
@@ -243,7 +239,11 @@ export class CorsIssue extends Issue<IssueCode> {
 
   getKind(): IssueKind {
     if (this.issueDetails.isWarning &&
-        this.issueDetails.corsErrorStatus.corsError === Protocol.Network.CorsError.InsecurePrivateNetwork) {
+        (this.issueDetails.corsErrorStatus.corsError === Protocol.Network.CorsError.InsecurePrivateNetwork ||
+         this.issueDetails.corsErrorStatus.corsError ===
+             Protocol.Network.CorsError.PreflightMissingAllowPrivateNetwork ||
+         this.issueDetails.corsErrorStatus.corsError ===
+             Protocol.Network.CorsError.PreflightInvalidAllowPrivateNetwork)) {
       return IssueKind.BreakingChange;
     }
     return IssueKind.PageError;