chrome-devtools-frontend 1.0.927127 → 1.0.928589

package/front_end/core/sdk/NetworkManager.ts

@@ -1,3 +1,7 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
@@ -11,7 +15,7 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of Google Inc. nor the names of its
+ *     * Neither the #name of Google Inc. nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
@@ -119,26 +123,26 @@ const CONNECTION_TYPES = new Map([
 
 export class NetworkManager extends SDKModel<EventTypes> {
   readonly dispatcher: NetworkDispatcher;
-  private readonly networkAgent: ProtocolProxyApi.NetworkApi;
-  private readonly bypassServiceWorkerSetting: Common.Settings.Setting<boolean>;
+  readonly #networkAgent: ProtocolProxyApi.NetworkApi;
+  readonly #bypassServiceWorkerSetting: Common.Settings.Setting<boolean>;
 
   constructor(target: Target) {
     super(target);
     this.dispatcher = new NetworkDispatcher(this);
-    this.networkAgent = target.networkAgent();
+    this.#networkAgent = target.networkAgent();
     target.registerNetworkDispatcher(this.dispatcher);
     if (Common.Settings.Settings.instance().moduleSetting('cacheDisabled').get()) {
-      this.networkAgent.invoke_setCacheDisabled({cacheDisabled: true});
+      this.#networkAgent.invoke_setCacheDisabled({cacheDisabled: true});
     }
 
-    this.networkAgent.invoke_enable({maxPostDataSize: MAX_EAGER_POST_REQUEST_BODY_LENGTH});
-    this.networkAgent.invoke_setAttachDebugStack({enabled: true});
+    this.#networkAgent.invoke_enable({maxPostDataSize: MAX_EAGER_POST_REQUEST_BODY_LENGTH});
+    this.#networkAgent.invoke_setAttachDebugStack({enabled: true});
 
-    this.bypassServiceWorkerSetting = Common.Settings.Settings.instance().createSetting('bypassServiceWorker', false);
-    if (this.bypassServiceWorkerSetting.get()) {
+    this.#bypassServiceWorkerSetting = Common.Settings.Settings.instance().createSetting('bypassServiceWorker', false);
+    if (this.#bypassServiceWorkerSetting.get()) {
       this.bypassServiceWorkerChanged();
     }
-    this.bypassServiceWorkerSetting.addChangeListener(this.bypassServiceWorkerChanged, this);
+    this.#bypassServiceWorkerSetting.addChangeListener(this.bypassServiceWorkerChanged, this);
 
     Common.Settings.Settings.instance()
         .moduleSetting('cacheDisabled')
@@ -160,7 +164,7 @@ export class NetworkManager extends SDKModel<EventTypes> {
     if (!manager || !requestId || request.isRedirect()) {
       return;
     }
-    manager.networkAgent.invoke_replayXHR({requestId});
+    manager.#networkAgent.invoke_replayXHR({requestId});
   }
 
   static async searchInRequest(request: NetworkRequest, query: string, caseSensitive: boolean, isRegex: boolean):
@@ -170,7 +174,7 @@ export class NetworkManager extends SDKModel<EventTypes> {
     if (!manager || !requestId || request.isRedirect()) {
       return [];
     }
-    const response = await manager.networkAgent.invoke_searchInResponseBody(
+    const response = await manager.#networkAgent.invoke_searchInResponseBody(
         {requestId, query: query, caseSensitive: caseSensitive, isRegex: isRegex});
     return response.result || [];
   }
@@ -196,7 +200,7 @@ export class NetworkManager extends SDKModel<EventTypes> {
     if (!requestId) {
       return {error: 'No backend request id for request', content: null, encoded: false};
     }
-    const response = await manager.networkAgent.invoke_getResponseBody({requestId});
+    const response = await manager.#networkAgent.invoke_getResponseBody({requestId});
     const error = response.getError() || null;
     return {error: error, content: error ? null : response.body, encoded: response.base64Encoded};
   }
@@ -213,7 +217,7 @@ export class NetworkManager extends SDKModel<EventTypes> {
       return null;
     }
     try {
-      const {postData} = await manager.networkAgent.invoke_getRequestPostData({requestId});
+      const {postData} = await manager.#networkAgent.invoke_getRequestPostData({requestId});
       return postData;
     } catch (e) {
       return e.message;
@@ -247,7 +251,7 @@ export class NetworkManager extends SDKModel<EventTypes> {
   }
 
   private cacheDisabledSettingChanged({data: enabled}: Common.EventTarget.EventTargetEvent<boolean>): void {
-    this.networkAgent.invoke_setCacheDisabled({cacheDisabled: enabled});
+    this.#networkAgent.invoke_setCacheDisabled({cacheDisabled: enabled});
   }
 
   dispose(): void {
@@ -257,12 +261,12 @@ export class NetworkManager extends SDKModel<EventTypes> {
   }
 
   private bypassServiceWorkerChanged(): void {
-    this.networkAgent.invoke_setBypassServiceWorker({bypass: this.bypassServiceWorkerSetting.get()});
+    this.#networkAgent.invoke_setBypassServiceWorker({bypass: this.#bypassServiceWorkerSetting.get()});
   }
 
   async getSecurityIsolationStatus(frameId: Protocol.Page.FrameId|
                                    null): Promise<Protocol.Network.SecurityIsolationStatus|null> {
-    const result = await this.networkAgent.invoke_getSecurityIsolationStatus({frameId: frameId ?? undefined});
+    const result = await this.#networkAgent.invoke_getSecurityIsolationStatus({frameId: frameId ?? undefined});
     if (result.getError()) {
       return null;
     }
@@ -270,13 +274,13 @@ export class NetworkManager extends SDKModel<EventTypes> {
   }
 
   async enableReportingApi(enable: boolean = true): Promise<Promise<Protocol.ProtocolResponseWithError>> {
-    return this.networkAgent.invoke_enableReportingApi({enable});
+    return this.#networkAgent.invoke_enableReportingApi({enable});
   }
 
   async loadNetworkResource(
       frameId: Protocol.Page.FrameId|null, url: string,
       options: Protocol.Network.LoadNetworkResourceOptions): Promise<Protocol.Network.LoadNetworkResourcePageResult> {
-    const result = await this.networkAgent.invoke_loadNetworkResource({frameId: frameId ?? undefined, url, options});
+    const result = await this.#networkAgent.invoke_loadNetworkResource({frameId: frameId ?? undefined, url, options});
     if (result.getError()) {
       throw new Error(result.getError());
     }
@@ -367,16 +371,16 @@ export const Fast3GConditions: Conditions = {
 const MAX_EAGER_POST_REQUEST_BODY_LENGTH = 64 * 1024;  // bytes
 
 export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
-  private readonly manager: NetworkManager;
-  private requestsById: Map<string, NetworkRequest>;
-  private requestsByURL: Map<string, NetworkRequest>;
-  private requestIdToExtraInfoBuilder: Map<string, ExtraInfoBuilder>;
-  private readonly requestIdToTrustTokenEvent: Map<string, Protocol.Network.TrustTokenOperationDoneEvent>;
+  readonly #manager: NetworkManager;
+  #requestsById: Map<string, NetworkRequest>;
+  #requestsByURL: Map<string, NetworkRequest>;
+  #requestIdToExtraInfoBuilder: Map<string, ExtraInfoBuilder>;
+  readonly #requestIdToTrustTokenEvent: Map<string, Protocol.Network.TrustTokenOperationDoneEvent>;
   constructor(manager: NetworkManager) {
-    this.manager = manager;
-    this.requestsById = new Map();
-    this.requestsByURL = new Map();
-    this.requestIdToExtraInfoBuilder = new Map();
+    this.#manager = manager;
+    this.#requestsById = new Map();
+    this.#requestsByURL = new Map();
+    this.#requestIdToExtraInfoBuilder = new Map();
     /**
      * In case of an early abort or a cache hit, the Trust Token done event is
      * reported before the request itself is created in `requestWillBeSent`.
@@ -385,7 +389,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
      * This map caches the events temporarliy and populates the NetworKRequest
      * once it is created in `requestWillBeSent`.
      */
-    this.requestIdToTrustTokenEvent = new Map();
+    this.#requestIdToTrustTokenEvent = new Map();
   }
 
   private headersMapToHeadersArray(headersMap: Protocol.Network.Headers): NameValue[] {
@@ -427,7 +431,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     if (response.requestHeaders && !networkRequest.hasExtraRequestInfo()) {
       // TODO(http://crbug.com/1004979): Stop using response.requestHeaders and
       //   response.requestHeadersText once shared workers
-      //   emit Network.*ExtraInfo events for their network requests.
+      //   emit Network.*ExtraInfo events for their network #requests.
       networkRequest.setRequestHeaders(this.headersMapToHeadersArray(response.requestHeaders));
       networkRequest.setRequestHeadersText(response.requestHeadersText || '');
     }
@@ -479,15 +483,15 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
   }
 
   requestForId(url: string): NetworkRequest|null {
-    return this.requestsById.get(url) || null;
+    return this.#requestsById.get(url) || null;
   }
 
   requestForURL(url: string): NetworkRequest|null {
-    return this.requestsByURL.get(url) || null;
+    return this.#requestsByURL.get(url) || null;
   }
 
   resourceChangedPriority({requestId, newPriority}: Protocol.Network.ResourceChangedPriorityEvent): void {
-    const networkRequest = this.requestsById.get(requestId);
+    const networkRequest = this.#requestsById.get(requestId);
     if (networkRequest) {
       networkRequest.setPriority(newPriority);
     }
@@ -503,14 +507,14 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     // 3. The second requestWillBeSent is sent with the generated redirect
     //    response and a new redirected request which URL is the inner request
     //    URL of the signed exchange.
-    let networkRequest = this.requestsById.get(requestId);
-    // |requestId| is available only for navigation requests. If the request was
+    let networkRequest = this.#requestsById.get(requestId);
+    // |requestId| is available only for navigation #requests. If the request was
     // sent from a renderer process for prefetching, it is not available. In the
     // case, need to fallback to look for the URL.
     // TODO(crbug/841076): Sends the request ID of prefetching to the browser
     // process and DevTools to find the matching request.
     if (!networkRequest) {
-      networkRequest = this.requestsByURL.get(info.outerResponse.url);
+      networkRequest = this.#requestsByURL.get(info.outerResponse.url);
       if (!networkRequest) {
         return;
       }
@@ -520,14 +524,14 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
 
     this.updateNetworkRequestWithResponse(networkRequest, info.outerResponse);
     this.updateNetworkRequest(networkRequest);
-    this.manager.dispatchEventToListeners(
+    this.#manager.dispatchEventToListeners(
         Events.ResponseReceived, {request: networkRequest, response: info.outerResponse});
   }
 
   requestWillBeSent(
       {requestId, loaderId, documentURL, request, timestamp, wallTime, initiator, redirectResponse, type, frameId}:
           Protocol.Network.RequestWillBeSentEvent): void {
-    let networkRequest = this.requestsById.get(requestId);
+    let networkRequest = this.#requestsById.get(requestId);
     if (networkRequest) {
       // FIXME: move this check to the backend.
       if (!redirectResponse) {
@@ -548,10 +552,10 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
         });
       }
       networkRequest = this.appendRedirect(requestId, timestamp, request.url);
-      this.manager.dispatchEventToListeners(Events.RequestRedirected, networkRequest);
+      this.#manager.dispatchEventToListeners(Events.RequestRedirected, networkRequest);
     } else {
       networkRequest = NetworkRequest.create(requestId, request.url, documentURL, frameId ?? null, loaderId, initiator);
-      requestToManagerMap.set(networkRequest, this.manager);
+      requestToManagerMap.set(networkRequest, this.#manager);
     }
     networkRequest.hasNetworkData = true;
     this.updateNetworkRequestWithRequest(networkRequest, request);
@@ -561,10 +565,10 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     if (request.trustTokenParams) {
       networkRequest.setTrustTokenParams(request.trustTokenParams);
     }
-    const maybeTrustTokenEvent = this.requestIdToTrustTokenEvent.get(requestId);
+    const maybeTrustTokenEvent = this.#requestIdToTrustTokenEvent.get(requestId);
     if (maybeTrustTokenEvent) {
       networkRequest.setTrustTokenOperationDoneEvent(maybeTrustTokenEvent);
-      this.requestIdToTrustTokenEvent.delete(requestId);
+      this.#requestIdToTrustTokenEvent.delete(requestId);
     }
 
     this.getExtraInfoBuilder(requestId).addRequest(networkRequest);
@@ -573,7 +577,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
   }
 
   requestServedFromCache({requestId}: Protocol.Network.RequestServedFromCacheEvent): void {
-    const networkRequest = this.requestsById.get(requestId);
+    const networkRequest = this.#requestsById.get(requestId);
     if (!networkRequest) {
       return;
     }
@@ -583,7 +587,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
 
   responseReceived({requestId, loaderId, timestamp, type, response, frameId}: Protocol.Network.ResponseReceivedEvent):
       void {
-    const networkRequest = this.requestsById.get(requestId);
+    const networkRequest = this.#requestsById.get(requestId);
     const lowercaseHeaders = NetworkManager.lowercaseHeaders(response.headers);
     if (!networkRequest) {
       const lastModifiedHeader = lowercaseHeaders['last-modified'];
@@ -596,7 +600,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
         mimeType: response.mimeType,
         lastModified: lastModifiedHeader ? new Date(lastModifiedHeader) : null,
       };
-      this.manager.dispatchEventToListeners(Events.RequestUpdateDropped, eventData);
+      this.#manager.dispatchEventToListeners(Events.RequestUpdateDropped, eventData);
       return;
     }
 
@@ -606,11 +610,11 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     this.updateNetworkRequestWithResponse(networkRequest, response);
 
     this.updateNetworkRequest(networkRequest);
-    this.manager.dispatchEventToListeners(Events.ResponseReceived, {request: networkRequest, response});
+    this.#manager.dispatchEventToListeners(Events.ResponseReceived, {request: networkRequest, response});
   }
 
   dataReceived({requestId, timestamp, dataLength, encodedDataLength}: Protocol.Network.DataReceivedEvent): void {
-    let networkRequest: NetworkRequest|null|undefined = this.requestsById.get(requestId);
+    let networkRequest: NetworkRequest|null|undefined = this.#requestsById.get(requestId);
     if (!networkRequest) {
       networkRequest = this.maybeAdoptMainResourceRequest(requestId);
     }
@@ -629,7 +633,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
 
   loadingFinished({requestId, timestamp: finishTime, encodedDataLength, shouldReportCorbBlocking}:
                       Protocol.Network.LoadingFinishedEvent): void {
-    let networkRequest: NetworkRequest|null|undefined = this.requestsById.get(requestId);
+    let networkRequest: NetworkRequest|null|undefined = this.#requestsById.get(requestId);
     if (!networkRequest) {
       networkRequest = this.maybeAdoptMainResourceRequest(requestId);
     }
@@ -638,7 +642,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     }
     this.getExtraInfoBuilder(requestId).finished();
     this.finishNetworkRequest(networkRequest, finishTime, encodedDataLength, shouldReportCorbBlocking);
-    this.manager.dispatchEventToListeners(Events.LoadingFinished, networkRequest);
+    this.#manager.dispatchEventToListeners(Events.LoadingFinished, networkRequest);
   }
 
   loadingFailed({
@@ -650,7 +654,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     blockedReason,
     corsErrorStatus,
   }: Protocol.Network.LoadingFailedEvent): void {
-    const networkRequest = this.requestsById.get(requestId);
+    const networkRequest = this.#requestsById.get(requestId);
     if (!networkRequest) {
       return;
     }
@@ -662,7 +666,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
       networkRequest.setBlockedReason(blockedReason);
       if (blockedReason === Protocol.Network.BlockedReason.Inspector) {
         const message = i18nString(UIStrings.requestWasBlockedByDevtoolsS, {PH1: networkRequest.url()});
-        this.manager.dispatchEventToListeners(
+        this.#manager.dispatchEventToListeners(
             Events.MessageGenerated, {message: message, requestId: requestId, warning: true});
       }
     }
@@ -676,14 +680,14 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
 
   webSocketCreated({requestId, url: requestURL, initiator}: Protocol.Network.WebSocketCreatedEvent): void {
     const networkRequest = NetworkRequest.createForWebSocket(requestId, requestURL, initiator);
-    requestToManagerMap.set(networkRequest, this.manager);
+    requestToManagerMap.set(networkRequest, this.#manager);
     networkRequest.setResourceType(Common.ResourceType.resourceTypes.WebSocket);
     this.startNetworkRequest(networkRequest, null);
   }
 
   webSocketWillSendHandshakeRequest({requestId, timestamp: time, wallTime, request}:
                                         Protocol.Network.WebSocketWillSendHandshakeRequestEvent): void {
-    const networkRequest = this.requestsById.get(requestId);
+    const networkRequest = this.#requestsById.get(requestId);
     if (!networkRequest) {
       return;
     }
@@ -697,7 +701,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
 
   webSocketHandshakeResponseReceived({requestId, timestamp: time, response}:
                                          Protocol.Network.WebSocketHandshakeResponseReceivedEvent): void {
-    const networkRequest = this.requestsById.get(requestId);
+    const networkRequest = this.#requestsById.get(requestId);
     if (!networkRequest) {
       return;
     }
@@ -719,7 +723,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
   }
 
   webSocketFrameReceived({requestId, timestamp: time, response}: Protocol.Network.WebSocketFrameReceivedEvent): void {
-    const networkRequest = this.requestsById.get(requestId);
+    const networkRequest = this.#requestsById.get(requestId);
     if (!networkRequest) {
       return;
     }
@@ -731,7 +735,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
   }
 
   webSocketFrameSent({requestId, timestamp: time, response}: Protocol.Network.WebSocketFrameSentEvent): void {
-    const networkRequest = this.requestsById.get(requestId);
+    const networkRequest = this.#requestsById.get(requestId);
     if (!networkRequest) {
       return;
     }
@@ -743,7 +747,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
   }
 
   webSocketFrameError({requestId, timestamp: time, errorMessage}: Protocol.Network.WebSocketFrameErrorEvent): void {
-    const networkRequest = this.requestsById.get(requestId);
+    const networkRequest = this.#requestsById.get(requestId);
     if (!networkRequest) {
       return;
     }
@@ -755,7 +759,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
   }
 
   webSocketClosed({requestId, timestamp: time}: Protocol.Network.WebSocketClosedEvent): void {
-    const networkRequest = this.requestsById.get(requestId);
+    const networkRequest = this.#requestsById.get(requestId);
     if (!networkRequest) {
       return;
     }
@@ -764,7 +768,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
 
   eventSourceMessageReceived({requestId, timestamp: time, eventName, eventId, data}:
                                  Protocol.Network.EventSourceMessageReceivedEvent): void {
-    const networkRequest = this.requestsById.get(requestId);
+    const networkRequest = this.#requestsById.get(requestId);
     if (!networkRequest) {
       return;
     }
@@ -786,7 +790,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     requestId,
   }: Protocol.Network.RequestInterceptedEvent): void {
     MultitargetNetworkManager.instance().requestIntercepted(new InterceptedRequest(
-        this.manager.target().networkAgent(), interceptionId, request, frameId, resourceType, isNavigationRequest,
+        this.#manager.target().networkAgent(), interceptionId, request, frameId, resourceType, isNavigationRequest,
         isDownload, redirectUrl, authChallenge, responseErrorReason, responseStatusCode, responseHeaders, requestId));
   }
 
@@ -831,17 +835,17 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
 
   private getExtraInfoBuilder(requestId: string): ExtraInfoBuilder {
     let builder: ExtraInfoBuilder;
-    if (!this.requestIdToExtraInfoBuilder.has(requestId)) {
+    if (!this.#requestIdToExtraInfoBuilder.has(requestId)) {
       builder = new ExtraInfoBuilder();
-      this.requestIdToExtraInfoBuilder.set(requestId, builder);
+      this.#requestIdToExtraInfoBuilder.set(requestId, builder);
     } else {
-      builder = (this.requestIdToExtraInfoBuilder.get(requestId) as ExtraInfoBuilder);
+      builder = (this.#requestIdToExtraInfoBuilder.get(requestId) as ExtraInfoBuilder);
     }
     return builder;
   }
 
   private appendRedirect(requestId: Protocol.Network.RequestId, time: number, redirectURL: string): NetworkRequest {
-    const originalNetworkRequest = this.requestsById.get(requestId);
+    const originalNetworkRequest = this.#requestsById.get(requestId);
     if (!originalNetworkRequest) {
       throw new Error(`Could not find original network request for ${requestId}`);
     }
@@ -855,7 +859,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     const newNetworkRequest = NetworkRequest.create(
         requestId, redirectURL, originalNetworkRequest.documentURL, originalNetworkRequest.frameId,
         originalNetworkRequest.loaderId, originalNetworkRequest.initiator());
-    requestToManagerMap.set(newNetworkRequest, this.manager);
+    requestToManagerMap.set(newNetworkRequest, this.#manager);
     newNetworkRequest.setRedirectSource(originalNetworkRequest);
     originalNetworkRequest.setRedirectDestination(newNetworkRequest);
     return newNetworkRequest;
@@ -867,28 +871,28 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
       return null;
     }
     const oldDispatcher = (NetworkManager.forRequest(request) as NetworkManager).dispatcher;
-    oldDispatcher.requestsById.delete(requestId);
-    oldDispatcher.requestsByURL.delete(request.url());
-    this.requestsById.set(requestId, request);
-    this.requestsByURL.set(request.url(), request);
-    requestToManagerMap.set(request, this.manager);
+    oldDispatcher.#requestsById.delete(requestId);
+    oldDispatcher.#requestsByURL.delete(request.url());
+    this.#requestsById.set(requestId, request);
+    this.#requestsByURL.set(request.url(), request);
+    requestToManagerMap.set(request, this.#manager);
     return request;
   }
 
   private startNetworkRequest(networkRequest: NetworkRequest, originalRequest: Protocol.Network.Request|null): void {
-    this.requestsById.set(networkRequest.requestId(), networkRequest);
-    this.requestsByURL.set(networkRequest.url(), networkRequest);
+    this.#requestsById.set(networkRequest.requestId(), networkRequest);
+    this.#requestsByURL.set(networkRequest.url(), networkRequest);
     // The following relies on the fact that loaderIds and requestIds are
     // globally unique and that the main request has them equal.
     if (networkRequest.loaderId === networkRequest.requestId()) {
       MultitargetNetworkManager.instance().inflightMainResourceRequests.set(networkRequest.requestId(), networkRequest);
     }
 
-    this.manager.dispatchEventToListeners(Events.RequestStarted, {request: networkRequest, originalRequest});
+    this.#manager.dispatchEventToListeners(Events.RequestStarted, {request: networkRequest, originalRequest});
   }
 
   private updateNetworkRequest(networkRequest: NetworkRequest): void {
-    this.manager.dispatchEventToListeners(Events.RequestUpdated, networkRequest);
+    this.#manager.dispatchEventToListeners(Events.RequestUpdated, networkRequest);
   }
 
   private finishNetworkRequest(
@@ -906,13 +910,13 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
         networkRequest.setTransferSize(encodedDataLength);
       }
     }
-    this.manager.dispatchEventToListeners(Events.RequestFinished, networkRequest);
+    this.#manager.dispatchEventToListeners(Events.RequestFinished, networkRequest);
     MultitargetNetworkManager.instance().inflightMainResourceRequests.delete(networkRequest.requestId());
 
     if (shouldReportCorbBlocking) {
       const message =
           i18nString(UIStrings.crossoriginReadBlockingCorb, {PH1: networkRequest.url(), PH2: networkRequest.mimeType});
-      this.manager.dispatchEventToListeners(
+      this.#manager.dispatchEventToListeners(
           Events.MessageGenerated, {message: message, requestId: networkRequest.requestId(), warning: true});
     }
 
@@ -930,22 +934,22 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
             {PH1: networkRequest.resourceType().title(), PH2: networkRequest.requestMethod, PH3: networkRequest.url()});
       }
 
-      this.manager.dispatchEventToListeners(
+      this.#manager.dispatchEventToListeners(
           Events.MessageGenerated, {message: message, requestId: networkRequest.requestId(), warning: false});
     }
   }
 
   clearRequests(): void {
-    this.requestsById.clear();
-    this.requestsByURL.clear();
-    this.requestIdToExtraInfoBuilder.clear();
+    this.#requestsById.clear();
+    this.#requestsByURL.clear();
+    this.#requestIdToExtraInfoBuilder.clear();
   }
 
   webTransportCreated({transportId, url: requestURL, timestamp: time, initiator}:
                           Protocol.Network.WebTransportCreatedEvent): void {
     const networkRequest = NetworkRequest.createForWebSocket(transportId, requestURL, initiator);
     networkRequest.hasNetworkData = true;
-    requestToManagerMap.set(networkRequest, this.manager);
+    requestToManagerMap.set(networkRequest, this.#manager);
     networkRequest.setResourceType(Common.ResourceType.resourceTypes.WebTransport);
     networkRequest.setIssueTime(time, 0);
     // TODO(yoichio): Add appropreate events to address abort cases.
@@ -954,7 +958,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
 
   webTransportConnectionEstablished({transportId, timestamp: time}:
                                         Protocol.Network.WebTransportConnectionEstablishedEvent): void {
-    const networkRequest = this.requestsById.get(transportId);
+    const networkRequest = this.#requestsById.get(transportId);
     if (!networkRequest) {
       return;
     }
@@ -969,7 +973,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
   }
 
   webTransportClosed({transportId, timestamp: time}: Protocol.Network.WebTransportClosedEvent): void {
-    const networkRequest = this.requestsById.get(transportId);
+    const networkRequest = this.#requestsById.get(transportId);
     if (!networkRequest) {
       return;
     }
@@ -979,9 +983,9 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
   }
 
   trustTokenOperationDone(event: Protocol.Network.TrustTokenOperationDoneEvent): void {
-    const request = this.requestsById.get(event.requestId);
+    const request = this.#requestsById.get(event.requestId);
     if (!request) {
-      this.requestIdToTrustTokenEvent.set(event.requestId, event);
+      this.#requestIdToTrustTokenEvent.set(event.requestId, event);
       return;
     }
     request.setTrustTokenOperationDoneEvent(event);
@@ -1028,11 +1032,11 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
   }
 
   reportingApiReportAdded(data: Protocol.Network.ReportingApiReportAddedEvent): void {
-    this.manager.dispatchEventToListeners(Events.ReportingApiReportAdded, data.report);
+    this.#manager.dispatchEventToListeners(Events.ReportingApiReportAdded, data.report);
   }
 
   reportingApiReportUpdated(data: Protocol.Network.ReportingApiReportUpdatedEvent): void {
-    this.manager.dispatchEventToListeners(Events.ReportingApiReportUpdated, data.report);
+    this.#manager.dispatchEventToListeners(Events.ReportingApiReportUpdated, data.report);
   }
 
   /**
@@ -1043,7 +1047,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
       requestId: Protocol.Network.RequestId, frameId: Protocol.Page.FrameId, loaderId: Protocol.Network.LoaderId,
       url: string, documentURL: string, initiator: Protocol.Network.Initiator|null): NetworkRequest {
     const request = NetworkRequest.create(requestId, url, documentURL, frameId, loaderId, initiator);
-    requestToManagerMap.set(request, this.manager);
+    requestToManagerMap.set(request, this.#manager);
     return request;
   }
 }
@@ -1052,38 +1056,38 @@ let multiTargetNetworkManagerInstance: MultitargetNetworkManager|null;
 
 export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrapper<MultitargetNetworkManager.EventTypes>
     implements SDKModelObserver<NetworkManager> {
-  private userAgentOverrideInternal: string;
-  private userAgentMetadataOverride: Protocol.Emulation.UserAgentMetadata|null;
-  private customAcceptedEncodings: Protocol.Network.ContentEncoding[]|null;
-  private readonly agents: Set<ProtocolProxyApi.NetworkApi>;
+  #userAgentOverrideInternal: string;
+  #userAgentMetadataOverride: Protocol.Emulation.UserAgentMetadata|null;
+  #customAcceptedEncodings: Protocol.Network.ContentEncoding[]|null;
+  readonly #agents: Set<ProtocolProxyApi.NetworkApi>;
   readonly inflightMainResourceRequests: Map<string, NetworkRequest>;
-  private networkConditionsInternal: Conditions;
-  private updatingInterceptionPatternsPromise: Promise<void>|null;
-  private readonly blockingEnabledSetting: Common.Settings.Setting<boolean>;
-  private readonly blockedPatternsSetting: Common.Settings.Setting<BlockedPattern[]>;
-  private effectiveBlockedURLs: string[];
-  private readonly urlsForRequestInterceptor:
+  #networkConditionsInternal: Conditions;
+  #updatingInterceptionPatternsPromise: Promise<void>|null;
+  readonly #blockingEnabledSetting: Common.Settings.Setting<boolean>;
+  readonly #blockedPatternsSetting: Common.Settings.Setting<BlockedPattern[]>;
+  #effectiveBlockedURLs: string[];
+  readonly #urlsForRequestInterceptor:
       Platform.MapUtilities.Multimap<(arg0: InterceptedRequest) => Promise<void>, InterceptionPattern>;
-  private extraHeaders?: Protocol.Network.Headers;
-  private customUserAgent?: string;
+  #extraHeaders?: Protocol.Network.Headers;
+  #customUserAgent?: string;
 
   constructor() {
     super();
-    this.userAgentOverrideInternal = '';
-    this.userAgentMetadataOverride = null;
-    this.customAcceptedEncodings = null;
-    this.agents = new Set();
+    this.#userAgentOverrideInternal = '';
+    this.#userAgentMetadataOverride = null;
+    this.#customAcceptedEncodings = null;
+    this.#agents = new Set();
     this.inflightMainResourceRequests = new Map();
-    this.networkConditionsInternal = NoThrottlingConditions;
-    this.updatingInterceptionPatternsPromise = null;
+    this.#networkConditionsInternal = NoThrottlingConditions;
+    this.#updatingInterceptionPatternsPromise = null;
 
     // TODO(allada) Remove these and merge it with request interception.
-    this.blockingEnabledSetting = Common.Settings.Settings.instance().moduleSetting('requestBlockingEnabled');
-    this.blockedPatternsSetting = Common.Settings.Settings.instance().createSetting('networkBlockedPatterns', []);
-    this.effectiveBlockedURLs = [];
+    this.#blockingEnabledSetting = Common.Settings.Settings.instance().moduleSetting('requestBlockingEnabled');
+    this.#blockedPatternsSetting = Common.Settings.Settings.instance().createSetting('networkBlockedPatterns', []);
+    this.#effectiveBlockedURLs = [];
     this.updateBlockedPatterns();
 
-    this.urlsForRequestInterceptor = new Platform.MapUtilities.Multimap();
+    this.#urlsForRequestInterceptor = new Platform.MapUtilities.Multimap();
 
     TargetManager.instance().observeModels(NetworkManager, this);
   }
@@ -1109,7 +1113,7 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
   }
 
   static patchUserAgentWithChromeVersion(uaString: string): string {
-    // Patches Chrome/ChrOS version from user agent ("1.2.3.4" when user agent is: "Chrome/1.2.3.4").
+    // Patches Chrome/ChrOS version from user #agent ("1.2.3.4" when user #agent is: "Chrome/1.2.3.4").
     // Otherwise, ignore it. This assumes additional appVersions appear after the Chrome version.
     const chromeVersion = MultitargetNetworkManager.getChromeVersion();
     if (chromeVersion.length > 0) {
@@ -1121,7 +1125,7 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
   }
 
   static patchUserAgentMetadataWithChromeVersion(userAgentMetadata: Protocol.Emulation.UserAgentMetadata): void {
-    // Patches Chrome/ChrOS version from user agent metadata ("1.2.3.4" when user agent is: "Chrome/1.2.3.4").
+    // Patches Chrome/ChrOS version from user #agent metadata ("1.2.3.4" when user #agent is: "Chrome/1.2.3.4").
     // Otherwise, ignore it. This assumes additional appVersions appear after the Chrome version.
     if (!userAgentMetadata.brands) {
       return;
@@ -1147,25 +1151,25 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
 
   modelAdded(networkManager: NetworkManager): void {
     const networkAgent = networkManager.target().networkAgent();
-    if (this.extraHeaders) {
-      networkAgent.invoke_setExtraHTTPHeaders({headers: this.extraHeaders});
+    if (this.#extraHeaders) {
+      networkAgent.invoke_setExtraHTTPHeaders({headers: this.#extraHeaders});
     }
     if (this.currentUserAgent()) {
       networkAgent.invoke_setUserAgentOverride(
-          {userAgent: this.currentUserAgent(), userAgentMetadata: this.userAgentMetadataOverride || undefined});
+          {userAgent: this.currentUserAgent(), userAgentMetadata: this.#userAgentMetadataOverride || undefined});
     }
-    if (this.effectiveBlockedURLs.length) {
-      networkAgent.invoke_setBlockedURLs({urls: this.effectiveBlockedURLs});
+    if (this.#effectiveBlockedURLs.length) {
+      networkAgent.invoke_setBlockedURLs({urls: this.#effectiveBlockedURLs});
     }
     if (this.isIntercepting()) {
-      networkAgent.invoke_setRequestInterception({patterns: this.urlsForRequestInterceptor.valuesArray()});
+      networkAgent.invoke_setRequestInterception({patterns: this.#urlsForRequestInterceptor.valuesArray()});
     }
-    if (this.customAcceptedEncodings === null) {
+    if (this.#customAcceptedEncodings === null) {
       networkAgent.invoke_clearAcceptedEncodingsOverride();
     } else {
-      networkAgent.invoke_setAcceptedEncodings({encodings: this.customAcceptedEncodings});
+      networkAgent.invoke_setAcceptedEncodings({encodings: this.#customAcceptedEncodings});
     }
-    this.agents.add(networkAgent);
+    this.#agents.add(networkAgent);
     if (this.isThrottling()) {
       this.updateNetworkConditions(networkAgent);
     }
@@ -1179,32 +1183,32 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
       }
       this.inflightMainResourceRequests.delete((entry[0] as string));
     }
-    this.agents.delete(networkManager.target().networkAgent());
+    this.#agents.delete(networkManager.target().networkAgent());
   }
 
   isThrottling(): boolean {
-    return this.networkConditionsInternal.download >= 0 || this.networkConditionsInternal.upload >= 0 ||
-        this.networkConditionsInternal.latency > 0;
+    return this.#networkConditionsInternal.download >= 0 || this.#networkConditionsInternal.upload >= 0 ||
+        this.#networkConditionsInternal.latency > 0;
   }
 
   isOffline(): boolean {
-    return !this.networkConditionsInternal.download && !this.networkConditionsInternal.upload;
+    return !this.#networkConditionsInternal.download && !this.#networkConditionsInternal.upload;
   }
 
   setNetworkConditions(conditions: Conditions): void {
-    this.networkConditionsInternal = conditions;
-    for (const agent of this.agents) {
+    this.#networkConditionsInternal = conditions;
+    for (const agent of this.#agents) {
       this.updateNetworkConditions(agent);
     }
     this.dispatchEventToListeners(MultitargetNetworkManager.Events.ConditionsChanged);
   }
 
   networkConditions(): Conditions {
-    return this.networkConditionsInternal;
+    return this.#networkConditionsInternal;
   }
 
   private updateNetworkConditions(networkAgent: ProtocolProxyApi.NetworkApi): void {
-    const conditions = this.networkConditionsInternal;
+    const conditions = this.#networkConditionsInternal;
     if (!this.isThrottling()) {
       networkAgent.invoke_emulateNetworkConditions(
           {offline: false, latency: 0, downloadThroughput: 0, uploadThroughput: 0});
@@ -1220,32 +1224,32 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
   }
 
   setExtraHTTPHeaders(headers: Protocol.Network.Headers): void {
-    this.extraHeaders = headers;
-    for (const agent of this.agents) {
-      agent.invoke_setExtraHTTPHeaders({headers: this.extraHeaders});
+    this.#extraHeaders = headers;
+    for (const agent of this.#agents) {
+      agent.invoke_setExtraHTTPHeaders({headers: this.#extraHeaders});
     }
   }
 
   currentUserAgent(): string {
-    return this.customUserAgent ? this.customUserAgent : this.userAgentOverrideInternal;
+    return this.#customUserAgent ? this.#customUserAgent : this.#userAgentOverrideInternal;
   }
 
   private updateUserAgentOverride(): void {
     const userAgent = this.currentUserAgent();
-    for (const agent of this.agents) {
+    for (const agent of this.#agents) {
       agent.invoke_setUserAgentOverride(
-          {userAgent: userAgent, userAgentMetadata: this.userAgentMetadataOverride || undefined});
+          {userAgent: userAgent, userAgentMetadata: this.#userAgentMetadataOverride || undefined});
     }
   }
 
   setUserAgentOverride(userAgent: string, userAgentMetadataOverride: Protocol.Emulation.UserAgentMetadata|null): void {
-    const uaChanged = (this.userAgentOverrideInternal !== userAgent);
-    this.userAgentOverrideInternal = userAgent;
-    if (!this.customUserAgent) {
-      this.userAgentMetadataOverride = userAgentMetadataOverride;
+    const uaChanged = (this.#userAgentOverrideInternal !== userAgent);
+    this.#userAgentOverrideInternal = userAgent;
+    if (!this.#customUserAgent) {
+      this.#userAgentMetadataOverride = userAgentMetadataOverride;
       this.updateUserAgentOverride();
     } else {
-      this.userAgentMetadataOverride = null;
+      this.#userAgentMetadataOverride = null;
     }
 
     if (uaChanged) {
@@ -1254,35 +1258,35 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
   }
 
   userAgentOverride(): string {
-    return this.userAgentOverrideInternal;
+    return this.#userAgentOverrideInternal;
   }
 
   setCustomUserAgentOverride(
       userAgent: string, userAgentMetadataOverride: Protocol.Emulation.UserAgentMetadata|null = null): void {
-    this.customUserAgent = userAgent;
-    this.userAgentMetadataOverride = userAgentMetadataOverride;
+    this.#customUserAgent = userAgent;
+    this.#userAgentMetadataOverride = userAgentMetadataOverride;
     this.updateUserAgentOverride();
   }
 
   setCustomAcceptedEncodingsOverride(acceptedEncodings: Protocol.Network.ContentEncoding[]): void {
-    this.customAcceptedEncodings = acceptedEncodings;
+    this.#customAcceptedEncodings = acceptedEncodings;
     this.updateAcceptedEncodingsOverride();
     this.dispatchEventToListeners(MultitargetNetworkManager.Events.AcceptedEncodingsChanged);
   }
 
   clearCustomAcceptedEncodingsOverride(): void {
-    this.customAcceptedEncodings = null;
+    this.#customAcceptedEncodings = null;
     this.updateAcceptedEncodingsOverride();
     this.dispatchEventToListeners(MultitargetNetworkManager.Events.AcceptedEncodingsChanged);
   }
 
   isAcceptedEncodingOverrideSet(): boolean {
-    return this.customAcceptedEncodings !== null;
+    return this.#customAcceptedEncodings !== null;
   }
 
   private updateAcceptedEncodingsOverride(): void {
-    const customAcceptedEncodings = this.customAcceptedEncodings;
-    for (const agent of this.agents) {
+    const customAcceptedEncodings = this.#customAcceptedEncodings;
+    for (const agent of this.#agents) {
       if (customAcceptedEncodings === null) {
         agent.invoke_clearAcceptedEncodingsOverride();
       } else {
@@ -1293,88 +1297,88 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
 
   // TODO(allada) Move all request blocking into interception and let view manage blocking.
   blockedPatterns(): BlockedPattern[] {
-    return this.blockedPatternsSetting.get().slice();
+    return this.#blockedPatternsSetting.get().slice();
   }
 
   blockingEnabled(): boolean {
-    return this.blockingEnabledSetting.get();
+    return this.#blockingEnabledSetting.get();
   }
 
   isBlocking(): boolean {
-    return Boolean(this.effectiveBlockedURLs.length);
+    return Boolean(this.#effectiveBlockedURLs.length);
   }
 
   setBlockedPatterns(patterns: BlockedPattern[]): void {
-    this.blockedPatternsSetting.set(patterns);
+    this.#blockedPatternsSetting.set(patterns);
     this.updateBlockedPatterns();
     this.dispatchEventToListeners(MultitargetNetworkManager.Events.BlockedPatternsChanged);
   }
 
   setBlockingEnabled(enabled: boolean): void {
-    if (this.blockingEnabledSetting.get() === enabled) {
+    if (this.#blockingEnabledSetting.get() === enabled) {
       return;
     }
-    this.blockingEnabledSetting.set(enabled);
+    this.#blockingEnabledSetting.set(enabled);
     this.updateBlockedPatterns();
     this.dispatchEventToListeners(MultitargetNetworkManager.Events.BlockedPatternsChanged);
   }
 
   private updateBlockedPatterns(): void {
     const urls = [];
-    if (this.blockingEnabledSetting.get()) {
-      for (const pattern of this.blockedPatternsSetting.get()) {
+    if (this.#blockingEnabledSetting.get()) {
+      for (const pattern of this.#blockedPatternsSetting.get()) {
         if (pattern.enabled) {
           urls.push(pattern.url);
         }
       }
     }
 
-    if (!urls.length && !this.effectiveBlockedURLs.length) {
+    if (!urls.length && !this.#effectiveBlockedURLs.length) {
       return;
     }
-    this.effectiveBlockedURLs = urls;
-    for (const agent of this.agents) {
-      agent.invoke_setBlockedURLs({urls: this.effectiveBlockedURLs});
+    this.#effectiveBlockedURLs = urls;
+    for (const agent of this.#agents) {
+      agent.invoke_setBlockedURLs({urls: this.#effectiveBlockedURLs});
     }
   }
 
   isIntercepting(): boolean {
-    return Boolean(this.urlsForRequestInterceptor.size);
+    return Boolean(this.#urlsForRequestInterceptor.size);
   }
 
   setInterceptionHandlerForPatterns(
       patterns: InterceptionPattern[], requestInterceptor: (arg0: InterceptedRequest) => Promise<void>): Promise<void> {
-    // Note: requestInterceptors may recieve interception requests for patterns they did not subscribe to.
-    this.urlsForRequestInterceptor.deleteAll(requestInterceptor);
+    // Note: requestInterceptors may recieve interception #requests for patterns they did not subscribe to.
+    this.#urlsForRequestInterceptor.deleteAll(requestInterceptor);
     for (const newPattern of patterns) {
-      this.urlsForRequestInterceptor.set(requestInterceptor, newPattern);
+      this.#urlsForRequestInterceptor.set(requestInterceptor, newPattern);
     }
     return this.updateInterceptionPatternsOnNextTick();
   }
 
   private updateInterceptionPatternsOnNextTick(): Promise<void> {
     // This is used so we can register and unregister patterns in loops without sending lots of protocol messages.
-    if (!this.updatingInterceptionPatternsPromise) {
-      this.updatingInterceptionPatternsPromise = Promise.resolve().then(this.updateInterceptionPatterns.bind(this));
+    if (!this.#updatingInterceptionPatternsPromise) {
+      this.#updatingInterceptionPatternsPromise = Promise.resolve().then(this.updateInterceptionPatterns.bind(this));
     }
-    return this.updatingInterceptionPatternsPromise;
+    return this.#updatingInterceptionPatternsPromise;
   }
 
   private async updateInterceptionPatterns(): Promise<void> {
     if (!Common.Settings.Settings.instance().moduleSetting('cacheDisabled').get()) {
       Common.Settings.Settings.instance().moduleSetting('cacheDisabled').set(true);
     }
-    this.updatingInterceptionPatternsPromise = null;
+    this.#updatingInterceptionPatternsPromise = null;
     const promises = ([] as Promise<unknown>[]);
-    for (const agent of this.agents) {
-      promises.push(agent.invoke_setRequestInterception({patterns: this.urlsForRequestInterceptor.valuesArray()}));
+    for (const agent of this.#agents) {
+      promises.push(agent.invoke_setRequestInterception({patterns: this.#urlsForRequestInterceptor.valuesArray()}));
     }
     this.dispatchEventToListeners(MultitargetNetworkManager.Events.InterceptorsChanged);
     await Promise.all(promises);
   }
 
   async requestIntercepted(interceptedRequest: InterceptedRequest): Promise<void> {
-    for (const requestInterceptor of this.urlsForRequestInterceptor.keysArray()) {
+    for (const requestInterceptor of this.#urlsForRequestInterceptor.keysArray()) {
       await requestInterceptor(interceptedRequest);
       if (interceptedRequest.hasResponded()) {
         return;
@@ -1386,13 +1390,13 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
   }
 
   clearBrowserCache(): void {
-    for (const agent of this.agents) {
+    for (const agent of this.#agents) {
       agent.invoke_clearBrowserCache();
     }
   }
 
   clearBrowserCookies(): void {
-    for (const agent of this.agents) {
+    for (const agent of this.#agents) {
       agent.invoke_clearBrowserCookies();
     }
   }
@@ -1455,9 +1459,9 @@ export namespace MultitargetNetworkManager {
 }
 
 export class InterceptedRequest {
-  private readonly networkAgent: ProtocolProxyApi.NetworkApi;
-  private readonly interceptionId: Protocol.Network.InterceptionId;
-  private hasRespondedInternal: boolean;
+  readonly #networkAgent: ProtocolProxyApi.NetworkApi;
+  readonly #interceptionId: Protocol.Network.InterceptionId;
+  #hasRespondedInternal: boolean;
   request: Protocol.Network.Request;
   frameId: Protocol.Page.FrameId;
   resourceType: Protocol.Network.ResourceType;
@@ -1476,9 +1480,9 @@ export class InterceptedRequest {
       isNavigationRequest: boolean, isDownload?: boolean, redirectUrl?: string,
       authChallenge?: Protocol.Network.AuthChallenge, responseErrorReason?: Protocol.Network.ErrorReason,
       responseStatusCode?: number, responseHeaders?: Protocol.Network.Headers, requestId?: string) {
-    this.networkAgent = networkAgent;
-    this.interceptionId = interceptionId;
-    this.hasRespondedInternal = false;
+    this.#networkAgent = networkAgent;
+    this.#interceptionId = interceptionId;
+    this.#hasRespondedInternal = false;
     this.request = request;
     this.frameId = frameId;
     this.resourceType = resourceType;
@@ -1493,11 +1497,11 @@ export class InterceptedRequest {
   }
 
   hasResponded(): boolean {
-    return this.hasRespondedInternal;
+    return this.#hasRespondedInternal;
   }
 
   async continueRequestWithContent(contentBlob: Blob): Promise<void> {
-    this.hasRespondedInternal = true;
+    this.#hasRespondedInternal = true;
     const headers = [
       'HTTP/1.1 200 OK',
       'Date: ' + (new Date()).toUTCString(),
@@ -1507,8 +1511,8 @@ export class InterceptedRequest {
       'Content-Type: ' + contentBlob.type || 'text/x-unknown',
     ];
     const encodedResponse = await blobToBase64(new Blob([headers.join('\r\n'), '\r\n\r\n', contentBlob]));
-    this.networkAgent.invoke_continueInterceptedRequest(
-        {interceptionId: this.interceptionId, rawResponse: encodedResponse});
+    this.#networkAgent.invoke_continueInterceptedRequest(
+        {interceptionId: this.#interceptionId, rawResponse: encodedResponse});
 
     async function blobToBase64(blob: Blob): Promise<string> {
       const reader = new FileReader();
@@ -1531,113 +1535,113 @@ export class InterceptedRequest {
   }
 
   continueRequestWithoutChange(): void {
-    console.assert(!this.hasRespondedInternal);
-    this.hasRespondedInternal = true;
-    this.networkAgent.invoke_continueInterceptedRequest({interceptionId: this.interceptionId});
+    console.assert(!this.#hasRespondedInternal);
+    this.#hasRespondedInternal = true;
+    this.#networkAgent.invoke_continueInterceptedRequest({interceptionId: this.#interceptionId});
   }
 
   continueRequestWithError(errorReason: Protocol.Network.ErrorReason): void {
-    console.assert(!this.hasRespondedInternal);
-    this.hasRespondedInternal = true;
-    this.networkAgent.invoke_continueInterceptedRequest({interceptionId: this.interceptionId, errorReason});
+    console.assert(!this.#hasRespondedInternal);
+    this.#hasRespondedInternal = true;
+    this.#networkAgent.invoke_continueInterceptedRequest({interceptionId: this.#interceptionId, errorReason});
   }
 
   async responseBody(): Promise<ContentData> {
     const response =
-        await this.networkAgent.invoke_getResponseBodyForInterception({interceptionId: this.interceptionId});
+        await this.#networkAgent.invoke_getResponseBodyForInterception({interceptionId: this.#interceptionId});
     const error = response.getError() || null;
     return {error: error, content: error ? null : response.body, encoded: response.base64Encoded};
   }
 }
 
 /**
- * Helper class to match requests created from requestWillBeSent with
+ * Helper class to match #requests created from requestWillBeSent with
  * requestWillBeSentExtraInfo and responseReceivedExtraInfo when they have the
  * same requestId due to redirects.
  */
 class ExtraInfoBuilder {
-  private readonly requests: NetworkRequest[];
-  private requestExtraInfos: (ExtraRequestInfo|null)[];
-  private responseExtraInfos: (ExtraResponseInfo|null)[];
-  private finishedInternal: boolean;
-  private hasExtraInfo: boolean;
-  private webBundleInfo: WebBundleInfo|null;
-  private webBundleInnerRequestInfo: WebBundleInnerRequestInfo|null;
+  readonly #requests: NetworkRequest[];
+  #requestExtraInfos: (ExtraRequestInfo|null)[];
+  #responseExtraInfos: (ExtraResponseInfo|null)[];
+  #finishedInternal: boolean;
+  #hasExtraInfo: boolean;
+  #webBundleInfo: WebBundleInfo|null;
+  #webBundleInnerRequestInfo: WebBundleInnerRequestInfo|null;
 
   constructor() {
-    this.requests = [];
-    this.requestExtraInfos = [];
-    this.responseExtraInfos = [];
-    this.finishedInternal = false;
-    this.hasExtraInfo = false;
-    this.webBundleInfo = null;
-    this.webBundleInnerRequestInfo = null;
+    this.#requests = [];
+    this.#requestExtraInfos = [];
+    this.#responseExtraInfos = [];
+    this.#finishedInternal = false;
+    this.#hasExtraInfo = false;
+    this.#webBundleInfo = null;
+    this.#webBundleInnerRequestInfo = null;
   }
 
   addRequest(req: NetworkRequest): void {
-    this.requests.push(req);
-    this.sync(this.requests.length - 1);
+    this.#requests.push(req);
+    this.sync(this.#requests.length - 1);
   }
 
   addRequestExtraInfo(info: ExtraRequestInfo): void {
-    this.hasExtraInfo = true;
-    this.requestExtraInfos.push(info);
-    this.sync(this.requestExtraInfos.length - 1);
+    this.#hasExtraInfo = true;
+    this.#requestExtraInfos.push(info);
+    this.sync(this.#requestExtraInfos.length - 1);
   }
 
   addResponseExtraInfo(info: ExtraResponseInfo): void {
-    this.responseExtraInfos.push(info);
-    this.sync(this.responseExtraInfos.length - 1);
+    this.#responseExtraInfos.push(info);
+    this.sync(this.#responseExtraInfos.length - 1);
   }
 
   setWebBundleInfo(info: WebBundleInfo): void {
-    this.webBundleInfo = info;
+    this.#webBundleInfo = info;
     this.updateFinalRequest();
   }
 
   setWebBundleInnerRequestInfo(info: WebBundleInnerRequestInfo): void {
-    this.webBundleInnerRequestInfo = info;
+    this.#webBundleInnerRequestInfo = info;
     this.updateFinalRequest();
   }
 
   finished(): void {
-    this.finishedInternal = true;
+    this.#finishedInternal = true;
     this.updateFinalRequest();
   }
 
   private sync(index: number): void {
-    const req = this.requests[index];
+    const req = this.#requests[index];
     if (!req) {
       return;
     }
 
-    const requestExtraInfo = this.requestExtraInfos[index];
+    const requestExtraInfo = this.#requestExtraInfos[index];
     if (requestExtraInfo) {
       req.addExtraRequestInfo(requestExtraInfo);
-      this.requestExtraInfos[index] = null;
+      this.#requestExtraInfos[index] = null;
     }
 
-    const responseExtraInfo = this.responseExtraInfos[index];
+    const responseExtraInfo = this.#responseExtraInfos[index];
     if (responseExtraInfo) {
       req.addExtraResponseInfo(responseExtraInfo);
-      this.responseExtraInfos[index] = null;
+      this.#responseExtraInfos[index] = null;
     }
   }
 
   finalRequest(): NetworkRequest|null {
-    if (!this.finishedInternal) {
+    if (!this.#finishedInternal) {
       return null;
     }
-    return this.requests[this.requests.length - 1] || null;
+    return this.#requests[this.#requests.length - 1] || null;
   }
 
   private updateFinalRequest(): void {
-    if (!this.finishedInternal) {
+    if (!this.#finishedInternal) {
       return;
     }
     const finalRequest = this.finalRequest();
-    finalRequest?.setWebBundleInfo(this.webBundleInfo);
-    finalRequest?.setWebBundleInnerRequestInfo(this.webBundleInnerRequestInfo);
+    finalRequest?.setWebBundleInfo(this.#webBundleInfo);
+    finalRequest?.setWebBundleInnerRequestInfo(this.#webBundleInnerRequestInfo);
   }
 }