Reland "Have InspectorView remove the Infobar instead of CookieControlsView"

This is a reland of commit 1ac4ec6

Original change's description:
> Have InspectorView remove the Infobar instead of CookieControlsView
>
> If CookieControlsView was responsible for listening for a
> PrimaryPageChanged event and then removing the Infobar, the infobar
> would not be removed if CookieControlsView was never created to
> listen in the first place. This is a problem because the Infobar
> might be created by the InspectorMain entrypoint which does not
> guarantee that a CookieControlsView will be created as well.
>
> By moving the listener to the InspectorView, we guarantee that the
> Infobar is removed when the user reloads the page without needing
> to open the Privacy and security panel.
>
> Bug: 400962121
> Change-Id: I612c4899e218e094fd31a3eda154ec69c20e8035
> Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6346989
> Reviewed-by: Kim-Anh Tran <[email protected]>
> Reviewed-by: Danil Somsikov <[email protected]>
> Commit-Queue: Joshua Thomas <[email protected]>

Bug: 400962121
Change-Id: Id4b4c5a1e46e84877642978c3763af784ff751b6
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6367775
Reviewed-by: Danil Somsikov <[email protected]>
Reviewed-by: Kim-Anh Tran <[email protected]>
Commit-Queue: Joshua Thomas <[email protected]>

Author: masnoble

front_end/panels/security/CookieControlsView.ts

@@ -352,8 +352,6 @@ export class CookieControlsView extends UI.Widget.VBox {
     this.checkGracePeriodActive().catch(error => {
       console.error(error);
     });
-
-    UI.InspectorView.InspectorView.instance().removeDebuggedTabReloadRequiredWarning();
   }
 
   async checkGracePeriodActive(event?: Common.EventTarget.EventTargetEvent<SDK.Resource.Resource>): Promise<void> {

front_end/ui/legacy/InspectorView.ts

@@ -32,6 +32,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 * 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 IconButton from '../components/icon_button/icon_button.js';
 import * as VisualLogging from '../visual_logging/visual_logging.js';
@@ -501,12 +502,19 @@ export class InspectorView extends VBox implements ViewLocationResolver {
       infobar.setCloseCallback(() => {
         delete this.reloadRequiredInfobar;
       });
+
+      SDK.TargetManager.TargetManager.instance().addModelListener(
+          SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.PrimaryPageChanged,
+          this.removeDebuggedTabReloadRequiredWarning, this);
     }
   }
 
   removeDebuggedTabReloadRequiredWarning(): void {
     if (this.reloadRequiredInfobar) {
       this.reloadRequiredInfobar.dispose();
+      SDK.TargetManager.TargetManager.instance().removeModelListener(
+          SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.PrimaryPageChanged,
+          this.removeDebuggedTabReloadRequiredWarning, this);
     }
   }
 

test/e2e/security/privacy_test.ts

@@ -4,36 +4,75 @@
 import {assert} from 'chai';
 
 import {expectError} from '../../conductor/events.js';
-import {click, getBrowserAndPages, waitForAria} from '../../shared/helper.js';
-import {reloadDevTools} from '../helpers/cross-tool-helper.js';
+import {$textContent, click, getBrowserAndPages, reloadDevTools, waitForAria} from '../../shared/helper.js';
 import {getDataGridRows} from '../helpers/datagrid-helpers.js';
 import {
   navigateToSecurityTab,
 } from '../helpers/security-helpers.js';
 
-describe('The Privacy and security panel', function() {
-  let preloadScriptId: string;
+let preloadScriptId: string;
 
-  afterEach(async () => {
-    // The tests end but DevTools might be still doing things resulting
-    // in an error caused by the test runner closing or navigating the
-    // target page.
-    expectError('Inspected target navigated or closed');
-    if (!preloadScriptId) {
-      return;
-    }
-    const {frontend} = getBrowserAndPages();
-    await frontend.removeScriptToEvaluateOnNewDocument(preloadScriptId);
-  });
+async function addPrivacyUIToHostConfig() {
+  const {frontend} = getBrowserAndPages();
+  const {identifier} = await frontend.evaluateOnNewDocument(`globalThis.hostConfigForTesting = {
+    ...globalThis.hostConfigForTesting,
+    devToolsPrivacyUI: {enabled: ${true}},
+  };`);
+  preloadScriptId = identifier;
+}
+
+async function removeScript() {
+  // The tests end but DevTools might be still doing things resulting
+  // in an error caused by the test runner closing or navigating the
+  // target page.
+  expectError('Inspected target navigated or closed');
+  if (!preloadScriptId) {
+    return;
+  }
+  const {frontend} = getBrowserAndPages();
+  await frontend.removeScriptToEvaluateOnNewDocument(preloadScriptId);
+}
 
+describe('The controls tool without the Privacy and security panel open', function() {
   beforeEach(async () => {
     const {frontend} = getBrowserAndPages();
-    const {identifier} = await frontend.evaluateOnNewDocument(`globalThis.hostConfigForTesting = {
-            ...globalThis.hostConfigForTesting,
-            devToolsPrivacyUI: {enabled: ${true}},
-        };`);
-    preloadScriptId = identifier;
 
+    await addPrivacyUIToHostConfig();
+    await frontend.evaluate(`(async () => {
+      const Common = await import('./core/common/common.js');
+      const setting = Common.Settings.Settings.instance().createSetting('cookie-control-override-enabled', true);
+      setting.set(true);
+    })()`);
+  });
+
+  afterEach(async () => {
+    await removeScript();
+  });
+
+  it('will remove reload bar without privacy module loaded', async () => {
+    // Reload to give toolbar chance to spawn
+    await reloadDevTools();
+
+    // Infobar should be presenet since the setting was set in the before
+    const infoBar = await waitForAria('To apply your updated controls, reload the page');
+    assert.isNotNull(infoBar);
+
+    const {target} = getBrowserAndPages();
+    await target.reload();
+
+    // Infobar should be gone after reloading the page
+    assert.isNull(await $textContent('To apply your updated controls, reload the page'));
+  });
+});
+
+describe('The Privacy and security panel', function() {
+  before(async () => {
+    await addPrivacyUIToHostConfig();
+    await reloadDevTools();
+  });
+
+  after(async () => {
+    await removeScript();
     await reloadDevTools();
   });
 
@@ -43,14 +82,14 @@ describe('The Privacy and security panel', function() {
 
     // Infobar should appear after changing control
     const infoBar = await waitForAria('To apply your updated controls, reload the page');
-    infoBar.evaluate(el => assert.isNotNull(el));
+    assert.isNotNull(infoBar);
 
     // Allow time for infobar to animate in before clicking the button
     await new Promise<void>(resolve => setTimeout(resolve, 550));
     await click('dt-close-button', {root: infoBar});
 
     // Infobar should be gone after clicking the close button
-    infoBar.evaluate(el => assert.isNotNull(el));
+    assert.isNull(await $textContent('To apply your updated controls, reload the page'));
   });
 
   it('filters rows when the search filter is populated', async () => {