Tidy up ExtensionServer helpers

- Eliminate second path to add extensions for tests: We can use the
  regular extension registration path in tests except for the iframe.
  Pull the iframe setup into a separate method that tests can stub away.
- Correctly reset the devtools API object between tests. With the switch
  to new headless we were always hitting the catch in cleanup().

Bug: none
Change-Id: I2d23f15690d9e04afac8df9190e222cb442dc5a4
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/4664805
Commit-Queue: Philip Pfaffe <[email protected]>
Reviewed-by: Danil Somsikov <[email protected]>

Author: pfaffe

front_end/models/extensions/ExtensionServer.ts

@@ -979,18 +979,15 @@ export class ExtensionServer extends Common.ObjectWrapper.ObjectWrapper<EventTyp
     }
   }
 
-  addExtensionForTest(extensionInfo: Host.InspectorFrontendHostAPI.ExtensionDescriptor, origin: string): boolean
-      |undefined {
-    const name = extensionInfo.name || `Extension ${origin}`;
-    const hostsPolicy = HostsPolicy.create(extensionInfo.hostsPolicy);
-    if (!hostsPolicy) {
-      return false;
-    }
-    this.registeredExtensions.set(origin, {name, hostsPolicy});
-    return true;
+  addExtensionFrame({startPage, name}: Host.InspectorFrontendHostAPI.ExtensionDescriptor): void {
+    const iframe = document.createElement('iframe');
+    iframe.src = startPage;
+    iframe.dataset.devtoolsExtension = name;
+    iframe.style.display = 'none';
+    document.body.appendChild(iframe);  // Only for main window.
   }
 
-  private addExtension(extensionInfo: Host.InspectorFrontendHostAPI.ExtensionDescriptor): boolean|undefined {
+  addExtension(extensionInfo: Host.InspectorFrontendHostAPI.ExtensionDescriptor): boolean|undefined {
     const startPage = extensionInfo.startPage;
 
     const inspectedURL = SDK.TargetManager.TargetManager.instance().primaryPageTarget()?.inspectedURL() ?? '';
@@ -1018,12 +1015,7 @@ export class ExtensionServer extends Common.ObjectWrapper.ObjectWrapper<EventTyp
         const name = extensionInfo.name || `Extension ${extensionOrigin}`;
         this.registeredExtensions.set(extensionOrigin, {name, hostsPolicy});
       }
-
-      const iframe = document.createElement('iframe');
-      iframe.src = startPage;
-      iframe.dataset.devtoolsExtension = extensionInfo.name;
-      iframe.style.display = 'none';
-      document.body.appendChild(iframe);  // Only for main window.
+      this.addExtensionFrame(extensionInfo);
     } catch (e) {
       console.error('Failed to initialize extension ' + startPage + ':' + e);
       return false;

test/unittests/front_end/models/extensions/helpers.ts

@@ -3,50 +3,60 @@
 // found in the LICENSE file.
 
 import {type Chrome} from '../../../../../extension-api/ExtensionAPI.js';
-import type * as Host from '../../../../../front_end/core/host/host.js';
+import * as Host from '../../../../../front_end/core/host/host.js';
 import * as Extensions from '../../../../../front_end/models/extensions/extensions.js';
-import {describeWithEnvironment} from '../../helpers/EnvironmentHelpers.js';
+import {describeWithEnvironment, setupActionRegistry} from '../../helpers/EnvironmentHelpers.js';
 
 interface ExtensionContext {
   chrome: Partial<Chrome.DevTools.Chrome>;
+  extensionDescriptor: Extensions.ExtensionAPI.ExtensionDescriptor;
 }
 
 export function describeWithDevtoolsExtension(
     title: string, extension: Partial<Host.InspectorFrontendHostAPI.ExtensionDescriptor>,
     fn: (this: Mocha.Suite, context: ExtensionContext) => void) {
+  const extensionDescriptor = {
+    startPage: `${window.location.origin}/blank.html`,
+    name: 'TestExtension',
+    exposeExperimentalAPIs: true,
+    ...extension,
+  };
   const context: ExtensionContext = {
+    extensionDescriptor,
     chrome: {},
   };
 
   function setup() {
     const server = Extensions.ExtensionServer.ExtensionServer.instance({forceNew: true});
-    const extensionDescriptor = {
-      startPage: 'blank.html',
-      name: 'TestExtension',
-      exposeExperimentalAPIs: true,
-      ...extension,
-    };
-    server.addExtensionForTest(extensionDescriptor, window.location.origin);
-    const chrome: Partial<Chrome.DevTools.Chrome> = {};
-    (window as {chrome?: Partial<Chrome.DevTools.Chrome>}).chrome = chrome;
-    self.injectedExtensionAPI(extensionDescriptor, 'main', 'dark', [], () => {}, 1, window);
-    context.chrome = chrome;
+    sinon.stub(server, 'addExtensionFrame');
+
+    sinon.stub(Host.InspectorFrontendHost.InspectorFrontendHostInstance, 'setInjectedScriptForOrigin')
+        .callsFake((origin, _script) => {
+          if (origin === window.location.origin) {
+            const chrome: Partial<Chrome.DevTools.Chrome> = {};
+            (window as {chrome?: Partial<Chrome.DevTools.Chrome>}).chrome = chrome;
+            self.injectedExtensionAPI(extensionDescriptor, 'main', 'dark', [], () => {}, 1, window);
+            context.chrome = chrome;
+          }
+        });
+    server.addExtension(extensionDescriptor);
   }
 
   function cleanup() {
-    try {
-      delete (window as {chrome?: Chrome.DevTools.Chrome}).chrome;
-    } catch {
-      // Eat errors in headful mode
-    }
+    const chrome: Partial<Chrome.DevTools.Chrome> = {};
+    (window as {chrome?: Partial<Chrome.DevTools.Chrome>}).chrome = chrome;
+    context.chrome = chrome;
   }
 
   return describe(`with-extension-${title}`, function() {
     beforeEach(cleanup);
     beforeEach(setup);
     afterEach(cleanup);
 
-    describeWithEnvironment(title, fn.bind(this, context));
+    describeWithEnvironment(title, function() {
+      setupActionRegistry();
+      fn.call(this, context);
+    });
   });
 }