feat: update patches for 132, part 2

patches/disable-secondary-browser-features-by-default.patch

@@ -11,20 +11,24 @@ index 2ddc318a2b738..6fd447d8e5ce1 100644
  }
  #endif
 
+diff --git a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_prefs.cc b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_prefs.cc
+index f792842f91922..28cc7122da39c 100644
+--- a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_prefs.cc
++++ b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_prefs.cc
+@@ -49,7 +49,7 @@ const int kChromeLabsActivationThresholdDefaultValue = -1;
+ const int kChromeLabsNewExperimentPrefValue = -1;
+
+ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+-  registry->RegisterBooleanPref(kBrowserLabsEnabledEnterprisePolicy, true);
++  registry->RegisterBooleanPref(kBrowserLabsEnabledEnterprisePolicy, false);
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+   registry->RegisterDictionaryPref(kChromeLabsNewBadgeDictAshChrome);
+ #endif
 diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc
-index 703fc03b7e6cc..60347901f0d21 100644
+index 886af67983837..120272ceacfa8 100644
 --- a/chrome/browser/ui/ui_features.cc
 +++ b/chrome/browser/ui/ui_features.cc
-@@ -22,7 +22,7 @@ BASE_FEATURE(kWebAppIconInTitlebar,
- );
-
- // Enables Chrome Labs menu in the toolbar. See https://crbug.com/1145666
--BASE_FEATURE(kChromeLabs, "ChromeLabs", base::FEATURE_ENABLED_BY_DEFAULT);
-+BASE_FEATURE(kChromeLabs, "ChromeLabs", base::FEATURE_DISABLED_BY_DEFAULT);
- const char kChromeLabsActivationParameterName[] =
-     "chrome_labs_activation_percentage";
- const base::FeatureParam<int> kChromeLabsActivationPercentage{
-@@ -280,11 +280,7 @@ BASE_FEATURE(kTabGroupsCollapseFreezing,
+@@ -243,11 +243,7 @@ BASE_FEATURE(kTabGroupsCollapseFreezing,
  // https://crbug.com/928954
  BASE_FEATURE(kTabHoverCardImages,
               "TabHoverCardImages",
@@ -37,7 +41,7 @@ index 703fc03b7e6cc..60347901f0d21 100644
 
  const char kTabHoverCardImagesNotReadyDelayParameterName[] =
 diff --git a/components/history_clusters/core/features.cc b/components/history_clusters/core/features.cc
-index a2244cdbd0e7e..9058d86b5e8d7 100644
+index 897479817c607..a5fad5e8bb7fd 100644
 --- a/components/history_clusters/core/features.cc
 +++ b/components/history_clusters/core/features.cc
 @@ -26,7 +26,7 @@ constexpr auto enabled_by_default_desktop_only =

patches/remove-unused-preferences.patch

@@ -43,7 +43,7 @@ index ca51e9017e5bc..3f290596b8576 100644
  <if expr="not chromeos_ash">
          <template is="dom-if" if="[[signinAllowed_]]">
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-index cbc13c12082ec..65e66ec1cf441 100644
+index 7d47622af880c..468303b31b657 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
 @@ -87,8 +87,8 @@
@@ -57,7 +57,7 @@ index cbc13c12082ec..65e66ec1cf441 100644
              on-click="onSecurityPageClick_"
              role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
          <cr-link-row id="permissionsLinkRow" start-icon="privacy:page-info"
-@@ -189,7 +189,7 @@
+@@ -191,7 +191,7 @@
        </template>
 
        <template is="dom-if" route-path="/security">
@@ -67,10 +67,10 @@ index cbc13c12082ec..65e66ec1cf441 100644
              learn-more-url="$i18n{safeBrowsingHelpCenterURL}">
            <settings-security-page prefs="{{prefs}}"
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
-index 130e9e9b38a68..16a37c0200ecd 100644
+index f3df01d26ac04..28eef94c62fee 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
-@@ -634,8 +634,7 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase {
+@@ -643,8 +643,7 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase {
    }
 
    private shouldShowAdPrivacy_(): boolean {
@@ -81,20 +81,13 @@ index 130e9e9b38a68..16a37c0200ecd 100644
 
    private shouldShowComposeProactiveNudge_(): boolean {
 diff --git a/chrome/browser/resources/settings/privacy_page/security_page.html b/chrome/browser/resources/settings/privacy_page/security_page.html
-index 4b09d7e1e9cb3..d54888d0e712f 100644
+index 6ac062af92b06..0edc8e2134222 100644
 --- a/chrome/browser/resources/settings/privacy_page/security_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/security_page.html
-@@ -77,143 +77,6 @@
+@@ -79,155 +79,6 @@
          pointer-events: auto;
        }
      </style>
--    <picture>
--      <source
--          srcset="chrome://settings/images/safe_browsing_banner_dark.svg"
--          media="(prefers-color-scheme: dark)">
--      <img id="banner" alt=""
--          src="chrome://settings/images/safe_browsing_banner.svg">
--    </picture>
 -    <div id="safeBrowsingSection">
 -      <h2 class="cr-title-text">$i18n{safeBrowsingSectionLabel}</h2>
 -      <settings-radio-group id="safeBrowsingRadioGroup" no-set-pref
@@ -111,7 +104,8 @@ index 4b09d7e1e9cb3..d54888d0e712f 100644
 -            expand-aria-label="$i18n{safeBrowsingEnhancedExpandA11yLabel}"
 -            on-expand-clicked="onEnhancedProtectionExpandButtonClicked_"
 -            no-automatic-collapse>
--            <div id="enhancedProtectionDescContainer" slot="collapse"
+-          <div slot="collapse">
+-            <div id="enhancedProtectionDescContainer"
 -                class="settings-columned-section">
 -              <div class="column">
 -                <h3 class="description-header">
@@ -146,13 +140,15 @@ index 4b09d7e1e9cb3..d54888d0e712f 100644
 -                      $i18n{safeBrowsingEnhancedWhenOnBulFour}
 -                    </div>
 -                  </li>
--                  <li>
--                    <cr-icon icon="settings20:vpn-key-new" aria-hidden="true">
--                    </cr-icon>
--                    <div class="secondary">
--                      $i18n{safeBrowsingEnhancedWhenOnBulFive}
--                    </div>
--                  </li>
+-                  <template is="dom-if" if="[[!enablePasswordLeakToggleMove_]]">
+-                    <li>
+-                      <cr-icon icon="settings20:vpn-key-new" aria-hidden="true">
+-                      </cr-icon>
+-                      <div class="secondary">
+-                        $i18n{safeBrowsingEnhancedWhenOnBulFive}
+-                      </div>
+-                    </li>
+-                  </template>
 -                </ul>
 -              </div>
 -              <div class="column">
@@ -179,13 +175,27 @@ index 4b09d7e1e9cb3..d54888d0e712f 100644
 -                    </div>
 -                  </li>
 -                </ul>
--                <div id="learnMoreLabelContainer" class="cr-secondary-text">
+-                <template is="dom-if" if="[[!enablePasswordLeakToggleMove_]]">
+-                  <div id="learnMoreLabelContainerOld"
+-                      class="cr-secondary-text">
+-                    $i18nRaw{safeBrowsingEnhancedLearnMoreLabel}
+-                  </div>
+-                </template>
+-              </div>
+-            </div>
+-            <template is="dom-if" if="[[enablePasswordLeakToggleMove_]]">
+-              <div id="learnMoreLabelContainer">
+-                <div class="cr-secondary-text">
 -                  $i18nRaw{safeBrowsingEnhancedLearnMoreLabel}
 -                </div>
 -              </div>
--            </div>
+-            </template>
+-          </div>
 -        </settings-collapse-radio-button>
 -        <settings-collapse-radio-button id="safeBrowsingStandard"
+-            no-collapse="[[computeSafeBrowsingStandardNoCollapse_(
+-                            hideExtendedReportingRadioButton_,
+-                            enablePasswordLeakToggleMove_)]]"
 -            name="[[safeBrowsingSettingEnum_.STANDARD]]"
 -            pref="[[prefs.generated.safe_browsing]]"
 -            label="$i18n{safeBrowsingStandard}"
@@ -207,13 +217,15 @@ index 4b09d7e1e9cb3..d54888d0e712f 100644
 -                              prefs.generated.safe_browsing.*)]]">
 -              </settings-toggle-button>
 -            </template>
