chrome-devtools-frontend 1.0.1603822 → 1.0.1605219

package/front_end/core/host/GcaTypes.ts

@@ -168,40 +168,40 @@ export enum Mode {
   NONE = 3,
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface GenerateContentRequest {
   model?: string;
-  aicode?: AiCodeConfig;
+  aicode: AiCodeConfig;
   contents: Content[];
-  system_instruction?: Content;
+  systemInstruction?: Content;
   tools?: Tool[];
-  tool_config?: ToolConfig;
+  toolConfig?: ToolConfig;
   labels?: Record<string, string>;
-  safety_settings?: SafetySetting[];
-  generation_config?: GenerationConfig;
-  session_id?: string;
+  safetySettings?: SafetySetting[];
+  generationConfig?: GenerationConfig;
+  sessionId?: string;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
 export interface AiCodeConfig {
   experience: string;
   files?: SourceFile[];
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface SourceFile {
-  inclusion_reason?: InclusionReason[];
-  file_uri: string;
-  programming_language?: string;
+  inclusionReason?: InclusionReason[];
+  fileUri: string;
+  programmingLanguage?: string;
+  segments?: FileSegment[];
+}
+
+export interface FileSegment {
+  content: string;
+  isSelected: boolean;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface FileEdit {
-  file_uri: string;
+  fileUri: string;
   content: string;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
 export type Role = 'user'|'model';
 
@@ -210,34 +210,28 @@ export interface Content {
   role: Role;
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface Part {
   text?: string;
-  inline_data?: Blob;
-  file_data?: FileData;
-  function_call?: FunctionCall;
-  function_response?: FunctionResponse;
-  executable_code?: ExecutableCode;
-  code_execution_result?: CodeExecutionResult;
-  video_metadata?: VideoMetadata;
+  inlineData?: Blob;
+  fileData?: FileData;
+  functionCall?: FunctionCall;
+  functionResponse?: FunctionResponse;
+  executableCode?: ExecutableCode;
+  codeExecutionResult?: CodeExecutionResult;
+  videoMetadata?: VideoMetadata;
   thought?: boolean;
-  thought_signature?: string;  // bytes as base64 string
+  thoughtSignature?: string;  // bytes as base64 string
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface Blob {
-  mime_type: string;
+  mimeType: string;
   data: string;  // bytes as base64 string
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface FileData {
-  mime_type: string;
-  file_uri: string;
+  mimeType: string;
+  fileUri: string;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
 export interface FunctionCall {
   name: string;
@@ -261,30 +255,25 @@ export interface CodeExecutionResult {
   output: string;
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface Tool {
-  function_declarations?: FunctionDeclaration[];
-  google_search?: {
-    time_range_filter?: {
-      start_time?: string,  // Timestamp
-      end_time?: string,    // Timestamp
+  functionDeclarations?: FunctionDeclaration[];
+  googleSearch?: {
+    timeRangeFilter?: {
+      startTime?: string,  // Timestamp
+      endTime?: string,    // Timestamp
     },
   };
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface FunctionDeclaration {
   name: string;
   description: string;
   parameters?: Schema;
-  parameters_json_schema?: unknown;  // google.protobuf.Value
+  parametersJsonSchema?: unknown;  // google.protobuf.Value
   response?: Schema;
-  response_json_schema?: unknown;  // google.protobuf.Value
+  responseJsonSchema?: unknown;  // google.protobuf.Value
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface Schema {
   type?: Type;
   format?: string;
@@ -296,25 +285,20 @@ export interface Schema {
   required?: string[];
   minimum?: number;
   maximum?: number;
-  min_length?: number;
-  max_length?: number;
+  minLength?: number;
+  maxLength?: number;
   pattern?: string;
   example?: unknown;  // google.protobuf.Value
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface ToolConfig {
-  function_calling_config?: FunctionCallingConfig;
+  functionCallingConfig?: FunctionCallingConfig;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface FunctionCallingConfig {
   mode: Mode;
-  allowed_function_names?: string[];
+  allowedFunctionNames?: string[];
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
 export interface SafetySetting {
   category: HarmCategory;
@@ -322,52 +306,44 @@ export interface SafetySetting {
   method?: HarmBlockMethod;
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface GenerationConfig {
-  candidate_count?: number;
-  stop_sequences?: string[];
-  max_output_tokens?: number;
+  candidateCount?: number;
+  stopSequences?: string[];
+  maxOutputTokens?: number;
   temperature?: number;
-  top_p?: number;
-  top_k?: number;
+  topP?: number;
+  topK?: number;
   seed?: number;
-  response_mime_type?: string;
-  response_schema?: Schema;
-  response_json_schema?: unknown;  // google.protobuf.Value
-  presence_penalty?: number;
-  frequency_penalty?: number;
-  thinking_config?: ThinkingConfig;
+  responseMimeType?: string;
+  responseSchema?: Schema;
+  responseJsonSchema?: unknown;  // google.protobuf.Value
+  presencePenalty?: number;
+  frequencyPenalty?: number;
+  thinkingConfig?: ThinkingConfig;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface ThinkingConfig {
-  include_thoughts?: boolean;
-  thinking_budget?: number;
+  includeThoughts?: boolean;
+  thinkingBudget?: number;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface GenerateContentResponse {
   candidates: Candidate[];
-  prompt_feedback: PromptFeedback;
-  usage_metadata: UsageMetadata;
-  model_version: string;
-  response_id: string;
+  promptFeedback: PromptFeedback;
+  usageMetadata: UsageMetadata;
+  modelVersion: string;
+  responseId: string;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface Candidate {
   index: number;
   content: Content;
-  finish_reason: FinishReason;
-  safety_ratings: SafetyRating[];
-  citation_metadata: CitationMetadata;
-  grounding_metadata: GroundingMetadata;
-  aicode_output: AiCodeOutput;
+  finishReason: FinishReason;
+  safetyRatings: SafetyRating[];
+  citationMetadata: CitationMetadata;
+  groundingMetadata: GroundingMetadata;
+  aicodeOutput: AiCodeOutput;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
 export interface SafetyRating {
   category: HarmCategory;
@@ -379,142 +355,118 @@ export interface CitationMetadata {
   citations: Citation[];
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface Citation {
-  start_index: number;
-  end_index: number;
+  startIndex: number;
+  endIndex: number;
   uri: string;
   license: string;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface GroundingMetadata {
-  web_search_queries?: string[];
-  search_entry_point?: {
-    rendered_content?: string,
-    sdk_blob?: string,  // bytes as base64 string
+  webSearchQueries?: string[];
+  searchEntryPoint?: {
+    renderedContent?: string,
+    sdkBlob?: string,  // bytes as base64 string
   };
-  grounding_chunks?: Array<{
+  groundingChunks?: Array<{
     web?: {
       uri?: string,
       title?: string,
     },
   }>;
-  grounding_supports?: Array<{
+  groundingSupports?: Array<{
     segment?: {
-      part_index?: number,
-      start_index?: number,
-      end_index?: number,
+      partIndex?: number,
+      startIndex?: number,
+      endIndex?: number,
       text?: string,
     },
-    grounding_chunk_indices?: number[],
-    confidence_scores?: number[],
+    groundingChunkIndices?: number[],
+    confidenceScores?: number[],
   }>;
-  retrieval_metadata?: {
-    google_search_dynamic_retrieval_score?: number,
+  retrievalMetadata?: {
+    googleSearchDynamicRetrievalScore?: number,
   };
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
 export interface AiCodeOutput {
   contents: DerivedContent[];
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface DerivedContent {
-  start_index?: number;
-  end_index?: number;
+  startIndex?: number;
+  endIndex?: number;
   file?: OutputSourceFile;
-  code_block?: CodeBlock;
-  text_block?: TextBlock;
-  prediction_metadata?: PredictionMetadata;
+  codeBlock?: CodeBlock;
+  textBlock?: TextBlock;
+  predictionMetadata?: PredictionMetadata;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface OutputSourceFile {
-  file_uri: string;
+  fileUri: string;
   content: string;
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface CodeBlock {
   content: string;
-  programming_language: string;
+  programmingLanguage: string;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
 export interface TextBlock {
   content: string;
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface PredictionMetadata {
   score: number;
-  classifier_score: number;
+  classifierScore: number;
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface PromptFeedback {
-  block_reason: BlockReason;
-  safety_ratings: SafetyRating[];
-  block_reason_message: string;
+  blockReason: BlockReason;
+  safetyRatings: SafetyRating[];
+  blockReasonMessage: string;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface UsageMetadata {
-  prompt_token_count: number;
-  candidates_token_count: number;
-  total_token_count: number;
-  thoughts_token_count: number;
-  cached_content_token_count: number;
+  promptTokenCount: number;
+  candidatesTokenCount: number;
+  totalTokenCount: number;
+  thoughtsTokenCount: number;
+  cachedContentTokenCount: number;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface VideoMetadata {
-  start_offset?: string;  // Duration
-  end_offset?: string;    // Duration
+  startOffset?: string;  // Duration
+  endOffset?: string;    // Duration
   fps?: number;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface SendTelemetryRequest {
-  feedback_metrics: FeedbackMetric[];
+  feedbackMetrics: FeedbackMetric[];
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface FeedbackMetric {
-  event_time: string;  // Timestamp
-  response_id: string;
-  suggestion_offered?: SuggestionOffered;
-  suggestion_interaction?: SuggestionInteraction;
+  eventTime: string;  // Timestamp
+  responseId: string;
+  suggestionOffered?: SuggestionOffered;
+  suggestionInteraction?: SuggestionInteraction;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface SuggestionOffered {
   method?: Method;
   status?: SuggestionStatus;
-  first_message_latency?: string;  // Duration
-  response_latency?: string;       // Duration
+  firstMessageLatency?: string;  // Duration
+  responseLatency?: string;      // Duration
   displayed?: boolean;
-  e2e_latency?: string;       // Duration
-  display_duration?: string;  // Duration
-  programming_language?: string;
+  e2eLatency?: string;       // Duration
+  displayDuration?: string;  // Duration
+  programmingLanguage?: string;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface SuggestionInteraction {
   interaction?: InteractionType;
-  accepted_lines?: number;
-  accepted_characters?: number;
-  accepted_comment_lines?: number;
-  candidate_index?: number;
+  acceptedLines?: number;
+  acceptedCharacters?: number;
+  acceptedCommentLines?: number;
+  candidateIndex?: number;
 }
-/* eslint-enable @typescript-eslint/naming-convention */

package/front_end/core/host/UserMetrics.ts

@@ -821,7 +821,6 @@ export enum DevtoolsExperiments {
   apca = 39,
   'font-editor' = 41,
   'full-accessibility-tree' = 42,
-  'experimental-cookie-features' = 45,
   'instrumentation-breakpoints' = 61,
   'use-source-map-scopes' = 76,
   'timeline-debug-mode' = 93,

package/front_end/core/host/host.ts

@@ -5,6 +5,7 @@
 import * as AidaClient from './AidaClient.js';
 import * as AidaGcaTranslation from './AidaGcaTranslation.js';
 import * as DispatchHttpRequestClient from './DispatchHttpRequestClient.js';
+import * as GcaClient from './GcaClient.js';
 import * as GcaTypes from './GcaTypes.js';
 import * as GdpClient from './GdpClient.js';
 import * as InspectorFrontendHost from './InspectorFrontendHost.js';
@@ -17,6 +18,7 @@ export {
   AidaClient,
   AidaGcaTranslation,
   DispatchHttpRequestClient,
+  GcaClient,
   GcaTypes,
   GdpClient,
   InspectorFrontendHost,

package/front_end/core/protocol_client/DevToolsCDPConnection.ts

@@ -112,7 +112,7 @@ export class DevToolsCDPConnection implements CDPConnection {
       if ('error' in response && response.error) {
         callback?.(response.error, null);
       } else if ('result' in response) {
-        callback?.(null, response.result as Object | null);
+        callback?.(null, response.result);
       }
     });
   }

package/front_end/core/root/ExperimentNames.ts

@@ -14,7 +14,6 @@ export enum ExperimentName {
   APCA = 'apca',
   FONT_EDITOR = 'font-editor',
   FULL_ACCESSIBILITY_TREE = 'full-accessibility-tree',
-  EXPERIMENTAL_COOKIE_FEATURES = 'experimental-cookie-features',
   INSTRUMENTATION_BREAKPOINTS = 'instrumentation-breakpoints',
   USE_SOURCE_MAP_SCOPES = 'use-source-map-scopes',
   TIMELINE_DEBUG_MODE = 'timeline-debug-mode',

package/front_end/core/root/Runtime.ts

@@ -602,6 +602,10 @@ interface ConsoleInsightsTeasers {
   allowWithoutGpu: boolean;
 }
 
+interface UseGcaApi {
+  enabled: boolean;
+}
+
 interface DevToolsProtocolMonitor {
   enabled: boolean;
 }
@@ -662,6 +666,7 @@ export type HostConfig = Platform.TypeScriptUtilities.RecursivePartial<{
   devToolsGeminiRebranding: HostConfigGeminiRebranding,
   devToolsProtocolMonitor: DevToolsProtocolMonitor,
   devToolsWebMCPSupport: DevToolsWebMCPSupport,
+  devToolsUseGcaApi: UseGcaApi,
 }>;
 
 /**

package/front_end/core/sdk/AutofillModel.ts

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import * as Common from '../../core/common/common.js';
+import type * as Common from '../../core/common/common.js';
 import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
 import type * as Protocol from '../../generated/protocol.js';
 import * as Host from '../host/host.js';
@@ -19,8 +19,9 @@ export class AutofillModel extends SDKModel<EventTypes> implements ProtocolProxy
     super(target);
 
     this.agent = target.autofillAgent();
+    const settings = this.target().targetManager().settings;
     this.#showTestAddressesInAutofillMenu =
-        Common.Settings.Settings.instance().createSetting('show-test-addresses-in-autofill-menu-on-event', false);
+        settings.createSetting('show-test-addresses-in-autofill-menu-on-event', false);
     this.#showTestAddressesInAutofillMenu.addChangeListener(this.#setTestAddresses, this);
     target.registerAutofillDispatcher(this);
     this.enable();

package/front_end/core/sdk/CSSModel.ts

@@ -79,10 +79,9 @@ export class CSSModel extends SDKModel<EventTypes> {
       void this.enable();
     }
 
-    this.#sourceMapManager.setEnabled(
-        Common.Settings.Settings.instance().moduleSetting<boolean>('css-source-maps-enabled').get());
-    Common.Settings.Settings.instance()
-        .moduleSetting<boolean>('css-source-maps-enabled')
+    const settings = this.target().targetManager().settings;
+    this.#sourceMapManager.setEnabled(settings.moduleSetting<boolean>('css-source-maps-enabled').get());
+    settings.moduleSetting<boolean>('css-source-maps-enabled')
         .addChangeListener(event => this.#sourceMapManager.setEnabled(event.data));
   }
 

package/front_end/core/sdk/CSSProperty.ts

@@ -225,7 +225,7 @@ export class CSSProperty extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     const range = this.range.relativeTo(this.ownerStyle.range.startLine, this.ownerStyle.range.startColumn);
     const indentation = this.ownerStyle.cssText ?
         this.detectIndentation(this.ownerStyle.cssText) :
-        Common.Settings.Settings.instance().moduleSetting('text-editor-indent').get();
+        this.ownerStyle.cssModel().target().targetManager().settings.moduleSetting('text-editor-indent').get();
     const endIndentation = this.ownerStyle.cssText ? indentation.substring(0, this.ownerStyle.range.endColumn) : '';
     const text = new TextUtils.Text.Text(this.ownerStyle.cssText || '');
     const newStyleText = text.replaceRange(range, Platform.StringUtilities.sprintf(';%s;', propertyText));

package/front_end/core/sdk/ConsoleModel.ts

@@ -153,7 +153,7 @@ export class ConsoleModel extends SDKModel<EventTypes> {
           replMode: true,
           allowUnsafeEvalBlockedByCSP: false,
         },
-        Common.Settings.Settings.instance().moduleSetting('console-user-activation-eval').get(),
+        this.target().targetManager().settings.moduleSetting('console-user-activation-eval').get(),
         /* awaitPromise */ false);
     Host.userMetrics.actionTaken(Host.UserMetrics.Action.ConsoleEvaluated);
     if ('error' in result) {
@@ -284,7 +284,8 @@ export class ConsoleModel extends SDKModel<EventTypes> {
   }
 
   private clearIfNecessary(): void {
-    if (!Common.Settings.Settings.instance().moduleSetting('preserve-console-log').get()) {
+    const settings = this.target().targetManager().settings;
+    if (!settings.moduleSetting('preserve-console-log').get()) {
       this.clear();
     }
     ++this.#pageLoadSequenceNumber;
@@ -292,7 +293,8 @@ export class ConsoleModel extends SDKModel<EventTypes> {
 
   private primaryPageChanged(
       event: Common.EventTarget.EventTargetEvent<{frame: ResourceTreeFrame, type: PrimaryPageChangeType}>): void {
-    if (Common.Settings.Settings.instance().moduleSetting('preserve-console-log').get()) {
+    const settings = this.target().targetManager().settings;
+    if (settings.moduleSetting('preserve-console-log').get()) {
       const {frame} = event.data;
       if (frame.backForwardCacheDetails.restoredFromCache) {
         Common.Console.Console.instance().log(i18nString(UIStrings.bfcacheNavigation, {PH1: frame.url}));
@@ -353,25 +355,25 @@ export class ConsoleModel extends SDKModel<EventTypes> {
   }
 
   // messages[] are not ordered by timestamp.
-  static allMessagesUnordered(): ConsoleMessage[] {
+  static allMessagesUnordered(targetManager: TargetManager = TargetManager.instance()): ConsoleMessage[] {
     const messages = [];
-    for (const target of TargetManager.instance().targets()) {
+    for (const target of targetManager.targets()) {
       const targetMessages = target.model(ConsoleModel)?.messages() || [];
       messages.push(...targetMessages);
     }
     return messages;
   }
 
-  static requestClearMessages(): void {
-    for (const logModel of TargetManager.instance().models(LogModel)) {
+  static requestClearMessages(targetManager: TargetManager = TargetManager.instance()): void {
+    for (const logModel of targetManager.models(LogModel)) {
       logModel.requestClear();
     }
-    for (const runtimeModel of TargetManager.instance().models(RuntimeModel)) {
+    for (const runtimeModel of targetManager.models(RuntimeModel)) {
       runtimeModel.discardConsoleEntries();
       // Runtime.discardConsoleEntries implies Runtime.releaseObjectGroup('console').
       runtimeModel.releaseObjectGroup('live-expression');
     }
-    for (const target of TargetManager.instance().targets()) {
+    for (const target of targetManager.targets()) {
       target.model(ConsoleModel)?.clear();
     }
   }
@@ -390,9 +392,9 @@ export class ConsoleModel extends SDKModel<EventTypes> {
     return this.#errors;
   }
 
-  static allErrors(): number {
+  static allErrors(targetManager: TargetManager = TargetManager.instance()): number {
     let errors = 0;
-    for (const target of TargetManager.instance().targets()) {
+    for (const target of targetManager.targets()) {
       errors += target.model(ConsoleModel)?.errors() || 0;
     }
     return errors;
@@ -402,9 +404,9 @@ export class ConsoleModel extends SDKModel<EventTypes> {
     return this.#warnings;
   }
 
-  static allWarnings(): number {
+  static allWarnings(targetManager: TargetManager = TargetManager.instance()): number {
     let warnings = 0;
-    for (const target of TargetManager.instance().targets()) {
+    for (const target of targetManager.targets()) {
       warnings += target.model(ConsoleModel)?.warnings() || 0;
     }
     return warnings;

package/front_end/core/sdk/CookieModel.ts

@@ -99,8 +99,9 @@ export class CookieModel extends SDKModel<EventTypes> {
     if (cookie.expires()) {
       expires = Math.floor(Date.parse(`${cookie.expires()}`) / 1000);
     }
-    const enabled =
-        Root.Runtime.experiments.isEnabled(Root.ExperimentNames.ExperimentName.EXPERIMENTAL_COOKIE_FEATURES);
+    const schemeBindingEnabled =
+        Boolean(Root.Runtime.hostConfig.devToolsEnableOriginBoundCookies?.schemeBindingEnabled);
+    const portBindingEnabled = Boolean(Root.Runtime.hostConfig.devToolsEnableOriginBoundCookies?.portBindingEnabled);
     const preserveUnset = (scheme: Protocol.Network.CookieSourceScheme): Protocol.Network.CookieSourceScheme.Unset|
                           undefined => scheme === Protocol.Network.CookieSourceScheme.Unset ? scheme : undefined;
     const protocolCookie = {
@@ -115,8 +116,8 @@ export class CookieModel extends SDKModel<EventTypes> {
       expires,
       priority: cookie.priority(),
       partitionKey: cookie.partitionKey(),
-      sourceScheme: enabled ? cookie.sourceScheme() : preserveUnset(cookie.sourceScheme()),
-      sourcePort: enabled ? cookie.sourcePort() : undefined,
+      sourceScheme: schemeBindingEnabled ? cookie.sourceScheme() : preserveUnset(cookie.sourceScheme()),
+      sourcePort: portBindingEnabled ? cookie.sourcePort() : undefined,
     };
     const response = await this.target().networkAgent().invoke_setCookie(protocolCookie);
     const error = response.getError();