chrome-devtools-frontend 1.0.1402249 → 1.0.1418433

package/front_end/core/sdk/NetworkManager.test.ts

@@ -7,7 +7,7 @@ import * as Bindings from '../../models/bindings/bindings.js';
 import * as Persistence from '../../models/persistence/persistence.js';
 import * as TextUtils from '../../models/text_utils/text_utils.js';
 import * as Workspace from '../../models/workspace/workspace.js';
-import {createTarget, describeWithEnvironment} from '../../testing/EnvironmentHelpers.js';
+import {createTarget, describeWithEnvironment, getGetHostConfigStub} from '../../testing/EnvironmentHelpers.js';
 import {describeWithMockConnection} from '../../testing/MockConnection.js';
 import {createWorkspaceProject} from '../../testing/OverridesHelpers.js';
 import * as Common from '../common/common.js';
@@ -15,9 +15,61 @@ import * as Platform from '../platform/platform.js';
 
 import * as SDK from './sdk.js';
 
+const {urlString} = Platform.DevToolsPath;
 const LONG_URL_PART =
     'LoremIpsumDolorSitAmetConsecteturAdipiscingElitPhasellusVitaeOrciInAugueCondimentumTinciduntUtEgetDolorQuisqueEfficiturUltricesTinciduntVivamusVelitPurusCommodoQuisErosSitAmetTemporMalesuadaNislNullamTtempusVulputateAugueEgetScelerisqueLacusVestibulumNon/index.html';
 
