Fix features in e2e_non_hosted

NO_IFTTT=no features changed
Bug: none
Change-Id: Iea087d6d41ba7adcbd8aee299df82020029fcaa2
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6895485
Auto-Submit: Alex Rudenko <alexrudenko@chromium.org>
Reviewed-by: Liviu Rau <liviurau@chromium.org>
Commit-Queue: Liviu Rau <liviurau@chromium.org>

Author: OrKoN

test/e2e_non_hosted/conductor/state-provider.ts

@@ -58,7 +58,7 @@ export class StateProvider {
 
     const settings = this.#getSettings(suite);
     const browserSettings = {
-      enabledBlinkFeatures: (settings.enabledBlinkFeatures ?? []).toSorted(),
+      enabledFeatures: (settings.enabledFeatures ?? []).toSorted(),
       disabledFeatures: (settings.disabledFeatures ?? []).toSorted(),
     };
     const browserKey = JSON.stringify(browserSettings);
@@ -131,7 +131,7 @@ export function mergeSettings(s1: E2E.SuiteSettings, s2: E2E.HarnessSettings): E
   }
 
   return {
-    enabledBlinkFeatures: mergeAsSet(s1.enabledBlinkFeatures, s2.enabledBlinkFeatures),
+    enabledFeatures: mergeAsSet(s1.enabledFeatures, s2.enabledFeatures),
     disabledFeatures: mergeAsSet(s1.disabledFeatures, s2.disabledFeatures),
     enabledDevToolsExperiments: mergeAsSet(s1.enabledDevToolsExperiments, s2.enabledDevToolsExperiments),
     disabledDevToolsExperiments: mergeAsSet(s1.disabledDevToolsExperiments, s2.disabledDevToolsExperiments),

test/e2e_non_hosted/shared/browser-helper.ts

@@ -85,7 +85,7 @@ export class Launcher {
 
   private static launchChrome(settings: BrowserSettings) {
     const frontEndDirectory = url.pathToFileURL(path.join(GEN_DIR, 'front_end'));
-    const disabledFeatures = settings.enabledBlinkFeatures?.slice() ?? [];
+    const disabledFeatures = settings.disabledFeatures?.slice() ?? [];
     const launchArgs = [
       '--remote-allow-origins=*',
       '--remote-debugging-port=0',
@@ -139,7 +139,7 @@ export class Launcher {
     if (!headless) {
       launchArgs.push(`--window-size=${windowWidth},${windowHeight}`);
     }
-    const enabledFeatures = settings.enabledBlinkFeatures?.slice() ?? [];
+    const enabledFeatures = settings.enabledFeatures?.slice() ?? [];
     // TODO: remove
     const envChromeFeatures = process.env['CHROME_FEATURES'];
     if (envChromeFeatures) {
@@ -153,13 +153,13 @@ export class Launcher {
 }
 
 export interface BrowserSettings {
-  enabledBlinkFeatures: string[];
+  enabledFeatures: string[];
   disabledFeatures: string[];
 }
 
 export const DEFAULT_BROWSER_SETTINGS: BrowserSettings = {
   // LINT.IfChange(features)
-  enabledBlinkFeatures: [
+  enabledFeatures: [
     'PartitionedCookies',
     'SharedStorageAPI',
     'FencedFrames',