--            <settings-toggle-button id="passwordsLeakToggle"
--                label="$i18n{passwordsLeakDetectionLabel}"
--                pref="{{prefs.generated.password_leak_detection}}"
--                sub-label="[[getPasswordsLeakToggleSubLabel_(
--                              prefs.profile.password_manager_leak_detection.*,
--                              prefs.generated.password_leak_detection.*)]]">
--            </settings-toggle-button>
+-            <template is="dom-if" if="[[!enablePasswordLeakToggleMove_]]">
+-              <settings-toggle-button id="passwordsLeakToggleOld"
+-                  label="$i18n{passwordsLeakDetectionLabel}"
+-                  pref="{{prefs.generated.password_leak_detection}}"
+-                  sub-label="[[getPasswordsLeakToggleSubLabel_(
+-                                prefs.profile.password_manager_leak_detection.*,
+-                                prefs.generated.password_leak_detection.*)]]">
+-              </settings-toggle-button>
+-            </template>
 -          </div>
 -        </settings-collapse-radio-button>
 -        <settings-collapse-radio-button id="safeBrowsingDisabled" no-collapse
@@ -228,16 +240,16 @@ index 4b09d7e1e9cb3..d54888d0e712f 100644
      <template is="dom-if" if="[[enableHttpsFirstModeNewSettings_]]" restamp>
        <div id="secureConnectionsSection">
          <h2 class="cr-title-text">$i18n{secureConnectionsSectionTitle}</h2>
