Suppress emission of getAffectedUrlsForThirdPartyCookieMetadata internal

errors

Now only check for grace period if the tpcd-metadata-grants flag is
enabled to prevent internal errors from being emitted.

Error being suppressed: http://screen/4vX3VK7B7PPdoXu.png

Bug: b/365737493
Change-Id: Ib8741ff296da0bc57f91878c4a36d05099a16bb7
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6214050
Reviewed-by: Shuran Huang <[email protected]>
Commit-Queue: Jalon Thomas <[email protected]>
Reviewed-by: Danil Somsikov <[email protected]>

Author: jalonthomas

front_end/panels/security/CookieControlsView.test.ts

@@ -34,6 +34,9 @@ describeWithMockConnection('CookieControlsView', () => {
   });
 
   it('should invoke getAffectedUrlsForThirdPartyCookieMetadata upon construction', async () => {
+    Common.Settings.Settings.instance().setHostConfig(
+        {thirdPartyCookieControls: {thirdPartyCookieMetadataEnabled: true}});
+
     target = createTarget();
     const getAffectedUrlsSpy = sinon.spy(target.storageAgent(), 'invoke_getAffectedUrlsForThirdPartyCookieMetadata');
     new Security.CookieControlsView.CookieControlsView(undefined, mockView);
@@ -42,6 +45,8 @@ describeWithMockConnection('CookieControlsView', () => {
   });
 
   it('should invoke getAffectedUrlsForThirdPartyCookieMetadata when a resource is added', async () => {
+    Common.Settings.Settings.instance().setHostConfig(
+        {thirdPartyCookieControls: {thirdPartyCookieMetadataEnabled: true}});
     new Security.CookieControlsView.CookieControlsView(undefined, mockView);
 
     target = createTarget();

front_end/panels/security/CookieControlsView.ts

@@ -10,6 +10,7 @@ import * as Common from '../../core/common/common.js';
 import * as Host from '../../core/host/host.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import type * as Platform from '../../core/platform/platform.js';
+import type * as Root from '../../core/root/root.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as Buttons from '../../ui/components/buttons/buttons.js';
 import * as ChromeLink from '../../ui/components/chrome_link/chrome_link.js';
@@ -131,35 +132,34 @@ export function showInfobar(): void {
 export class CookieControlsView extends UI.Widget.VBox {
   #view: View;
   #isGracePeriodActive: boolean;
+  #thirdPartyControlsDict: Root.Runtime.HostConfig['thirdPartyCookieControls'];
 
   constructor(element?: HTMLElement, view: View = (input, output, target) => {
-    const thirdPartyControlsDict = Common.Settings.Settings.instance().getHostConfig().thirdPartyCookieControls;
-
     // createSetting() allows us to initialize the settings with the UI binding values the first
     // time that the browser starts, and use the existing setting value for all subsequent uses.
     const enterpriseEnabledSetting = Common.Settings.Settings.instance().createSetting(
         'enterprise-enabled',
-        thirdPartyControlsDict && thirdPartyControlsDict.managedBlockThirdPartyCookies &&
-                typeof thirdPartyControlsDict.managedBlockThirdPartyCookies === 'boolean' ?
-            thirdPartyControlsDict.managedBlockThirdPartyCookies :
+        this.#thirdPartyControlsDict && this.#thirdPartyControlsDict.managedBlockThirdPartyCookies &&
+                typeof this.#thirdPartyControlsDict.managedBlockThirdPartyCookies === 'boolean' ?
+            this.#thirdPartyControlsDict.managedBlockThirdPartyCookies :
             false,
         Common.Settings.SettingStorageType.GLOBAL);
     const toggleEnabledSetting = Common.Settings.Settings.instance().createSetting(
         'cookie-control-override-enabled',
-        thirdPartyControlsDict && thirdPartyControlsDict.thirdPartyCookieRestrictionEnabled ?
-            thirdPartyControlsDict.thirdPartyCookieRestrictionEnabled :
+        this.#thirdPartyControlsDict && this.#thirdPartyControlsDict.thirdPartyCookieRestrictionEnabled ?
+            this.#thirdPartyControlsDict.thirdPartyCookieRestrictionEnabled :
             false,
         Common.Settings.SettingStorageType.GLOBAL);
     const gracePeriodDisabledSetting = Common.Settings.Settings.instance().createSetting(
         'grace-period-mitigation-disabled',
-        thirdPartyControlsDict && thirdPartyControlsDict.thirdPartyCookieMetadataEnabled ?
-            thirdPartyControlsDict.thirdPartyCookieMetadataEnabled :
+        this.#thirdPartyControlsDict && this.#thirdPartyControlsDict.thirdPartyCookieMetadataEnabled ?
+            this.#thirdPartyControlsDict.thirdPartyCookieMetadataEnabled :
             true,
         Common.Settings.SettingStorageType.GLOBAL);
     const heuristicsDisabledSetting = Common.Settings.Settings.instance().createSetting(
         'heuristic-mitigation-disabled',
-        thirdPartyControlsDict && thirdPartyControlsDict.thirdPartyCookieHeuristicsEnabled ?
-            thirdPartyControlsDict.thirdPartyCookieHeuristicsEnabled :
+        this.#thirdPartyControlsDict && this.#thirdPartyControlsDict.thirdPartyCookieHeuristicsEnabled ?
+            this.#thirdPartyControlsDict.thirdPartyCookieHeuristicsEnabled :
             true,
         Common.Settings.SettingStorageType.GLOBAL);
 
@@ -196,7 +196,7 @@ export class CookieControlsView extends UI.Widget.VBox {
     `;
 
     const gracePeriodControlDisabled =
-        (thirdPartyControlsDict ? (!thirdPartyControlsDict.thirdPartyCookieMetadataEnabled) : false) ||
+        (this.#thirdPartyControlsDict ? (!this.#thirdPartyControlsDict.thirdPartyCookieMetadataEnabled) : false) ||
         enterpriseEnabledSetting.get() || !toggleEnabledSetting.get() || !this.#isGracePeriodActive;
     const gracePeriodControl = html`
       <div class="card-row">
@@ -214,7 +214,7 @@ export class CookieControlsView extends UI.Widget.VBox {
                   i18nFormatString(UIStrings.gracePeriodExplanation, {
                     PH1: i18nString(UIStrings.gracePeriod),
                   }) :
-                (thirdPartyControlsDict ? !thirdPartyControlsDict?.thirdPartyCookieMetadataEnabled: false) ?
+                (this.#thirdPartyControlsDict ? !this.#thirdPartyControlsDict?.thirdPartyCookieMetadataEnabled: false) ?
                   i18nFormatString(UIStrings.enableFlag, {
                     PH1: this.getChromeFlagsLink(UIStrings.tpcdMetadataGrants),
                   }) :
@@ -229,7 +229,7 @@ export class CookieControlsView extends UI.Widget.VBox {
     `;
 
     const heuristicsControlDisabled =
-        (thirdPartyControlsDict ? (!thirdPartyControlsDict.thirdPartyCookieHeuristicsEnabled) : false) ||
+        (this.#thirdPartyControlsDict ? (!this.#thirdPartyControlsDict.thirdPartyCookieHeuristicsEnabled) : false) ||
         enterpriseEnabledSetting.get() || !toggleEnabledSetting.get();
     const heuristicControl = html`
       <div class="card-row">
@@ -247,7 +247,7 @@ export class CookieControlsView extends UI.Widget.VBox {
                 i18nFormatString(UIStrings.heuristicExplanation, {
                   PH1: i18nString(UIStrings.scenarios),
                 }) :
-                (thirdPartyControlsDict ? !thirdPartyControlsDict.thirdPartyCookieHeuristicsEnabled: false) ?
+                (this.#thirdPartyControlsDict ? !this.#thirdPartyControlsDict.thirdPartyCookieHeuristicsEnabled: false) ?
                   i18nFormatString(UIStrings.enableFlag, {
                     PH1: this.getChromeFlagsLink(UIStrings.tpcdHeuristicsGrants),
                   }) :
@@ -308,6 +308,7 @@ export class CookieControlsView extends UI.Widget.VBox {
     super(true, undefined, element);
     this.#view = view;
     this.#isGracePeriodActive = false;
+    this.#thirdPartyControlsDict = Common.Settings.Settings.instance().getHostConfig().thirdPartyCookieControls;
     this.registerRequiredCSS(Input.checkboxStylesRaw, cookieControlsViewStyles);
 
     SDK.TargetManager.TargetManager.instance().addModelListener(
@@ -357,6 +358,10 @@ export class CookieControlsView extends UI.Widget.VBox {
   }
 
   async checkGracePeriodActive(event?: Common.EventTarget.EventTargetEvent<SDK.Resource.Resource>): Promise<void> {
+    if (!this.#thirdPartyControlsDict || !this.#thirdPartyControlsDict.thirdPartyCookieMetadataEnabled) {
+      return;
+    }
+
     if (this.#isGracePeriodActive) {
       return;
     }