+describeWithMockConnection('NetworkManager', () => {
+  it('setCookieControls is not invoked if the browsers enterprise setting blocks third party cookies', () => {
+    getGetHostConfigStub(
+        {thirdPartyCookieControls: {managedBlockThirdPartyCookies: true}, devToolsPrivacyUI: {enabled: true}});
+
+    const enableThirdPartyCookieRestrictionSetting =
+        Common.Settings.Settings.instance().createSetting('cookie-control-override-enabled', false);
+    const disableThirdPartyCookieMetadataSetting =
+        Common.Settings.Settings.instance().createSetting('grace-period-mitigation-disabled', true);
+    const disableThirdPartyCookieHeuristicsSetting =
+        Common.Settings.Settings.instance().createSetting('heuristic-mitigation-disabled', true);
+    assert.isFalse(enableThirdPartyCookieRestrictionSetting.get());
+    assert.isTrue(disableThirdPartyCookieMetadataSetting.get());
+    assert.isTrue(disableThirdPartyCookieHeuristicsSetting.get());
+
+    const target = createTarget();
+    const expectedCall = sinon.spy(target.networkAgent(), 'invoke_setCookieControls');
+
+    new SDK.NetworkManager.NetworkManager(target);
+
+    // function should not be called since there is a enterprise policy blocking third-party cookies
+    assert.isTrue(expectedCall.notCalled);
+  });
+
+  it('setCookieControls gets invoked with expected values when network agent auto attach', () => {
+    getGetHostConfigStub({devToolsPrivacyUI: {enabled: true}});
+
+    const enableThirdPartyCookieRestrictionSetting =
+        Common.Settings.Settings.instance().createSetting('cookie-control-override-enabled', false);
+    const disableThirdPartyCookieMetadataSetting =
+        Common.Settings.Settings.instance().createSetting('grace-period-mitigation-disabled', true);
+    const disableThirdPartyCookieHeuristicsSetting =
+        Common.Settings.Settings.instance().createSetting('heuristic-mitigation-disabled', true);
+    assert.isFalse(enableThirdPartyCookieRestrictionSetting.get());
+    assert.isTrue(disableThirdPartyCookieMetadataSetting.get());
+    assert.isTrue(disableThirdPartyCookieHeuristicsSetting.get());
+
+    const target = createTarget();
+    const expectedCall = sinon.spy(target.networkAgent(), 'invoke_setCookieControls');
+
+    new SDK.NetworkManager.NetworkManager(target);
+
+    // Metadata and heuristics should be disabled when cookie controls is disabled.
+    assert.isTrue(expectedCall.calledOnceWith({
+      enableThirdPartyCookieRestriction: false,
+      disableThirdPartyCookieMetadata: false,
+      disableThirdPartyCookieHeuristics: false
+    }));
+  });
+});
+
 describeWithMockConnection('MultitargetNetworkManager', () => {
   describe('Trust Token done event', () => {
     it('is not lost when arriving before the corresponding requestWillBeSent event', () => {
@@ -399,8 +451,8 @@ describeWithMockConnection('InterceptedRequest', () => {
           SDK.NetworkManager.MultitargetNetworkManager.Events.REQUEST_FULFILLED, resolve);
     });
     const networkRequest = SDK.NetworkRequest.NetworkRequest.create(
-        requestId as unknown as Protocol.Network.RequestId, request.url as Platform.DevToolsPath.UrlString,
-        request.url as Platform.DevToolsPath.UrlString, null, null, null);
+        requestId as unknown as Protocol.Network.RequestId, urlString`${request.url}`, urlString`${request.url}`, null,
+        null, null);
 
     networkRequest.originalResponseHeaders = responseHeaders;
 
@@ -448,12 +500,11 @@ describeWithMockConnection('InterceptedRequest', () => {
   beforeEach(async () => {
     SDK.NetworkManager.MultitargetNetworkManager.dispose();
     target = createTarget();
-    const networkPersistenceManager =
-        await createWorkspaceProject('file:///path/to/overrides' as Platform.DevToolsPath.UrlString, [
-          {
-            name: '.headers',
-            path: 'www.example.com/',
-            content: `[
+    const networkPersistenceManager = await createWorkspaceProject(urlString`file:///path/to/overrides`, [
+      {
+        name: '.headers',
+        path: 'www.example.com/',
+        content: `[
             {
               "applyTo": "index.html",
               "headers": [{
@@ -535,11 +586,11 @@ describeWithMockConnection('InterceptedRequest', () => {
               ]
             }
           ]`,
-          },
-          {
-            name: '.headers',
-            path: '',
-            content: `[
+      },
+      {
+        name: '.headers',
+        path: '',
+        content: `[
             {
               "applyTo": "*",
               "headers": [{
@@ -548,14 +599,14 @@ describeWithMockConnection('InterceptedRequest', () => {
               }]
             }
           ]`,
-          },
-          {name: 'helloWorld.html', path: 'www.example.com/', content: 'Hello World!'},
-          {name: 'utf16.html', path: 'www.example.com/', content: 'Overwritten with non-UTF16 (TODO: fix this!)'},
-          {name: 'something.html', path: 'file:/usr/local/foo/content/', content: 'Override for something'},
-          {
-            name: '.headers',
-            path: 'file:/usr/local/example/',
-            content: `[
+      },
+      {name: 'helloWorld.html', path: 'www.example.com/', content: 'Hello World!'},
+      {name: 'utf16.html', path: 'www.example.com/', content: 'Overwritten with non-UTF16 (TODO: fix this!)'},
+      {name: 'something.html', path: 'file:/usr/local/foo/content/', content: 'Override for something'},
+      {
+        name: '.headers',
+        path: 'file:/usr/local/example/',
+        content: `[
             {
               "applyTo": "*",
               "headers": [{
@@ -564,48 +615,47 @@ describeWithMockConnection('InterceptedRequest', () => {
               }]
             }
           ]`,
-          },
-          {name: 'index.html', path: 'file:/usr/local/example/', content: 'Overridden file content'},
-          {
-            name: '.headers',
-            path: 'www.longurl.com/longurls/',
-            content: `[
+      },
+      {name: 'index.html', path: 'file:/usr/local/example/', content: 'Overridden file content'},
+      {
+        name: '.headers',
+        path: 'www.longurl.com/longurls/',
+        content: `[
             {
               "applyTo": "index.html-${
-                Platform.StringUtilities.hashCode('www.longurl.com/' + LONG_URL_PART).toString(16)}.html",
+            Platform.StringUtilities.hashCode('www.longurl.com/' + LONG_URL_PART).toString(16)}.html",
               "headers": [{
                 "name": "long-url-header",
                 "value": "long url header value"
               }]
             }
           ]`,
-          },
-          {
-            name:
-                `index.html-${Platform.StringUtilities.hashCode('www.longurl.com/' + LONG_URL_PART).toString(16)}.html`,
-            path: 'www.longurl.com/longurls/',
-            content: 'Overridden long URL file content',
-          },
-          {
-            name: '.headers',
-            path: 'file:/longurls/',
-            content: `[
+      },
+      {
+        name: `index.html-${Platform.StringUtilities.hashCode('www.longurl.com/' + LONG_URL_PART).toString(16)}.html`,
+        path: 'www.longurl.com/longurls/',
+        content: 'Overridden long URL file content',
+      },
+      {
+        name: '.headers',
+        path: 'file:/longurls/',
+        content: `[
             {
               "applyTo": "index.html-${
-                Platform.StringUtilities
-                    .hashCode(
-                        Persistence.NetworkPersistenceManager.NetworkPersistenceManager
-                            .encodeEncodedPathToLocalPathParts('file:' as Platform.DevToolsPath.EncodedPathString)[0] +
-                        '/' + LONG_URL_PART)
-                    .toString(16)}.html",
+            Platform.StringUtilities
+                .hashCode(
+                    Persistence.NetworkPersistenceManager.NetworkPersistenceManager.encodeEncodedPathToLocalPathParts(
+                        'file:' as Platform.DevToolsPath.EncodedPathString)[0] +
+                    '/' + LONG_URL_PART)
+                .toString(16)}.html",
               "headers": [{
                 "name": "long-file-url-header",
                 "value": "long file url header value"
               }]
             }
           ]`,
-          },
-        ]);
+      },
+    ]);
     sinon.stub(target.fetchAgent(), 'invoke_enable');
     fulfillRequestSpy = sinon.spy(target.fetchAgent(), 'invoke_fulfillRequest');
     await networkPersistenceManager.updateInterceptionPatternsForTests();
@@ -642,8 +692,8 @@ describeWithMockConnection('InterceptedRequest', () => {
     const continueRequestSpy = sinon.spy(fetchAgent, 'invoke_continueRequest');
 
     const networkRequest = SDK.NetworkRequest.NetworkRequest.create(
-        requestId as unknown as Protocol.Network.RequestId, request.url as Platform.DevToolsPath.UrlString,
-        request.url as Platform.DevToolsPath.UrlString, null, null, null);
+        requestId as unknown as Protocol.Network.RequestId, urlString`${request.url}`, urlString`${request.url}`, null,
+        null, null);
 
     const interceptedRequest = new SDK.NetworkManager.InterceptedRequest(
         fetchAgent, request, Protocol.Network.ResourceType.Document, requestId, networkRequest);
@@ -688,8 +738,8 @@ describeWithMockConnection('InterceptedRequest', () => {
       sinon.spy(fetchAgent, 'invoke_continueRequest');
 
       const networkRequest = SDK.NetworkRequest.NetworkRequest.create(
-          requestId as unknown as Protocol.Network.RequestId, request.url as Platform.DevToolsPath.UrlString,
-          request.url as Platform.DevToolsPath.UrlString, null, null, null);
+          requestId as unknown as Protocol.Network.RequestId, urlString`${request.url}`, urlString`${request.url}`,
+          null, null, null);
       networkRequest.originalResponseHeaders = [{name: 'content-type', value: 'text/html; charset-utf-16'}];
 
       // Create a quick'n dirty network UISourceCode for the request manually. We need to establish a binding to the
@@ -699,8 +749,7 @@ describeWithMockConnection('InterceptedRequest', () => {
           'Override network project', false);
       Workspace.Workspace.WorkspaceImpl.instance().addProject(networkProject);
       const uiSourceCode = networkProject.createUISourceCode(
-          'https://www.example.com/utf16.html' as Platform.DevToolsPath.UrlString,
-          Common.ResourceType.resourceTypes.Document);
+          urlString`https://www.example.com/utf16.html`, Common.ResourceType.resourceTypes.Document);
       networkProject.addUISourceCode(uiSourceCode);
 
       const interceptedRequest = new SDK.NetworkManager.InterceptedRequest(

package/front_end/core/sdk/NetworkManager.ts

@@ -147,6 +147,14 @@ export class NetworkManager extends SDKModel<EventTypes> {
     if (Common.Settings.Settings.instance().moduleSetting('cache-disabled').get()) {
       void this.#networkAgent.invoke_setCacheDisabled({cacheDisabled: true});
     }
+    if (Common.Settings.Settings.instance().getHostConfig().devToolsPrivacyUI?.enabled &&
+        Common.Settings.Settings.instance().getHostConfig().thirdPartyCookieControls?.managedBlockThirdPartyCookies !==
+            true &&
+        (Common.Settings.Settings.instance().createSetting('cookie-control-override-enabled', undefined).get() ||
+         Common.Settings.Settings.instance().createSetting('grace-period-mitigation-disabled', undefined).get() ||
+         Common.Settings.Settings.instance().createSetting('heuristic-mitigation-disabled', undefined).get())) {
+      this.cookieControlFlagsSettingChanged();
+    }
 
     void this.#networkAgent.invoke_enable({maxPostDataSize: MAX_EAGER_POST_REQUEST_BODY_LENGTH});
     void this.#networkAgent.invoke_setAttachDebugStack({enabled: true});
@@ -161,6 +169,16 @@ export class NetworkManager extends SDKModel<EventTypes> {
     Common.Settings.Settings.instance()
         .moduleSetting('cache-disabled')
         .addChangeListener(this.cacheDisabledSettingChanged, this);
+
+    Common.Settings.Settings.instance()
+        .createSetting('cookie-control-override-enabled', undefined)
+        .addChangeListener(this.cookieControlFlagsSettingChanged, this);
+    Common.Settings.Settings.instance()
+        .createSetting('grace-period-mitigation-disabled', undefined)
+        .addChangeListener(this.cookieControlFlagsSettingChanged, this);
+    Common.Settings.Settings.instance()
+        .createSetting('heuristic-mitigation-disabled', undefined)
+        .addChangeListener(this.cookieControlFlagsSettingChanged, this);
   }
 
   static forRequest(request: NetworkRequest): NetworkManager|null {
@@ -313,6 +331,23 @@ export class NetworkManager extends SDKModel<EventTypes> {
     void this.#networkAgent.invoke_setCacheDisabled({cacheDisabled: enabled});
   }
 
+  private cookieControlFlagsSettingChanged(): void {
+    const overridesEnabled =
+        Boolean(Common.Settings.Settings.instance().createSetting('cookie-control-override-enabled', undefined).get());
+    const gracePeriodEnabled = overridesEnabled ?
+        Boolean(
+            Common.Settings.Settings.instance().createSetting('grace-period-mitigation-disabled', undefined).get()) :
+        false;
+    const heuristicEnabled = overridesEnabled ?
+        Boolean(Common.Settings.Settings.instance().createSetting('heuristic-mitigation-disabled', undefined).get()) :
+        false;
+    void this.#networkAgent.invoke_setCookieControls({
+      enableThirdPartyCookieRestriction: overridesEnabled,
+      disableThirdPartyCookieMetadata: gracePeriodEnabled,
+      disableThirdPartyCookieHeuristics: heuristicEnabled,
+    });
+  }
+
   override dispose(): void {
     Common.Settings.Settings.instance()
         .moduleSetting('cache-disabled')
@@ -383,19 +418,19 @@ export interface MessageGeneratedEvent {
   warning: boolean;
 }
 
-export type EventTypes = {
-  [Events.RequestStarted]: RequestStartedEvent,
-  [Events.RequestUpdated]: NetworkRequest,
-  [Events.RequestFinished]: NetworkRequest,
-  [Events.RequestUpdateDropped]: RequestUpdateDroppedEventData,
-  [Events.ResponseReceived]: ResponseReceivedEvent,
-  [Events.MessageGenerated]: MessageGeneratedEvent,
-  [Events.RequestRedirected]: NetworkRequest,
-  [Events.LoadingFinished]: NetworkRequest,
-  [Events.ReportingApiReportAdded]: Protocol.Network.ReportingApiReport,
-  [Events.ReportingApiReportUpdated]: Protocol.Network.ReportingApiReport,
-  [Events.ReportingApiEndpointsChangedForOrigin]: Protocol.Network.ReportingApiEndpointsChangedForOriginEvent,
-};
+export interface EventTypes {
+  [Events.RequestStarted]: RequestStartedEvent;
+  [Events.RequestUpdated]: NetworkRequest;
+  [Events.RequestFinished]: NetworkRequest;
+  [Events.RequestUpdateDropped]: RequestUpdateDroppedEventData;
+  [Events.ResponseReceived]: ResponseReceivedEvent;
+  [Events.MessageGenerated]: MessageGeneratedEvent;
+  [Events.RequestRedirected]: NetworkRequest;
+  [Events.LoadingFinished]: NetworkRequest;
+  [Events.ReportingApiReportAdded]: Protocol.Network.ReportingApiReport;
+  [Events.ReportingApiReportUpdated]: Protocol.Network.ReportingApiReport;
+  [Events.ReportingApiEndpointsChangedForOrigin]: Protocol.Network.ReportingApiEndpointsChangedForOriginEvent;
+}
 
 /**
  * Define some built-in DevTools throttling presets.
@@ -1683,15 +1718,15 @@ export namespace MultitargetNetworkManager {
     REQUEST_FULFILLED = 'RequestFulfilled',
   }
 
-  export type EventTypes = {
-    [Events.BLOCKED_PATTERNS_CHANGED]: void,
-    [Events.CONDITIONS_CHANGED]: void,
-    [Events.USER_AGENT_CHANGED]: void,
-    [Events.INTERCEPTORS_CHANGED]: void,
-    [Events.ACCEPTED_ENCODINGS_CHANGED]: void,
-    [Events.REQUEST_INTERCEPTED]: string,
-    [Events.REQUEST_FULFILLED]: Platform.DevToolsPath.UrlString,
-  };
+  export interface EventTypes {
+    [Events.BLOCKED_PATTERNS_CHANGED]: void;
+    [Events.CONDITIONS_CHANGED]: void;
+    [Events.USER_AGENT_CHANGED]: void;
+    [Events.INTERCEPTORS_CHANGED]: void;
+    [Events.ACCEPTED_ENCODINGS_CHANGED]: void;
+    [Events.REQUEST_INTERCEPTED]: string;
+    [Events.REQUEST_FULFILLED]: Platform.DevToolsPath.UrlString;
+  }
 }
 
 export class InterceptedRequest {

package/front_end/core/sdk/NetworkRequest.test.ts

@@ -10,10 +10,12 @@ import {
   describeWithMockConnection,
   setMockConnectionResponseHandler,
 } from '../../testing/MockConnection.js';
-import type * as Platform from '../platform/platform.js';
+import * as Platform from '../platform/platform.js';
 
 import * as SDK from './sdk.js';
 
+const {urlString} = Platform.DevToolsPath;
+
 describe('NetworkRequest', () => {
   it('can parse statusText from the first line of responseReceivedExtraInfo\'s headersText', () => {
     assert.strictEqual(
@@ -28,7 +30,7 @@ describe('NetworkRequest', () => {
 
   it('parses response cookies from headers', () => {
     const request = SDK.NetworkRequest.NetworkRequest.createWithoutBackendRequest(
-        'requestId', 'url' as Platform.DevToolsPath.UrlString, 'documentURL' as Platform.DevToolsPath.UrlString, null);
+        'requestId', urlString`url`, urlString`documentURL`, null);
     request.addExtraResponseInfo({
       blockedResponseCookies: [],
       responseHeaders: [{name: 'Set-Cookie', value: 'foo=bar'}, {name: 'Set-Cookie', value: 'baz=qux'}],
@@ -42,8 +44,8 @@ describe('NetworkRequest', () => {
   it('infers status text from status code if none given', () => {
     const fakeRequest = SDK.NetworkRequest.NetworkRequest.createWithoutBackendRequest(
         'fakeRequestId',
-        'url1' as Platform.DevToolsPath.UrlString,
-        'documentURL' as Platform.DevToolsPath.UrlString,
+        urlString`url1`,
+        urlString`documentURL`,
         null,
     );
     fakeRequest.statusCode = 200;
@@ -55,8 +57,8 @@ describe('NetworkRequest', () => {
   it('does not infer status text from unknown status code', () => {
     const fakeRequest = SDK.NetworkRequest.NetworkRequest.createWithoutBackendRequest(
         'fakeRequestId',
-        'url1' as Platform.DevToolsPath.UrlString,
-        'documentURL' as Platform.DevToolsPath.UrlString,
+        urlString`url1`,
+        urlString`documentURL`,
         null,
     );
     fakeRequest.statusCode = 999;
@@ -68,8 +70,8 @@ describe('NetworkRequest', () => {
   it('infers status text only when no status text given', () => {
     const fakeRequest = SDK.NetworkRequest.NetworkRequest.createWithoutBackendRequest(
         'fakeRequestId',
-        'url1' as Platform.DevToolsPath.UrlString,
-        'documentURL' as Platform.DevToolsPath.UrlString,
+        urlString`url1`,
+        urlString`documentURL`,
         null,
     );
     fakeRequest.statusCode = 200;
@@ -81,7 +83,7 @@ describe('NetworkRequest', () => {
 
   it('includes partition key in response cookies', () => {
     const request = SDK.NetworkRequest.NetworkRequest.createWithoutBackendRequest(
-        'requestId', 'url' as Platform.DevToolsPath.UrlString, 'documentURL' as Platform.DevToolsPath.UrlString, null);
+        'requestId', urlString`url`, urlString`documentURL`, null);
     request.addExtraResponseInfo({
       blockedResponseCookies: [],
       responseHeaders:
@@ -102,7 +104,7 @@ describe('NetworkRequest', () => {
 
   it('determines whether the response headers have been overridden', () => {
     const request = SDK.NetworkRequest.NetworkRequest.createWithoutBackendRequest(
-        'requestId', 'url' as Platform.DevToolsPath.UrlString, 'documentURL' as Platform.DevToolsPath.UrlString, null);
+        'requestId', urlString`url`, urlString`documentURL`, null);
     request.responseHeaders = [{name: 'foo', value: 'bar'}];
 
     request.originalResponseHeaders = [{name: 'foo', value: 'baz'}];
@@ -137,7 +139,7 @@ describe('NetworkRequest', () => {
 
   it('considers duplicate headers which only differ in the order of their values as overridden', () => {
     const request = SDK.NetworkRequest.NetworkRequest.createWithoutBackendRequest(
-        'requestId', 'url' as Platform.DevToolsPath.UrlString, 'documentURL' as Platform.DevToolsPath.UrlString, null);
+        'requestId', urlString`url`, urlString`documentURL`, null);
     request.responseHeaders = [{name: 'duplicate', value: 'first'}, {name: 'duplicate', value: 'second'}];
     request.originalResponseHeaders = [{name: 'duplicate', value: 'second'}, {name: 'duplicate', value: 'first'}];
     assert.isTrue(request.hasOverriddenHeaders());
@@ -145,8 +147,7 @@ describe('NetworkRequest', () => {
 
   it('can handle the case of duplicate cookies with only 1 of them being blocked', async () => {
     const request = SDK.NetworkRequest.NetworkRequest.create(
-        'requestId' as Protocol.Network.RequestId, 'url' as Platform.DevToolsPath.UrlString,
-        'documentURL' as Platform.DevToolsPath.UrlString, null, null, null);
+        'requestId' as Protocol.Network.RequestId, urlString`url`, urlString`documentURL`, null, null, null);
     request.addExtraResponseInfo({
       responseHeaders: [{name: 'Set-Cookie', value: 'foo=duplicate; Path=/\nfoo=duplicate; Path=/'}],
       blockedResponseCookies: [{
@@ -175,8 +176,7 @@ describe('NetworkRequest', () => {
 
   it('can handle the case of exempted cookies', async () => {
     const request = SDK.NetworkRequest.NetworkRequest.create(
-        'requestId' as Protocol.Network.RequestId, 'url' as Platform.DevToolsPath.UrlString,
-        'documentURL' as Platform.DevToolsPath.UrlString, null, null, null);
+        'requestId' as Protocol.Network.RequestId, urlString`url`, urlString`documentURL`, null, null, null);
 
     const cookie = new SDK.Cookie.Cookie('name', 'value');
     cookie.addAttribute(SDK.Cookie.Attribute.SAME_SITE, 'None');
@@ -225,7 +225,7 @@ describe('NetworkRequest', () => {
 
   it('preserves order of headers in case of duplicates', () => {
     const request = SDK.NetworkRequest.NetworkRequest.createWithoutBackendRequest(
-        'requestId', 'url' as Platform.DevToolsPath.UrlString, 'documentURL' as Platform.DevToolsPath.UrlString, null);
+        'requestId', urlString`url`, urlString`documentURL`, null);
     const responseHeaders = [{name: '1ab', value: 'middle'}, {name: '1aB', value: 'last'}];
     request.addExtraResponseInfo({
       blockedResponseCookies: [],
@@ -237,7 +237,7 @@ describe('NetworkRequest', () => {
 
   it('treats multiple headers with the same name the same as single header with comma-separated values', () => {
     const request = SDK.NetworkRequest.NetworkRequest.createWithoutBackendRequest(
-        'requestId', 'url' as Platform.DevToolsPath.UrlString, 'documentURL' as Platform.DevToolsPath.UrlString, null);
+        'requestId', urlString`url`, urlString`documentURL`, null);
     request.responseHeaders = [{name: 'duplicate', value: 'first, second'}];
     request.originalResponseHeaders = [{name: 'duplicate', value: 'first'}, {name: 'duplicate', value: 'second'}];
     assert.isFalse(request.hasOverriddenHeaders());
@@ -268,10 +268,9 @@ describeWithMockConnection('NetworkRequest', () => {
     setMockConnectionResponseHandler('Network.getCookies', () => ({cookies: []}));
     const cookieModel = target.model(SDK.CookieModel.CookieModel);
     assert.exists(cookieModel);
-    const url = 'url' as Platform.DevToolsPath.UrlString;
+    const url = urlString`url`;
     const request = SDK.NetworkRequest.NetworkRequest.create(
-        'requestId' as Protocol.Network.RequestId, url, 'documentURL' as Platform.DevToolsPath.UrlString, null, null,
-        null);
+        'requestId' as Protocol.Network.RequestId, url, urlString`documentURL`, null, null, null);
 
     request.addExtraResponseInfo({
       responseHeaders: [{name: 'Set-Cookie', value: 'name=value; Path=/'}],

package/front_end/core/sdk/NetworkRequest.ts

@@ -1806,16 +1806,16 @@ export enum Events {
   TRUST_TOKEN_RESULT_ADDED = 'TrustTokenResultAdded',
 }
 
-export type EventTypes = {
-  [Events.FINISHED_LOADING]: NetworkRequest,
-  [Events.TIMING_CHANGED]: NetworkRequest,
-  [Events.REMOTE_ADDRESS_CHANGED]: NetworkRequest,
-  [Events.REQUEST_HEADERS_CHANGED]: void,
-  [Events.RESPONSE_HEADERS_CHANGED]: void,
-  [Events.WEBSOCKET_FRAME_ADDED]: WebSocketFrame,
-  [Events.EVENT_SOURCE_MESSAGE_ADDED]: EventSourceMessage,
-  [Events.TRUST_TOKEN_RESULT_ADDED]: void,
-};
+export interface EventTypes {
+  [Events.FINISHED_LOADING]: NetworkRequest;
+  [Events.TIMING_CHANGED]: NetworkRequest;
+  [Events.REMOTE_ADDRESS_CHANGED]: NetworkRequest;
+  [Events.REQUEST_HEADERS_CHANGED]: void;
+  [Events.RESPONSE_HEADERS_CHANGED]: void;
+  [Events.WEBSOCKET_FRAME_ADDED]: WebSocketFrame;
+  [Events.EVENT_SOURCE_MESSAGE_ADDED]: EventSourceMessage;
+  [Events.TRUST_TOKEN_RESULT_ADDED]: void;
+}
 
 export const enum InitiatorType {
   OTHER = 'other',

package/front_end/core/sdk/OverlayModel.test.ts

@@ -10,12 +10,14 @@ import {
   describeWithMockConnection,
   setMockConnectionResponseHandler,
 } from '../../testing/MockConnection.js';
-import type * as Platform from '../platform/platform.js';
+import * as Platform from '../platform/platform.js';
 
 import * as SDK from './sdk.js';
 
+const {urlString} = Platform.DevToolsPath;
+
 describeWithMockConnection('OverlayModel', () => {
-  const DOCUMENT_URL_FOR_TEST = 'https://example.com/' as Platform.DevToolsPath.UrlString;
+  const DOCUMENT_URL_FOR_TEST = urlString`https://example.com/`;
 
   let cssModel: SDK.CSSModel.CSSModel|null;
   let windowControls: SDK.OverlayModel.WindowControls|null;
@@ -88,8 +90,7 @@ describeWithMockConnection('OverlayModel', () => {
 
     // Add a style sheet and verify it gets added
     cssModel.styleSheetAdded(header);
-    const styleSheetIds =
-        cssModel.getStyleSheetIdsForURL(`${DOCUMENT_URL_FOR_TEST}styles.css` as Platform.DevToolsPath.UrlString);
+    const styleSheetIds = cssModel.getStyleSheetIdsForURL(urlString`${`${DOCUMENT_URL_FOR_TEST}styles.css`}`);
     assert.deepEqual(styleSheetIds, ['stylesheet']);
 
     // Verify style sheet gets initialized
@@ -114,8 +115,7 @@ describeWithMockConnection('OverlayModel', () => {
 
     // Add style sheet and verify it gets added
     cssModel.styleSheetAdded(header);
-    const styleSheetIds =
-        cssModel.getStyleSheetIdsForURL(`${DOCUMENT_URL_FOR_TEST}styles.css` as Platform.DevToolsPath.UrlString);
+    const styleSheetIds = cssModel.getStyleSheetIdsForURL(urlString`${`${DOCUMENT_URL_FOR_TEST}styles.css`}`);
     assert.deepEqual(styleSheetIds, ['stylesheet']);
 
     // Initialize style sheet & verify it gets initialized

package/front_end/core/sdk/OverlayModel.ts

@@ -951,16 +951,16 @@ export interface ChangedNodeId {
   enabled: boolean;
 }
 
-export type EventTypes = {
-  [Events.INSPECT_MODE_WILL_BE_TOGGLED]: OverlayModel,
-  [Events.EXITED_INSPECT_MODE]: void,
-  [Events.HIGHLIGHT_NODE_REQUESTED]: DOMNode,
-  [Events.SCREENSHOT_REQUESTED]: Protocol.Page.Viewport,
-  [Events.PERSISTENT_GRID_OVERLAY_STATE_CHANGED]: ChangedNodeId,
-  [Events.PERSISTENT_FLEX_CONTAINER_OVERLAY_STATE_CHANGED]: ChangedNodeId,
-  [Events.PERSISTENT_SCROLL_SNAP_OVERLAY_STATE_CHANGED]: ChangedNodeId,
-  [Events.PERSISTENT_CONTAINER_QUERY_OVERLAY_STATE_CHANGED]: ChangedNodeId,
-};
+export interface EventTypes {
+  [Events.INSPECT_MODE_WILL_BE_TOGGLED]: OverlayModel;
+  [Events.EXITED_INSPECT_MODE]: void;
+  [Events.HIGHLIGHT_NODE_REQUESTED]: DOMNode;
+  [Events.SCREENSHOT_REQUESTED]: Protocol.Page.Viewport;
+  [Events.PERSISTENT_GRID_OVERLAY_STATE_CHANGED]: ChangedNodeId;
+  [Events.PERSISTENT_FLEX_CONTAINER_OVERLAY_STATE_CHANGED]: ChangedNodeId;
+  [Events.PERSISTENT_SCROLL_SNAP_OVERLAY_STATE_CHANGED]: ChangedNodeId;
+  [Events.PERSISTENT_CONTAINER_QUERY_OVERLAY_STATE_CHANGED]: ChangedNodeId;
+}
 
 export interface Highlighter {
   highlightInOverlay(data: HighlightData, config: Protocol.Overlay.HighlightConfig): void;

package/front_end/core/sdk/OverlayPersistentHighlighter.test.ts

@@ -6,10 +6,12 @@ import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
 import type * as Protocol from '../../generated/protocol.js';
 import {describeWithEnvironment} from '../../testing/EnvironmentHelpers.js';
 import * as Common from '../common/common.js';
-import type * as Platform from '../platform/platform.js';
+import * as Platform from '../platform/platform.js';
 
 import * as SDK from './sdk.js';
 
+const {urlString} = Platform.DevToolsPath;
+
 type PersistentHighlightSettingItem = SDK.OverlayPersistentHighlighter.PersistentHighlightSettingItem;
 type PersistentHighlighterCallbacks = SDK.OverlayPersistentHighlighter.PersistentHighlighterCallbacks;
 
@@ -25,8 +27,8 @@ function assertSavedSettingState(expected: unknown): void {
   assert.deepEqual(setting.get(), expected);
 }
 
-const NON_RELATED_DOCUMENT_URL_FOR_TEST = 'https://notexample.com/' as Platform.DevToolsPath.UrlString;
-const DOCUMENT_URL_FOR_TEST = 'https://example.com/' as Platform.DevToolsPath.UrlString;
+const NON_RELATED_DOCUMENT_URL_FOR_TEST = urlString`https://notexample.com/`;
+const DOCUMENT_URL_FOR_TEST = urlString`https://example.com/`;
 const NODE_PATH_FOR_TEST = 'body > div';
 const EXISTING_NODE_ID = 1 as Protocol.DOM.NodeId;