Clean up resourceForURL sprawl

Noticed while doing https://crrev.com/c/6183081

Change-Id: Iabed2fb0d5ca624166da54ebb3b35dbf3459b2b4
Bug: 390743134
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6183178
Reviewed-by: Simon Zünd <[email protected]>
Commit-Queue: Simon Zünd <[email protected]>
Auto-Submit: Paul Irish <[email protected]>

Author: paulirish

front_end/core/sdk/ResourceTreeModel.ts

@@ -121,6 +121,7 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
   static resourceForURL(url: Platform.DevToolsPath.UrlString): Resource|null {
     for (const resourceTreeModel of TargetManager.instance().models(ResourceTreeModel)) {
       const mainFrame = resourceTreeModel.mainFrame;
+      // Workers call into this with no #frames available.
       const result = mainFrame ? mainFrame.resourceForURL(url) : null;
       if (result) {
         return result;
@@ -356,11 +357,6 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
     return [...this.framesInternal.values()];
   }
 
-  resourceForURL(url: Platform.DevToolsPath.UrlString): Resource|null {
-    // Workers call into this with no #frames available.
-    return this.mainFrame ? this.mainFrame.resourceForURL(url) : null;
-  }
-
   private addFramesRecursively(
       sameTargetParentFrame: ResourceTreeFrame|null, frameTreePayload: Protocol.Page.FrameResourceTree): void {
     const framePayload = frameTreePayload.frame;

front_end/legacy_test_runner/application_test_runner/ResourceTreeTestRunner.js

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import * as SDK from '../../core/sdk/sdk.js';
 import * as Application from '../../panels/application/application.js';
 import * as Sources from '../../panels/sources/sources.js';
 import * as UI from '../../ui/legacy/legacy.js';
@@ -40,7 +41,7 @@ export const dumpResourcesURLMap = function() {
   TestRunner.resourceTreeModel.forAllResources(collect);
 
   function collect(resource) {
-    results.push({url: resource.url, resource: TestRunner.resourceTreeModel.resourceForURL(resource.url)});
+    results.push({url: resource.url, resource: SDK.ResourceTreeModel.ResourceTreeModel.resourceForURL(resource.url)});
   }
 
   function comparator(result1, result2) {

front_end/models/bindings/ResourceUtils.test.ts

@@ -34,7 +34,7 @@ describeWithMockConnection('ResourceUtils', () => {
     createTarget({parentTarget: tabTarget, subtype: 'prerender'});
     target = createTarget({parentTarget: tabTarget});
     target.setInspectedURL(INSPECTED_URL);
-    sinon.stub(SDK.ResourceTreeModel.ResourceTreeModel.prototype, 'resourceForURL')
+    sinon.stub(SDK.ResourceTreeModel.ResourceTreeModel, 'resourceForURL')
         .returns(null)
         .withArgs(RESOURCE_URL)
         .returns(RESOURCE);

front_end/models/bindings/ResourceUtils.ts

@@ -39,14 +39,7 @@ import type * as Protocol from '../../generated/protocol.js';
 import * as Workspace from '../workspace/workspace.js';
 
 export function resourceForURL(url: Platform.DevToolsPath.UrlString): SDK.Resource.Resource|null {
-  for (const resourceTreeModel of SDK.TargetManager.TargetManager.instance().models(
-           SDK.ResourceTreeModel.ResourceTreeModel)) {
-    const resource = resourceTreeModel.resourceForURL(url);
-    if (resource) {
-      return resource;
-    }
-  }
-  return null;
+  return SDK.ResourceTreeModel.ResourceTreeModel.resourceForURL(url);
 }
 
 export function displayNameForURL(url: Platform.DevToolsPath.UrlString): string {

front_end/panels/ai_assistance/agents/FileAgent.test.ts

@@ -354,9 +354,9 @@ lorem ipsum
         requestContentData: true,
         url: networkRequest.url(),
       });
-      sinon.stub(SDK.ResourceTreeModel.ResourceTreeModel.prototype, 'resourceForURL')
-          .withArgs(networkRequest.url())
-          .returns({request: networkRequest} as SDK.Resource.Resource);
+      sinon.stub(SDK.ResourceTreeModel.ResourceTreeModel, 'resourceForURL').withArgs(networkRequest.url()).returns({
+        request: networkRequest
+      } as SDK.Resource.Resource);
       assert.strictEqual(formatFile(uiSourceCode), `File name: script.js
 URL: https://www.example.com/script.js
 Request initiator chain:

front_end/panels/network/NetworkPanel.ts

@@ -39,7 +39,6 @@ import * as Host from '../../core/host/host.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as Platform from '../../core/platform/platform.js';
 import * as SDK from '../../core/sdk/sdk.js';
-import * as Bindings from '../../models/bindings/bindings.js';
 import type * as Extensions from '../../models/extensions/extensions.js';
 import * as Logs from '../../models/logs/logs.js';
 import * as Trace from '../../models/trace/trace.js';
@@ -809,7 +808,7 @@ export class NetworkPanel extends UI.Panel.Panel implements
       return;
     }
     if (target instanceof Workspace.UISourceCode.UISourceCode) {
-      const resource = Bindings.ResourceUtils.resourceForURL(target.url());
+      const resource = SDK.ResourceTreeModel.ResourceTreeModel.resourceForURL(target.url());
       if (resource && resource.request) {
         appendRevealItem(resource.request);
       } else {

front_end/ui/legacy/components/utils/ImagePreview.ts

@@ -80,15 +80,12 @@ export class ImagePreview {
       }|undefined = {precomputedFeatures: undefined, imageAltText: undefined, align: Align.CENTER}):
       Promise<Element|null> {
     const {precomputedFeatures, imageAltText, align} = options;
-    const resourceTreeModel = target.model(SDK.ResourceTreeModel.ResourceTreeModel);
-    if (!resourceTreeModel) {
-      return null;
-    }
-    let resource = resourceTreeModel.resourceForURL(originalImageURL);
+
+    let resource = SDK.ResourceTreeModel.ResourceTreeModel.resourceForURL(originalImageURL);
     let imageURL = originalImageURL;
     if (!isImageResource(resource) && precomputedFeatures && precomputedFeatures.currentSrc) {
       imageURL = precomputedFeatures.currentSrc;
-      resource = resourceTreeModel.resourceForURL(imageURL);
+      resource = SDK.ResourceTreeModel.ResourceTreeModel.resourceForURL(imageURL);
     }
     if (!resource || !isImageResource(resource)) {
       return null;