-@@ -254,7 +117,7 @@
+@@ -268,7 +119,7 @@
        </cr-collapse>
      </template>
      <div class="cr-row first">
 -      <h2 class="cr-title-text">$i18n{advancedPageTitle}</h2>
 +      <h2 class="cr-title-text">$i18n{securityPageTitle}</h2>
      </div>
-     <template is="dom-if" if="[[!enableHttpsFirstModeNewSettings_]]" restamp>
-       <settings-toggle-button id="httpsOnlyModeToggle"
-@@ -364,18 +227,3 @@
+     <template is="dom-if" if="[[enablePasswordLeakToggleMove_]]">
+       <settings-toggle-button id="passwordsLeakToggle"
+@@ -389,18 +240,3 @@
            on-click="onChromeCertificatesClick_">
        </cr-link-row>
  </if>
@@ -257,10 +269,10 @@ index 4b09d7e1e9cb3..d54888d0e712f 100644
 -      </settings-simple-confirmation-dialog>
 -    </template>
 diff --git a/chrome/browser/resources/settings/privacy_page/security_page.ts b/chrome/browser/resources/settings/privacy_page/security_page.ts
-index 335c735439b24..b0371a95c7dbe 100644
+index 552f3b5534b01..7c7bad3962f68 100644
 --- a/chrome/browser/resources/settings/privacy_page/security_page.ts
 +++ b/chrome/browser/resources/settings/privacy_page/security_page.ts
-@@ -333,10 +333,6 @@ export class SettingsSecurityPageElement extends
+@@ -342,10 +342,6 @@ export class SettingsSecurityPageElement extends
        }
      });
 
@@ -285,12 +297,12 @@ index 5f0ac710c3a63..30d076f0127e3 100644
          </a>
          <a role="menuitem" id="autofill" href="/autofill"
 diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc
-index 1d51499e5f1a4..2953b0d365232 100644
+index 89f3190f3bde5..2ff32d4c675ed 100644
 --- a/chrome/browser/ui/webui/settings/settings_ui.cc
 +++ b/chrome/browser/ui/webui/settings/settings_ui.cc
-@@ -362,10 +362,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
-   html_source->AddBoolean("userCannotManuallyEnterPassword", false);
- #endif  // !BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -353,10 +353,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+   html_source->AddBoolean("isOSSettings", false);
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
 -  bool show_privacy_guide =
 -      base::FeatureList::IsEnabled(features::kPrivacyGuideForceAvailable) ||
