BASELINE: Update Chromium to 96.0.4664.181

Change-Id: I762cd1da89d73aa6313b4a753fe126c34833f046
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

11 files changed, 72 insertions, 47 deletions

diff --git a/chromium/chrome/browser/resources/extensions/activity_log/activity_log.ts b/chromium/chrome/browser/resources/extensions/activity_log/activity_log.ts
index 1b098edb0f2..17f03ac3b39 100644
--- a/chromium/chrome/browser/resources/extensions/activity_log/activity_log.ts
+++ b/chromium/chrome/browser/resources/extensions/activity_log/activity_log.ts
@@ -16,9 +16,9 @@ import '../shared_vars.js';
 
 import {CrContainerShadowMixin} from 'chrome://resources/cr_elements/cr_container_shadow_mixin.js';
 import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.m.js';
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
+import {I18nMixin, I18nMixinInterface} from 'chrome://resources/js/i18n_mixin.js';
 import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
-import {afterNextRender, html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {afterNextRender, html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {navigation, Page} from '../navigation_helper.js';
 
@@ -54,8 +54,8 @@ interface ExtensionsActivityLogElement {
 }
 
 const ExtensionsActivityLogElementBase =
-    mixinBehaviors([I18nBehavior], CrContainerShadowMixin(PolymerElement)) as
-    {new (): PolymerElement & I18nBehavior};
+    I18nMixin(CrContainerShadowMixin(PolymerElement)) as
+    {new (): PolymerElement & I18nMixinInterface};
 
 class ExtensionsActivityLogElement extends ExtensionsActivityLogElementBase {
   static get is() {
diff --git a/chromium/chrome/browser/resources/extensions/code_section.ts b/chromium/chrome/browser/resources/extensions/code_section.ts
index 46b9bb73c6c..bc7110a8c20 100644
--- a/chromium/chrome/browser/resources/extensions/code_section.ts
+++ b/chromium/chrome/browser/resources/extensions/code_section.ts
@@ -7,9 +7,9 @@ import 'chrome://resources/cr_elements/shared_vars_css.m.js';
 import 'chrome://resources/polymer/v3_0/paper-styles/color.js';
 import './strings.m.js';
 
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
+import {I18nMixin} from 'chrome://resources/js/i18n_mixin.js';
 import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
-import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 
 function visibleLineCount(totalCount: number, oppositeCount: number): number {
@@ -20,9 +20,7 @@ function visibleLineCount(totalCount: number, oppositeCount: number): number {
   return Math.min(max, totalCount);
 }
 
-const ExtensionsCodeSectionElementBase =
-    mixinBehaviors([I18nBehavior], PolymerElement) as
-    {new (): PolymerElement & I18nBehavior};
+const ExtensionsCodeSectionElementBase = I18nMixin(PolymerElement);
 
 export class ExtensionsCodeSectionElement extends
     ExtensionsCodeSectionElementBase {
diff --git a/chromium/chrome/browser/resources/extensions/item.ts b/chromium/chrome/browser/resources/extensions/item.ts
index 5dfc2316410..bd73399db89 100644
--- a/chromium/chrome/browser/resources/extensions/item.ts
+++ b/chromium/chrome/browser/resources/extensions/item.ts
@@ -23,8 +23,8 @@ import 'chrome://resources/polymer/v3_0/paper-tooltip/paper-tooltip.js';
 import {getToastManager} from 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.js';
 import {CrToggleElement} from 'chrome://resources/cr_elements/cr_toggle/cr_toggle.m.js';
 import {assert, assertNotReached} from 'chrome://resources/js/assert.m.js';
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
-import {flush, html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {I18nMixin} from 'chrome://resources/js/i18n_mixin.js';
+import {flush, html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {ItemMixin} from './item_mixin.js';
 import {computeInspectableViewLabel, EnableControl, getEnableControl, getItemSource, getItemSourceString, isEnabled, SourceType, userCanChangeEnablement} from './item_util.js';
@@ -61,9 +61,7 @@ export interface ExtensionsItemElement {
   };
 }
 
-const ExtensionsItemElementBase =
-    mixinBehaviors([I18nBehavior], ItemMixin(PolymerElement)) as
-    {new (): PolymerElement & I18nBehavior};
+const ExtensionsItemElementBase = I18nMixin(ItemMixin(PolymerElement));
 
 export class ExtensionsItemElement extends ExtensionsItemElementBase {
   static get is() {
diff --git a/chromium/chrome/browser/resources/extensions/item_list.ts b/chromium/chrome/browser/resources/extensions/item_list.ts
index c54886a9cad..3edc703fb85 100644
--- a/chromium/chrome/browser/resources/extensions/item_list.ts
+++ b/chromium/chrome/browser/resources/extensions/item_list.ts
@@ -7,17 +7,17 @@ import './item.js';
 import './shared_style.js';
 
 import {CrContainerShadowMixin} from 'chrome://resources/cr_elements/cr_container_shadow_mixin.js';
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
+import {I18nMixin, I18nMixinInterface} from 'chrome://resources/js/i18n_mixin.js';
 import {IronA11yAnnouncer} from 'chrome://resources/polymer/v3_0/iron-a11y-announcer/iron-a11y-announcer.js';
-import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {ExtensionsItemElement, ItemDelegate} from './item.js';
 
 type Filter = (info: chrome.developerPrivate.ExtensionInfo) => boolean;
 
 const ExtensionsItemListElementBase =
-    mixinBehaviors([I18nBehavior], CrContainerShadowMixin(PolymerElement)) as
-    {new (): PolymerElement & I18nBehavior};
+    I18nMixin(CrContainerShadowMixin(PolymerElement)) as
+    {new (): PolymerElement & I18nMixinInterface};
 
 class ExtensionsItemListElement extends ExtensionsItemListElementBase {
   static get is() {
diff --git a/chromium/chrome/browser/resources/extensions/item_mixin.ts b/chromium/chrome/browser/resources/extensions/item_mixin.ts
index bf46a535084..c51c2d46ad8 100644
--- a/chromium/chrome/browser/resources/extensions/item_mixin.ts
+++ b/chromium/chrome/browser/resources/extensions/item_mixin.ts
@@ -37,7 +37,7 @@ export const ItemMixin = dedupingMixin(
          * @return The a11y association descriptor, e.g. "Related to <ext>".
          */
         a11yAssociation(name: string): string {
-          // Don't use I18nBehavior.i18n because of additional checks it
+          // Don't use I18nMixin.i18n because of additional checks it
           // performs. Polymer ensures that this string is not stamped into
           // arbitrary HTML. `name` can contain any data including html tags,
           // e.g. "My <video> download extension!"
diff --git a/chromium/chrome/browser/resources/extensions/keyboard_shortcuts.ts b/chromium/chrome/browser/resources/extensions/keyboard_shortcuts.ts
index 5fca4b18530..fa58e054123 100644
--- a/chromium/chrome/browser/resources/extensions/keyboard_shortcuts.ts
+++ b/chromium/chrome/browser/resources/extensions/keyboard_shortcuts.ts
@@ -9,7 +9,7 @@ import 'chrome://resources/polymer/v3_0/paper-styles/color.js';
 import './shortcut_input.js';
 
 import {CrContainerShadowMixin} from 'chrome://resources/cr_elements/cr_container_shadow_mixin.js';
-import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {KeyboardShortcutDelegate} from './keyboard_shortcut_delegate.js';
 
diff --git a/chromium/chrome/browser/resources/extensions/kiosk_dialog.ts b/chromium/chrome/browser/resources/extensions/kiosk_dialog.ts
index bd0b829d96d..7f4c6856b01 100644
--- a/chromium/chrome/browser/resources/extensions/kiosk_dialog.ts
+++ b/chromium/chrome/browser/resources/extensions/kiosk_dialog.ts
@@ -13,8 +13,8 @@ import 'chrome://resources/cr_elements/shared_style_css.m.js';
 import {CrCheckboxElement} from 'chrome://resources/cr_elements/cr_checkbox/cr_checkbox.m.js';
 import {CrDialogElement} from 'chrome://resources/cr_elements/cr_dialog/cr_dialog.m.js';
 import {assert} from 'chrome://resources/js/assert.m.js';
-import {WebUIListenerBehavior} from 'chrome://resources/js/web_ui_listener_behavior.m.js';
-import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {WebUIListenerMixin} from 'chrome://resources/js/web_ui_listener_mixin.js';
+import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {KioskApp, KioskAppSettings, KioskBrowserProxy, KioskBrowserProxyImpl} from './kiosk_browser_proxy.js';
 
@@ -33,9 +33,7 @@ interface RepeaterEvent extends CustomEvent {
   };
 }
 
-const ExtensionsKioskDialogElementBase =
-    mixinBehaviors([WebUIListenerBehavior], PolymerElement) as
-    {new (): PolymerElement & WebUIListenerBehavior};
+const ExtensionsKioskDialogElementBase = WebUIListenerMixin(PolymerElement);
 
 class ExtensionsKioskDialogElement extends ExtensionsKioskDialogElementBase {
   static get is() {
diff --git a/chromium/chrome/browser/resources/extensions/runtime_host_permissions.html b/chromium/chrome/browser/resources/extensions/runtime_host_permissions.html
index d0124994d35..c972ce057bb 100644
--- a/chromium/chrome/browser/resources/extensions/runtime_host_permissions.html
+++ b/chromium/chrome/browser/resources/extensions/runtime_host_permissions.html
@@ -18,7 +18,7 @@
   #section-heading .link-icon-button {
     margin-inline-start: 6px;
   }
-  
+
   #host-access {
     margin-inline-start: 12px;
     width: 100%;
@@ -63,7 +63,9 @@
 <div id="permissions-mode">
   <div id="section-heading">
     <div id="section-heading-heading">
-      <span id="section-heading-text">$i18n{hostPermissionsHeading}</span>
+      <span id="section-heading-text">
+        [[getHostPermissionsHeading_(extensionsMenuAccessControlEnabled_)]]
+      </span>
       <a class="link-icon-button" aria-label="$i18n{learnMore}"
           href="$i18n{hostPermissionsLearnMoreLink}" target="_blank"
           on-click="onLearnMoreClick_">
@@ -75,15 +77,28 @@
       <select id="host-access" class="md-select" on-change="onHostAccessChange_"
           value="[[permissions.hostAccess]]"
           aria-labelledby="section-heading-text">
-        <option value="[[HostAccess_.ON_CLICK]]">
-          $i18n{hostAccessOnClick}
-        </option>
-        <option value="[[HostAccess_.ON_SPECIFIC_SITES]]">
-          $i18n{hostAccessOnSpecificSites}
-        </option>
-        <option value="[[HostAccess_.ON_ALL_SITES]]">
-          $i18n{hostAccessOnAllSites}
-        </option>
+        <template is="dom-if" if="[[!extensionsMenuAccessControlEnabled_]]">
+          <option value="[[HostAccess_.ON_CLICK]]">
+            $i18n{hostAccessOnClick}
+          </option>
+          <option value="[[HostAccess_.ON_SPECIFIC_SITES]]">
+            $i18n{hostAccessOnSpecificSites}
+          </option>
+          <option value="[[HostAccess_.ON_ALL_SITES]]">
+            $i18n{hostAccessOnAllSites}
+          </option>
+        </template>
+        <template is="dom-if" if="[[extensionsMenuAccessControlEnabled_]]">
+          <option value="[[HostAccess_.ON_CLICK]]">
+            $i18n{newHostAccessOnClick}
+          </option>
+          <option value="[[HostAccess_.ON_SPECIFIC_SITES]]">
+            $i18n{hostAccessCustomizeForEachSite}
+          </option>
+          <option value="[[HostAccess_.ON_ALL_SITES]]">
+            $i18n{newHostAccessOnAllSites}
+          </option>
+        </template>
       </select>
     </div>
   </div>
diff --git a/chromium/chrome/browser/resources/extensions/runtime_host_permissions.ts b/chromium/chrome/browser/resources/extensions/runtime_host_permissions.ts
index d77c69bc367..dac47a59324 100644
--- a/chromium/chrome/browser/resources/extensions/runtime_host_permissions.ts
+++ b/chromium/chrome/browser/resources/extensions/runtime_host_permissions.ts
@@ -21,6 +21,7 @@ import {CrActionMenuElement} from 'chrome://resources/cr_elements/cr_action_menu
 import {CrRadioGroupElement} from 'chrome://resources/cr_elements/cr_radio_group/cr_radio_group.m.js';
 import {assert} from 'chrome://resources/js/assert.m.js';
 import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.m.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {ItemDelegate} from './item.js';
@@ -125,6 +126,15 @@ class ExtensionsRuntimeHostPermissionsElement extends PolymerElement {
         type: Object,
         value: chrome.developerPrivate.HostAccess,
       },
+
+      /**
+       * Whether the new site access menu should be shown.
+       */
+      extensionsMenuAccessControlEnabled_: {
+        type: Boolean,
+        value: () =>
+            loadTimeData.getBoolean('extensionsMenuAccessControlEnabled'),
+      },
     };
   }
 
@@ -138,6 +148,7 @@ class ExtensionsRuntimeHostPermissionsElement extends PolymerElement {
   private actionMenuAnchorElement_: HTMLElement|null;
   private oldHostAccess_: string|null;
   private revertingHostAccess_: boolean;
+  private extensionsMenuAccessControlEnabled_: boolean;
 
   private onHostAccessChange_() {
     const selectMenu = this.$['host-access'];
@@ -180,8 +191,17 @@ class ExtensionsRuntimeHostPermissionsElement extends PolymerElement {
     }
   }
 
+  private getHostPermissionsHeading_(): string {
+    return loadTimeData.getString(
+        this.extensionsMenuAccessControlEnabled_ ? 'newHostPermissionsHeading' :
+                                                   'hostPermissionsHeading');
+  }
+
   private showSpecificSites_(): boolean {
-    return this.permissions.hostAccess ===
+    // TODO(crbug.com/1253673): Show a different "customize for each site" menu
+    // for the new site access menu.
+    return !this.extensionsMenuAccessControlEnabled_ &&
+        this.permissions.hostAccess ===
         chrome.developerPrivate.HostAccess.ON_SPECIFIC_SITES;
   }
 
diff --git a/chromium/chrome/browser/resources/extensions/shortcut_input.ts b/chromium/chrome/browser/resources/extensions/shortcut_input.ts
index d24e3ea216d..52413bcbcac 100644
--- a/chromium/chrome/browser/resources/extensions/shortcut_input.ts
+++ b/chromium/chrome/browser/resources/extensions/shortcut_input.ts
@@ -9,9 +9,9 @@ import 'chrome://resources/cr_elements/hidden_style_css.m.js';
 import 'chrome://resources/polymer/v3_0/paper-styles/color.js';
 
 import {assert} from 'chrome://resources/js/assert.m.js';
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
+import {I18nMixin} from 'chrome://resources/js/i18n_mixin.js';
 import {IronA11yAnnouncer} from 'chrome://resources/polymer/v3_0/iron-a11y-announcer/iron-a11y-announcer.js';
-import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {KeyboardShortcutDelegate} from './keyboard_shortcut_delegate.js';
 import {hasValidModifiers, isValidKeyCode, Key, keystrokeToString} from './shortcut_util.js';
@@ -32,9 +32,7 @@ interface ExtensionsShortcutInputElement {
   };
 }
 
-const ExtensionsShortcutInputElementBase =
-    mixinBehaviors([I18nBehavior], PolymerElement) as
-    {new (): PolymerElement & I18nBehavior};
+const ExtensionsShortcutInputElementBase = I18nMixin(PolymerElement);
 
 class ExtensionsShortcutInputElement extends
     ExtensionsShortcutInputElementBase {
diff --git a/chromium/chrome/browser/resources/extensions/toolbar.ts b/chromium/chrome/browser/resources/extensions/toolbar.ts
index 3beb8710243..22ee3ddd6c6 100644
--- a/chromium/chrome/browser/resources/extensions/toolbar.ts
+++ b/chromium/chrome/browser/resources/extensions/toolbar.ts
@@ -12,10 +12,10 @@ import 'chrome://resources/polymer/v3_0/paper-styles/color.js';
 import './pack_dialog.js';
 
 import {getToastManager} from 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.js';
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
+import {I18nMixin} from 'chrome://resources/js/i18n_mixin.js';
 import {listenOnce} from 'chrome://resources/js/util.m.js';
 import {IronA11yAnnouncer} from 'chrome://resources/polymer/v3_0/iron-a11y-announcer/iron-a11y-announcer.js';
-import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 export interface ToolbarDelegate {
   /**
@@ -38,9 +38,7 @@ interface ExtensionsToolbarElement {
   };
 }
 
-const ExtensionsToolbarElementBase =
-    mixinBehaviors([I18nBehavior], PolymerElement) as
-    {new (): PolymerElement & I18nBehavior};
+const ExtensionsToolbarElementBase = I18nMixin(PolymerElement);
 
 class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
   static get is() {