Roll browser-protocol

This roll requires a manual review. See http://go/reviewed-rolls for guidance.

In case of failures or errors, reach out to someone from config/owner/COMMON_OWNERS.

Roll created at https://cr-buildbucket.appspot.com/build/8727432914367464769

[email protected]

Fixed: 385693302
Change-Id: I6e7fa2f1414a2a5b92774b5c7c5e953ada6e3288
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6123626
Reviewed-by: Samiya Caur <[email protected]>
Commit-Queue: Benedikt Meurer <[email protected]>
Owners-Override: Benedikt Meurer <[email protected]>

Author: bmeurer

DEPS

@@ -24,7 +24,7 @@ vars = {
   'inspector_protocol_revision': '69d69ddf3aa698b171886551a4a672c5af1ad902',
 
   # Keeping track of the last time we rollerd the browser protocol files.
-  'chromium_browser_protocol_revision' : '2b758d7f6b384321fbd622b9d5e4a4fe3859f7b4',
+  'chromium_browser_protocol_revision' : 'b53d566f0eff2aa1de7f7c33e3aa2deaa7774c37',
 
   'clang_format_url': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git',
   'clang_format_revision': '37f6e68a107df43b7d7e044fd36a13cbae3413f2',

front_end/generated/InspectorBackendCommands.js

@@ -737,8 +737,8 @@ export namespace Audits {
     /**
      * The unique request id.
      */
-    requestId: Network.RequestId;
-    url?: string;
+    requestId?: Network.RequestId;
+    url: string;
   }
 
   /**

front_end/generated/protocol.ts

@@ -201,17 +201,16 @@ export class PreloadingDetailsReportView extends LegacyWrapper.LegacyWrapper.Wra
     if (attempt.action === Protocol.Preload.SpeculationAction.Prefetch && attempt.requestId !== undefined) {
       // Disabled until https://crbug.com/1079231 is fixed.
       // clang-format off
+      const {requestId, key: {url}} = attempt;
+      const affectedRequest: {requestId?: Protocol.Network.RequestId, url?: string} = {requestId, url};
       value = html`
           <devtools-request-link-icon
             .data=${
               {
-                affectedRequest: {
-                  requestId: attempt.requestId,
-                  url: attempt.key.url,
-                },
+                affectedRequest,
                 requestResolver: this.#data.requestResolver || new Logs.RequestResolver.RequestResolver(),
                 displayURL: true,
-                urlToDisplay: attempt.key.url,
+                urlToDisplay: url,
               }
             }
           >

front_end/panels/application/preloading/components/PreloadingDetailsReportView.ts

@@ -17,6 +17,16 @@ import {StubIssue} from '../../testing/StubIssue.js';
 
 import * as Issues from './issues.js';
 
+function requestIds(...issues: Issues.IssueAggregator.AggregatedIssue[]): Set<string|undefined> {
+  const requestIds = new Set<string|undefined>();
+  for (const issue of issues) {
+    for (const {requestId} of issue.requests()) {
+      requestIds.add(requestId);
+    }
+  }
+  return requestIds;
+}
+
 describeWithEnvironment('AggregatedIssue', () => {
   const aggregationKey = 'key' as unknown as Issues.IssueAggregator.AggregationKey;
   it('deduplicates network requests across issues', () => {
@@ -27,8 +37,7 @@ describeWithEnvironment('AggregatedIssue', () => {
     aggregatedIssue.addInstance(issue1);
     aggregatedIssue.addInstance(issue2);
 
-    const actualRequestIds = [...aggregatedIssue.requests()].map(r => r.requestId).sort();
-    assert.deepStrictEqual(actualRequestIds, ['id1', 'id2']);
+    assert.deepEqual(requestIds(aggregatedIssue), new Set(['id1', 'id2']));
   });
 
   it('deduplicates affected cookies across issues', () => {
@@ -66,10 +75,7 @@ describeWithMockConnection('IssueAggregator', () => {
     mockManager.dispatchEventToListeners(
         IssuesManager.IssuesManager.Events.ISSUE_ADDED, {issuesModel: model, issue: issue2});
 
-    const issues = Array.from(aggregator.aggregatedIssues());
-    assert.strictEqual(issues.length, 1);
-    const requestIds = [...issues[0].requests()].map(r => r.requestId).sort();
-    assert.deepStrictEqual(requestIds, ['id1', 'id2']);
+    assert.deepEqual(requestIds(...aggregator.aggregatedIssues()), new Set(['id1', 'id2']));
   });
 
   it('deduplicates issues with the same code added before its creation', () => {
@@ -87,10 +93,7 @@ describeWithMockConnection('IssueAggregator', () => {
     mockManager.dispatchEventToListeners(
         IssuesManager.IssuesManager.Events.ISSUE_ADDED, {issuesModel: model, issue: issue2});
 
-    const issues = Array.from(aggregator.aggregatedIssues());
-    assert.strictEqual(issues.length, 1);
-    const requestIds = [...issues[0].requests()].map(r => r.requestId).sort();
-    assert.deepStrictEqual(requestIds, ['id1', 'id2', 'id3']);
+    assert.deepEqual(requestIds(...aggregator.aggregatedIssues()), new Set(['id1', 'id2', 'id3']));
   });
 
   it('keeps issues with different codes separate', () => {

front_end/panels/issues/IssueAggregator.test.ts

@@ -30,7 +30,8 @@ export class AggregatedIssue extends IssuesManager.Issue.Issue {
     hasRequest: boolean,
   }>();
   #affectedRawCookieLines = new Map<string, {rawCookieLine: string, hasRequest: boolean}>();
-  #affectedRequests = new Map<string, Protocol.Audits.AffectedRequest>();
+  #affectedRequests = new Array<Protocol.Audits.AffectedRequest>();
+  #affectedRequestIds = new Set<Protocol.Network.RequestId>();
   #affectedLocations = new Map<string, Protocol.Audits.SourceCodeLocation>();
   #heavyAdIssues = new Set<IssuesManager.HeavyAdIssue.HeavyAdIssue>();
   #blockedByResponseDetails = new Map<string, Protocol.Audits.BlockedByResponseIssueDetails>();
@@ -175,9 +176,13 @@ export class AggregatedIssue extends IssuesManager.Issue.Issue {
     this.#issueKind = IssuesManager.Issue.unionIssueKind(this.#issueKind, issue.getKind());
     let hasRequest = false;
     for (const request of issue.requests()) {
+      const {requestId} = request;
       hasRequest = true;
-      if (!this.#affectedRequests.has(request.requestId)) {
-        this.#affectedRequests.set(request.requestId, request);
+      if (requestId === undefined) {
+        this.#affectedRequests.push(request);
+      } else if (!this.#affectedRequestIds.has(requestId)) {
+        this.#affectedRequests.push(request);
+        this.#affectedRequestIds.add(requestId);
       }
     }
     for (const cookie of issue.cookies()) {

front_end/panels/issues/IssueAggregator.ts

@@ -42,7 +42,7 @@ const coordinator = Coordinator.RenderCoordinator.RenderCoordinator.instance();
 export interface RequestLinkIconData {
   linkToPreflight?: boolean;
   request?: SDK.NetworkRequest.NetworkRequest|null;
-  affectedRequest?: {requestId: Protocol.Network.RequestId, url?: string};
+  affectedRequest?: {requestId?: Protocol.Network.RequestId, url?: string};
   highlightHeader?: {section: NetworkForward.UIRequestLocation.UIHeaderSection, name: string};
   networkTab?: NetworkForward.UIRequestLocation.UIRequestTabs;
   requestResolver?: Logs.RequestResolver.RequestResolver;
@@ -71,7 +71,7 @@ export class RequestLinkIcon extends HTMLElement {
   #displayURL: boolean = false;
   #urlToDisplay?: string;
   #networkTab?: NetworkForward.UIRequestLocation.UIRequestTabs;
-  #affectedRequest?: {requestId: Protocol.Network.RequestId, url?: string};
+  #affectedRequest?: {requestId?: Protocol.Network.RequestId, url?: string};
   #additionalOnClickAction?: () => void;
   #reveal = Common.Revealer.reveal;
 
@@ -90,7 +90,7 @@ export class RequestLinkIcon extends HTMLElement {
     if (data.revealOverride) {
       this.#reveal = data.revealOverride;
     }
-    if (!this.#request && data.affectedRequest) {
+    if (!this.#request && data.affectedRequest && typeof data.affectedRequest.requestId !== 'undefined') {
       if (!this.#requestResolver) {
         throw new Error('A `RequestResolver` must be provided if an `affectedRequest` is provided.');
       }
@@ -183,7 +183,7 @@ export class RequestLinkIcon extends HTMLElement {
       // the concrete network request, or at least its request ID, we surround
       // the URL with a button, that opens the request in the Network panel.
       let template = this.#maybeRenderURL();
-      if (this.#request || this.#affectedRequest?.requestId) {
+      if (this.#request || this.#affectedRequest?.requestId !== undefined) {
         // clang-format off
         template = html`
           <button class=${LitHtml.Directives.classMap({link: Boolean(this.#request)})}

front_end/ui/components/request_link_icon/RequestLinkIcon.ts

@@ -1017,11 +1017,11 @@
                         {
                             "name": "requestId",
                             "description": "The unique request id.",
+                            "optional": true,
                             "$ref": "Network.RequestId"
                         },
                         {
                             "name": "url",
-                            "optional": true,
                             "type": "string"
                         }
                     ]

third_party/blink/public/devtools_protocol/browser_protocol.json

@@ -499,8 +499,8 @@ experimental domain Audits
   type AffectedRequest extends object
     properties
       # The unique request id.
-      Network.RequestId requestId
-      optional string url
+      optional Network.RequestId requestId
+      string url
 
   # Information about the frame affected by an inspector issue.
   type AffectedFrame extends object