@@ -301,10 +313,10 @@ index 1d51499e5f1a4..2953b0d365232 100644
    html_source->AddBoolean(
        "enableCbdTimeframeRequired",
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
-index b27e1ead33dc9..b36b34c9a9f8a 100644
+index 1010d8d4b20a7..08b60ed8b845d 100644
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -1074,11 +1074,7 @@ BASE_FEATURE(kSafetyHubExtensionsOffStoreTrigger,
+@@ -1030,11 +1030,7 @@ BASE_FEATURE(kSafetyHubExtensionsOffStoreTrigger,
  // Enables Safety Hub feature.
  BASE_FEATURE(kSafetyHub,
               "SafetyHub",

patches/revert-130-optimizer-jit-change.patch

@@ -1,3 +1,25 @@
+diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
+index 7d47622af880c..144760befee18 100644
+--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
++++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
+@@ -119,7 +119,7 @@
+             $i18n{siteSettingsJavascriptOptimizerDescription}
+           </div>
+           <settings-category-default-radio-group
+-              category="[[contentSettingsTypesEnum_.JAVASCRIPT_OPTIMIZER]]"
++              category="[[contentSettingsTypesEnum_.JAVASCRIPT_JIT]]"
+               allow-option-label=
+                   "$i18n{siteSettingsJavascriptOptimizerAllowed}"
+               allow-option-sub-label=
+@@ -129,7 +129,7 @@
+                   "$i18n{siteSettingsJavascriptOptimizerBlockedSubLabel}">
+           </settings-category-default-radio-group>
+           <category-setting-exceptions
+-              category="[[contentSettingsTypesEnum_.JAVASCRIPT_OPTIMIZER]]"
++              category="[[contentSettingsTypesEnum_.JAVASCRIPT_JIT]]"
+               allow-header="$i18n{siteSettingsJavascriptOptimizerAllowedExceptions}"
+               block-header="$i18n{siteSettingsJavascriptOptimizerBlockedExceptions}"
+               search-filter="[[searchFilter_]]">
 diff --git a/chrome/browser/resources/settings/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts
 index 4ed920a8aabf9..8436627f13298 100644
 --- a/chrome/browser/resources/settings/site_settings/constants.ts
@@ -11,8 +33,34 @@ index 4ed920a8aabf9..8436627f13298 100644
    KEYBOARD_LOCK = 'keyboard-lock',
    LOCAL_FONTS = 'local-fonts',
    MIC = 'media-stream-mic',  // AKA Microphone.
+diff --git a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts
+index f41407671c3aa..dbd118d942f34 100644
+--- a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts
++++ b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts
+@@ -132,7 +132,7 @@ export class SettingsCategoryDefaultRadioGroupElement extends
+       case ContentSettingsTypes.FEDERATED_IDENTITY_API:
+       case ContentSettingsTypes.IMAGES:
+       case ContentSettingsTypes.JAVASCRIPT:
+-      case ContentSettingsTypes.JAVASCRIPT_OPTIMIZER:
++      case ContentSettingsTypes.JAVASCRIPT_JIT:
+       case ContentSettingsTypes.MIXEDSCRIPT:
+       case ContentSettingsTypes.PAYMENT_HANDLER:
+       case ContentSettingsTypes.POPUPS:
+diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b/chrome/browser/resources/settings/site_settings/site_details.html
+index ada08944de384..7ed0a2fa850b3 100644
+--- a/chrome/browser/resources/settings/site_settings/site_details.html
++++ b/chrome/browser/resources/settings/site_settings/site_details.html
+@@ -247,7 +247,7 @@
+           label="$i18n{siteSettingsInsecureContent}">
+       </site-details-permission>
+       <site-details-permission
+-          category="[[contentSettingsTypesEnum_.JAVASCRIPT_OPTIMIZER]]"
++          category="[[contentSettingsTypesEnum_.JAVASCRIPT_JIT]]"
+           icon="privacy:v8"
+           label="$i18n{siteSettingsJavascriptOptimizer}">
+       </site-details-permission>
 diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
-index a42f9b0e0ed2b..290a515734e18 100644
+index dfb10f1a4817d..a02b8cdeede73 100644
 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
 +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
 @@ -225,7 +225,7 @@ function getCategoryItemMap(): Map<ContentSettingsTypes, CategoryListItem> {
@@ -24,7 +72,7 @@ index a42f9b0e0ed2b..290a515734e18 100644
        label: 'siteSettingsJavascriptOptimizer',
        icon: 'privacy:v8',
        enabledLabel: 'siteSettingsJavascriptOptimizerAllowed',
-@@ -565,7 +565,7 @@ export class SettingsSiteSettingsPageElement extends
+@@ -562,7 +562,7 @@ export class SettingsSiteSettingsPageElement extends
                Id.ANTI_ABUSE,
                Id.SITE_DATA,
                Id.PERFORMANCE,
@@ -34,50 +82,14 @@ index a42f9b0e0ed2b..290a515734e18 100644
                Id.OFFER_WRITING_HELP,
              ]),
 diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page_util.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page_util.ts
-index ee83684be5439..dce066b5988b6 100644
+index 0c615bb7e5f4f..754fd07a0da5d 100644
 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page_util.ts
 +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page_util.ts
-@@ -97,7 +97,7 @@ export function getLocalizationStringForContentType(
+@@ -99,6 +99,7 @@ export function getLocalizationStringForContentType(
        return 'siteSettingsZoomLevelsMidSentence';
      // The following members do not have a mid-sentence localization.
      case ContentSettingsTypes.ANTI_ABUSE:
--    case ContentSettingsTypes.JAVASCRIPT_OPTIMIZER:
 +    case ContentSettingsTypes.JAVASCRIPT_JIT:
      case ContentSettingsTypes.PDF_DOCUMENTS:
      case ContentSettingsTypes.PERFORMANCE:
      case ContentSettingsTypes.PRIVATE_NETWORK_DEVICES:
-diff --git a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts
-index f41407671c3aa..dbd118d942f34 100644
---- a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts
-+++ b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts
-@@ -132,7 +132,7 @@ export class SettingsCategoryDefaultRadioGroupElement extends
-       case ContentSettingsTypes.FEDERATED_IDENTITY_API:
-       case ContentSettingsTypes.IMAGES:
-       case ContentSettingsTypes.JAVASCRIPT:
--      case ContentSettingsTypes.JAVASCRIPT_OPTIMIZER:
-+      case ContentSettingsTypes.JAVASCRIPT_JIT:
-       case ContentSettingsTypes.MIXEDSCRIPT:
-       case ContentSettingsTypes.PAYMENT_HANDLER:
-       case ContentSettingsTypes.POPUPS:
-diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-index 3edf3a7f14612..1003e54c4ca38 100644
---- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
-+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -117,7 +117,7 @@
-             $i18n{siteSettingsJavascriptOptimizerDescription}
-           </div>
-           <settings-category-default-radio-group
--              category="[[contentSettingsTypesEnum_.JAVASCRIPT_OPTIMIZER]]"
-+              category="[[contentSettingsTypesEnum_.JAVASCRIPT_JIT]]"
-               allow-option-label=
-                   "$i18n{siteSettingsJavascriptOptimizerAllowed}"
-               allow-option-sub-label=
-@@ -127,7 +127,7 @@
-                   "$i18n{siteSettingsJavascriptOptimizerBlockedSubLabel}">
-           </settings-category-default-radio-group>
-           <category-setting-exceptions
--              category="[[contentSettingsTypesEnum_.JAVASCRIPT_OPTIMIZER]]"
-+              category="[[contentSettingsTypesEnum_.JAVASCRIPT_JIT]]"
-               allow-header="$i18n{siteSettingsJavascriptOptimizerAllowedExceptions}"
-               block-header="$i18n{siteSettingsJavascriptOptimizerBlockedExceptions}"
-               search-filter="[[searchFilter_]]">