[cleanup] remove duplicate configs in InspectorFrontendHost

Bug: none
Change-Id: I8bf9767bdd5e86d78dd45a7252ab764b5f159418
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6264605
Reviewed-by: Benedikt Meurer <[email protected]>
Commit-Queue: Alex Rudenko <[email protected]>

Author: OrKoN

front_end/core/host/InspectorFrontendHost.ts

@@ -404,48 +404,15 @@ export class InspectorFrontendHostStub implements InspectorFrontendHostAPI {
   }
 
   getHostConfig(callback: (hostConfig: Root.Runtime.HostConfig) => void): void {
-    const result: Root.Runtime.HostConfig = {
-      aidaAvailability: {
-        enabled: true,
-        blockedByAge: false,
-        blockedByEnterprisePolicy: false,
-        blockedByGeo: false,
-        disallowLogging: true,
-        enterprisePolicyValue: 0,
-      },
-      devToolsConsoleInsights: {
-        modelId: '',
-        temperature: -1,
-        enabled: false,
-      },
-      devToolsFreestyler: {
-        modelId: '',
-        temperature: -1,
-        enabled: false,
-      },
-      devToolsImprovedWorkspaces: {
-        enabled: false,
-      },
+    // This HostConfig config is used in the hosted mode (see the
+    // comment on top of this class). Only add non-default config params
+    // here that you want to also apply in the hosted mode. For tests
+    // use the hostConfigForTesting override.
+    const hostConfigForHostedMode: Root.Runtime.HostConfig = {
       devToolsVeLogging: {
         enabled: true,
-        testing: false,
-      },
-      devToolsWellKnown: {
-        enabled: true,
-      },
-      devToolsPrivacyUI: {
-        enabled: false,
-      },
-      devToolsEnableOriginBoundCookies: {
-        portBindingEnabled: false,
-        schemeBindingEnabled: false,
-      },
-      devToolsAnimationStylesInStylesTab: {
-        enabled: false,
       },
-      isOffTheRecord: false,
       thirdPartyCookieControls: {
-        thirdPartyCookieRestrictionEnabled: false,
         thirdPartyCookieMetadataEnabled: true,
         thirdPartyCookieHeuristicsEnabled: true,
         managedBlockThirdPartyCookies: 'Unset',
@@ -455,19 +422,19 @@ export class InspectorFrontendHostStub implements InspectorFrontendHostAPI {
       const {hostConfigForTesting} = (globalThis as unknown as {hostConfigForTesting: Root.Runtime.HostConfig});
       for (const key of Object.keys(hostConfigForTesting)) {
         const mergeEntry = <K extends keyof Root.Runtime.HostConfig>(key: K): void => {
-          if (typeof result[key] === 'object' && typeof hostConfigForTesting[key] === 'object') {
+          if (typeof hostConfigForHostedMode[key] === 'object' && typeof hostConfigForTesting[key] === 'object') {
             // If the config is an object, merge the settings, but preferring
             // the hostConfigForTesting values over the result values.
-            result[key] = {...result[key], ...hostConfigForTesting[key]};
+            hostConfigForHostedMode[key] = {...hostConfigForHostedMode[key], ...hostConfigForTesting[key]};
           } else {
             // Override with the testing config if the value is present + not null/undefined.
-            result[key] = hostConfigForTesting[key] ?? result[key];
+            hostConfigForHostedMode[key] = hostConfigForTesting[key] ?? hostConfigForHostedMode[key];
           }
         };
         mergeEntry(key as keyof Root.Runtime.HostConfig);
       }
     }
-    callback(result);
+    callback(hostConfigForHostedMode);
   }
 
   upgradeDraggedFileSystemPermissions(fileSystem: FileSystem): void {

test/e2e/ai_assistance/ai_assistance_test.ts

@@ -202,7 +202,11 @@ describe('AI Assistance', function() {
 
     await setupMocks(
         {
-          aidaAvailability: {},
+          aidaAvailability: {
+            enabled: true,
+            disallowLogging: true,
+            enterprisePolicyValue: 0,
+          },
           devToolsFreestyler: {
             enabled: true,
           },

test/e2e/console/console-insight_test.ts

@@ -28,10 +28,9 @@ describe('ConsoleInsight', function() {
       waitUntil: 'networkidle0',
     });
   }
-
   it('shows an insight for a console message via the context menu', async () => {
     const {target} = getBrowserAndPages();
-    await setupMocks({}, {enabled: true});
+    await setupMocks({enabled: true}, {enabled: true});
     await click(CONSOLE_TAB_SELECTOR);
     await target.evaluate(() => {
       console.error(new Error('Unexpected error'));
@@ -42,7 +41,7 @@ describe('ConsoleInsight', function() {
 
   it('shows an insight for a console message via the hover button', async () => {
     const {target} = getBrowserAndPages();
-    await setupMocks({}, {enabled: true});
+    await setupMocks({enabled: true}, {enabled: true});
     await click(CONSOLE_TAB_SELECTOR);
     await target.evaluate(() => {
       console.error(new Error('Unexpected error'));
@@ -75,7 +74,7 @@ describe('ConsoleInsight', function() {
   it('shows the hover button even if locale is not supported', async () => {
     const {target} = getBrowserAndPages();
     await setDevToolsSettings({language: 'zh'});
-    await setupMocks({}, {enabled: true});
+    await setupMocks({enabled: true}, {enabled: true});
     await click(CONSOLE_TAB_SELECTOR);
     await target.evaluate(() => {
       console.error(new Error('Unexpected error'));
@@ -86,7 +85,7 @@ describe('ConsoleInsight', function() {
 
   it('shows the hover button even if age check is not passing', async () => {
     const {target} = getBrowserAndPages();
-    await setupMocks({blockedByAge: true}, {enabled: true});
+    await setupMocks({blockedByAge: true, enabled: true}, {enabled: true});
     await click(CONSOLE_TAB_SELECTOR);
     await target.evaluate(() => {
       console.error(new Error('Unexpected error'));
@@ -97,7 +96,7 @@ describe('ConsoleInsight', function() {
 
   it('does not show the hover button if policy does not allow it', async () => {
     const {target} = getBrowserAndPages();
-    await setupMocks({blockedByEnterprisePolicy: true}, {enabled: true});
+    await setupMocks({blockedByEnterprisePolicy: true, enabled: true}, {enabled: true});
     await click(CONSOLE_TAB_SELECTOR);
     await target.evaluate(() => {
       console.error(new Error('Unexpected error'));
@@ -108,7 +107,7 @@ describe('ConsoleInsight', function() {
 
   it('shows the hover button even if it is restriced by geography', async () => {
     const {target} = getBrowserAndPages();
-    await setupMocks({blockedByGeo: true}, {enabled: true});
+    await setupMocks({blockedByGeo: true, enabled: true}, {enabled: true});
     await click(CONSOLE_TAB_SELECTOR);
     await target.evaluate(() => {
       console.error(new Error('Unexpected error'));