[AUTO][FILECONTROL] - version 137.0.7151.44

tools/under-control/src/RELEASE

@@ -1 +1 @@
-136.0.7103.125
+137.0.7151.44

tools/under-control/src/android_webview/browser/aw_content_browser_client.cc

@@ -26,6 +26,7 @@
 #include "android_webview/browser/aw_http_auth_handler.h"
 #include "android_webview/browser/aw_settings.h"
 #include "android_webview/browser/aw_speech_recognition_manager_delegate.h"
+#include "android_webview/browser/aw_web_contents_delegate.h"
 #include "android_webview/browser/aw_web_contents_view_delegate.h"
 #include "android_webview/browser/cookie_manager.h"
 #include "android_webview/browser/network_service/aw_browser_context_io_thread_handle.h"
@@ -102,6 +103,7 @@
 #include "content/public/browser/site_isolation_policy.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/content_descriptors.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
@@ -652,7 +654,11 @@ void AwContentBrowserClient::OverrideWebPreferences(
   if (aw_settings) {
     aw_settings->PopulateWebPreferences(web_prefs);
   }
-  web_prefs->modal_context_menu = false;
+
+  AwWebContentsDelegate* delegate =
+      static_cast<AwWebContentsDelegate*>(web_contents->GetDelegate());
+  web_prefs->modal_context_menu =
+      (delegate) ? delegate->isModalContextMenu() : false;
 }
 
 std::vector<std::unique_ptr<content::NavigationThrottle>>
@@ -782,40 +788,6 @@ AwContentBrowserClient::CreateURLLoaderThrottles(
   return result;
 }
 
-std::vector<std::unique_ptr<blink::URLLoaderThrottle>>
-AwContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive(
-    const network::ResourceRequest& request,
-    content::BrowserContext* browser_context,
-    const base::RepeatingCallback<content::WebContents*()>& wc_getter,
-    content::FrameTreeNodeId frame_tree_node_id) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  // Set lookup mechanism based on feature flag
-  HashRealTimeSelection hash_real_time_selection =
-      (base::FeatureList::IsEnabled(safe_browsing::kHashPrefixRealTimeLookups))
-          ? HashRealTimeSelection::kDatabaseManager
-          : HashRealTimeSelection::kNone;
-
-  std::vector<std::unique_ptr<blink::URLLoaderThrottle>> result;
-
-  result.push_back(safe_browsing::BrowserURLLoaderThrottle::Create(
-      base::BindRepeating(
-          [](AwContentBrowserClient* client) {
-            return client->GetSafeBrowsingUrlCheckerDelegate();
-          },
-          base::Unretained(this)),
-      wc_getter, frame_tree_node_id, /*navigation_id=*/std::nullopt,
-      // TODO(crbug.com/40663467): rt_lookup_service is
-      // used to perform real time URL check, which is gated by UKM opted-in.
-      // Since AW currently doesn't support UKM, this feature is not enabled.
-      /* rt_lookup_service */ nullptr,
-      /* hash_realtime_service */ nullptr,
-      /* hash_realtime_selection */
-      hash_real_time_selection,
-      /* async_check_tracker */ nullptr, /*referring_app_info=*/std::nullopt));
-
-  return result;
-}
-
 scoped_refptr<safe_browsing::UrlCheckerDelegate>
 AwContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

tools/under-control/src/android_webview/browser/aw_field_trials.cc

@@ -24,6 +24,7 @@
 #include "mojo/public/cpp/bindings/features.h"
 #include "net/base/features.h"
 #include "services/network/public/cpp/features.h"
+#include "storage/browser/blob/features.h"
 #include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/common/features_generated.h"
 #include "ui/android/ui_android_features.h"
@@ -94,6 +95,14 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
   aw_feature_overrides.DisableFeature(
       net::features::kThirdPartyStoragePartitioning);
 
+  // Disable fetching partitioned Blob URL on WebView.
+  aw_feature_overrides.DisableFeature(
+      ::features::kBlockCrossPartitionBlobUrlFetching);
+
+  // Disable enforcing `noopener` on Blob URL navigations on WebView.
+  aw_feature_overrides.DisableFeature(
+      blink::features::kEnforceNoopenerOnBlobURLNavigation);
+
 #if BUILDFLAG(ENABLE_VALIDATING_COMMAND_DECODER)
   // Disable the passthrough on WebView.
   aw_feature_overrides.DisableFeature(
@@ -306,14 +315,11 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
   // Sharing ANGLE's Vulkan queue is not supported on WebView.
   aw_feature_overrides.DisableFeature(::features::kVulkanFromANGLE);
 
-  // Viz has no internal differentiation for WebView. We will roll out these
-  // combined features separately.
-  aw_feature_overrides.DisableFeature(
-      ::features::kDrawImmediatelyWhenInteractive);
-  aw_feature_overrides.DisableFeature(
-      ::features::kAckOnSurfaceActivationWhenInteractive);
-
   // Partitioned :visited links history is not supported on WebView.
   aw_feature_overrides.DisableFeature(
       blink::features::kPartitionVisitedLinkDatabaseWithSelfLinks);
+
+  // Disable draw cutout edge-to-edge on WebView. Safe area insets are not
+  // handled correctly when WebView is drawing edge-to-edge.
+  aw_feature_overrides.DisableFeature(features::kDrawCutoutEdgeToEdge);
 }

tools/under-control/src/chrome/android/java/AndroidManifest.xml

@@ -74,6 +74,10 @@ by a child template that "extends" this file.
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
     {% endif %}
+    {% set enable_screen_capture = enable_screen_capture|default(0) %}
+    {% if enable_screen_capture == "true" %}
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
+    {% endif %}
     <!-- TODO(crbug.com/40259231): Remove this tools:ignore attribute once it's no longer necessary. -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" tools:ignore="SystemPermissionTypo" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" tools:ignore="SystemPermissionTypo" />
@@ -527,7 +531,7 @@ by a child template that "extends" this file.
             {% endblock %}
             {% block chrome_activity_common %}
             android:windowSoftInputMode="adjustResize"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize|uiMode|navigation|density"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize|uiMode|navigation|density|touchscreen|colorMode"
             android:hardwareAccelerated="false"
             {% endblock %}
         >
@@ -1028,7 +1032,9 @@ by a child template that "extends" this file.
             tools:ignore="ExportedService">
             <intent-filter>
               <action android:name="android.support.customtabs.action.CustomTabsService" />
+              <category android:name="androidx.browser.auth.category.AuthTab"/>
               <category android:name="androidx.browser.customtabs.category.ColorSchemeCustomization"/>
+              <category android:name="androidx.browser.customtabs.category.EphemeralBrowsing"/>
               <category android:name="androidx.browser.customtabs.category.NavBarColorCustomization"/>
               <category android:name="androidx.browser.customtabs.category.SetNetwork"/>
               <category android:name="androidx.browser.trusted.category.ImmersiveMode"/>
@@ -1128,9 +1134,16 @@ by a child template that "extends" this file.
         <receiver android:name="org.chromium.chrome.browser.offlinepages.AutoFetchNotifier$InProgressCancelReceiver"
             android:exported="false"/>
 
+        <receiver android:name="org.chromium.chrome.browser.safety_hub.UnsubscribedNotificationsNotificationManager$NotificationReceiver"
+            android:exported="false"/>
+
         <service android:name="org.chromium.chrome.browser.media.MediaCaptureNotificationService"
-            {% if is_desktop_android == "true" %}
+            {% if is_desktop_android == "true" and enable_screen_capture == "true" %}
+            android:foregroundServiceType="camera|microphone|mediaProjection|mediaPlayback"
+            {% elif is_desktop_android == "true" %}
             android:foregroundServiceType="camera|microphone"
+            {% elif enable_screen_capture == "true" %}
+            android:foregroundServiceType="mediaProjection|mediaPlayback"
             {% endif %}
             android:exported="false"/>
         <service android:name="org.chromium.chrome.browser.media.ui.ChromeMediaNotificationControllerServices$PlaybackListenerService"
@@ -1158,6 +1171,9 @@ by a child template that "extends" this file.
         <service android:name="org.chromium.chrome.browser.app.bluetooth.BluetoothNotificationService"
             android:exported="false"/>
 
+        <service android:name="org.chromium.chrome.browser.app.serial.SerialNotificationService"
+            android:exported="false"/>
+
         <service android:name="org.chromium.chrome.browser.app.usb.UsbNotificationService"
             android:exported="false"/>
 
@@ -1192,11 +1208,10 @@ by a child template that "extends" this file.
             android:label="WebXR"
             android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
             tools:ignore="NonResizeableActivity,DiscouragedApi">
-            <property android:name="android.window.PROPERTY_ACTIVITY_STARTS_IN_IMMERSIVE_XR"
-                android:value="true" />
+            <property android:name="android.window.PROPERTY_XR_ACTIVITY_START_MODE"
+                android:value="XR_ACTIVITY_START_MODE_HOME_SPACE" />
             <intent-filter>
               <action android:name="android.intent.action.MAIN" />
-              <category android:name="android.intent.category.XR" />
               <category android:name="org.khronos.openxr.intent.category.IMMERSIVE_HMD" />
             </intent-filter>
           </activity>

tools/under-control/src/chrome/browser/chrome_browser_interface_binders.cc

@@ -15,6 +15,9 @@
 #include "chrome/browser/buildflags.h"
 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 #include "chrome/browser/navigation_predictor/navigation_predictor.h"
+#include "chrome/browser/optimization_guide/model_execution/chrome_on_device_model_service_controller.h"
+#include "chrome/browser/optimization_guide/optimization_guide_keyed_service.h"
+#include "chrome/browser/optimization_guide/optimization_guide_keyed_service_factory.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #include "chrome/browser/predictors/lcp_critical_path_predictor/lcp_critical_path_predictor_host.h"
 #include "chrome/browser/predictors/network_hints_handler_impl.h"
@@ -40,6 +43,7 @@
 #include "components/live_caption/pref_names.h"
 #include "components/no_state_prefetch/browser/no_state_prefetch_contents.h"
 #include "components/no_state_prefetch/browser/no_state_prefetch_processor_impl.h"
+#include "components/optimization_guide/public/mojom/model_broker.mojom.h"
 #include "components/performance_manager/embedder/binders.h"
 #include "components/performance_manager/embedder/performance_manager_registry.h"
 #include "components/prefs/pref_service.h"
@@ -317,7 +321,8 @@ void BindSpeechRecognitionRecognizerClientHandler(
   Profile* profile = Profile::FromBrowserContext(
       frame_host->GetProcess()->GetBrowserContext());
   PrefService* profile_prefs = profile->GetPrefs();
-  if (profile_prefs->GetBoolean(prefs::kLiveCaptionEnabled) &&
+  if ((profile_prefs->GetBoolean(prefs::kLiveCaptionEnabled) ||
+       profile_prefs->GetBoolean(prefs::kHeadlessCaptionEnabled)) &&
       captions::IsLiveCaptionFeatureSupported()) {
     captions::LiveCaptionSpeechRecognitionHost::Create(
         frame_host, std::move(client_receiver));
@@ -379,6 +384,18 @@ void BindScreen2xMainContentExtractor(
 }
 #endif
 
+void BindModelBroker(
+    content::RenderFrameHost* frame_host,
+    mojo::PendingReceiver<optimization_guide::mojom::ModelBroker> receiver) {
+  content::BrowserContext* browser_context = frame_host->GetBrowserContext();
+  Profile* profile = Profile::FromBrowserContext(browser_context);
+  OptimizationGuideKeyedService* optimization_guide_service =
+      OptimizationGuideKeyedServiceFactory::GetForProfile(profile);
+  if (optimization_guide_service) {
+    optimization_guide_service->BindModelBroker(std::move(receiver));
+  }
+}
+
 }  // namespace
 
 void PopulateChromeFrameBinders(
@@ -414,6 +431,9 @@ void PopulateChromeFrameBinders(
   map->Add<translate::mojom::ContentTranslateDriver>(
       base::BindRepeating(&translate::BindContentTranslateDriver));
 
+  map->Add<optimization_guide::mojom::ModelBroker>(
+      base::BindRepeating(&BindModelBroker));
+
   if (!base::FeatureList::IsEnabled(blink::features::kLanguageDetectionAPI)) {
     // When the feature is enabled, the driver is bound by
     // browser_interface_binders.cc to make it available to JS execution

tools/under-control/src/chrome/browser/chrome_content_browser_client.cc

@@ -80,7 +80,6 @@
 #include "chrome/browser/enterprise/reporting/legacy_tech/legacy_tech_service.h"
 #include "chrome/browser/enterprise/reporting/prefs.h"
 #include "chrome/browser/enterprise/util/managed_browser_utils.h"
-#include "chrome/browser/extensions/chrome_extension_cookies.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/favicon/favicon_utils.h"
 #include "chrome/browser/first_party_sets/first_party_sets_navigation_throttle.h"
@@ -351,6 +350,7 @@
 #include "content/public/browser/network_service_instance.h"
 #include "content/public/browser/overlay_window.h"
 #include "content/public/browser/permission_controller.h"
+#include "content/public/browser/permission_descriptor_util.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/site_isolation_mode.h"
@@ -568,7 +568,6 @@
 #include "chrome/browser/apps/intent_helper/chromeos_disabled_apps_throttle.h"
 #include "chrome/browser/apps/link_capturing/chromeos_link_capturing_delegate.h"
 #include "chrome/browser/apps/link_capturing/chromeos_reimpl_navigation_capturing_throttle.h"
-#include "chrome/browser/chromeos/enterprise/incognito_navigation_throttle.h"
 #include "chrome/browser/chromeos/policy/dlp/dlp_scoped_file_access_delegate.h"
 #include "chrome/browser/chromeos/tablet_mode/chrome_content_browser_client_tablet_mode_part.h"
 #include "chrome/browser/file_system_access/cloud_identifier/cloud_identifier_util_cros.h"
@@ -642,12 +641,15 @@
 #include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h"
 #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h"
 #include "chrome/browser/enterprise/signin/managed_profile_required_navigation_throttle.h"
+#include "chrome/browser/enterprise/webstore/chrome_web_store_navigation_throttle.h"
+#include "chrome/browser/enterprise/webstore/features.h"
 #include "chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.h"
 #endif
 
 #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
     BUILDFLAG(IS_CHROMEOS)
 #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
+#include "chrome/browser/enterprise/incognito/incognito_navigation_throttle.h"
 #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
         // BUILDFLAG(IS_CHROMEOS)
 
@@ -675,6 +677,7 @@
 
 #if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
 #include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h"
+#include "chrome/browser/extensions/chrome_extension_cookies.h"
 #include "extensions/browser/api/web_request/web_request_api.h"
 #include "extensions/browser/extension_navigation_throttle.h"
 #include "extensions/browser/extension_protocols.h"
@@ -805,7 +808,9 @@
 #endif  // BUILDFLAG(OS_LEVEL_GEOLOCATION_PERMISSION_SUPPORTED)
 
 #if BUILDFLAG(IS_ANDROID)
+#include "chrome/browser/contextmenu/context_menu_features.h"
 #include "chrome/browser/feed/feed_service_factory.h"
+#include "chrome/browser/safe_browsing/advanced_protection_status_manager_android.h"
 #include "components/feed/feed_feature_list.h"
 #endif  // BUILDFLAG(IS_ANDROID)
 
@@ -849,6 +854,10 @@ namespace {
 
 const char kAIManagerUserDataKey[] = "ai_manager";
 
+// Whether to disable caching of the advanced-protection state in
+// ShouldEnableStrictSiteIsolation().
+bool g_disable_advanced_protection_caching_for_tests = false;
+
 BASE_FEATURE(kSkipPagehideInCommitForDSENavigation,
              "SkipPagehideInCommitForDSENavigation",
              base::FEATURE_DISABLED_BY_DEFAULT);
@@ -1620,9 +1629,6 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
   registry->RegisterBooleanPref(prefs::kDataUrlInSvgUseEnabled, false);
   registry->RegisterBooleanPref(prefs::kPartitionedBlobUrlUsage, true);
 
-  registry->RegisterBooleanPref(policy::policy_prefs::kMutationEventsEnabled,
-                                false);
-
   registry->RegisterBooleanPref(
       policy::policy_prefs::kCSSCustomStateDeprecatedSyntaxEnabled,
       /*default_value=*/false);
@@ -1644,8 +1650,12 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
   registry->RegisterBooleanPref(
       policy::policy_prefs::kForcePermissionPolicyUnloadDefaultEnabled, false);
 
-#if BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+    BUILDFLAG(IS_LINUX)
   registry->RegisterListPref(prefs::kMandatoryExtensionsForIncognitoNavigation);
+#endif
+
+#if BUILDFLAG(IS_CHROMEOS)
   registry->RegisterListPref(
       prefs::kSubAppsAPIsAllowedWithoutGestureAndAuthorizationForOrigins);
 #endif
@@ -1655,6 +1665,8 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
   registry->RegisterBooleanPref(
       prefs::kServiceWorkerToControlSrcdocIframeEnabled, true);
   registry->RegisterBooleanPref(prefs::kReduceAcceptLanguageEnabled, true);
+  registry->RegisterBooleanPref(policy::policy_prefs::kBuiltInAIAPIsEnabled,
+                                true);
 }
 
 // static
@@ -1676,6 +1688,11 @@ void ChromeContentBrowserClient::SetApplicationLocale(
       FROM_HERE, base::BindOnce(&SetApplicationLocaleOnIOThread, locale));
 }
 
+// static
+void ChromeContentBrowserClient::DisableAdvancedProtectionCachingForTests() {
+  g_disable_advanced_protection_caching_for_tests = true;
+}
+
 void ChromeContentBrowserClient::MaybeProxyNetworkBoundRequest(
     content::BrowserContext* browser_context,
     net::handles::NetworkHandle bound_network,
@@ -2207,7 +2224,7 @@ std::string ChromeContentBrowserClient::GetSiteDisplayNameForCdmProcess(
   // By default, use the |site_url| spec as the display name.
   std::string name = site_url.spec();
 
-#if BUILDFLAG(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
   // If |site_url| wraps a chrome extension ID, we can display the extension
   // name instead, which is more human-readable.
   if (site_url.SchemeIs(extensions::kExtensionScheme)) {
@@ -2218,7 +2235,7 @@ std::string ChromeContentBrowserClient::GetSiteDisplayNameForCdmProcess(
     if (extension)
       name = extension->name();
   }
-#endif  // BUILDFLAG(ENABLE_EXTENSIONS)
+#endif  // BUILDFLAG(ENABLE_EXTENSIONS_CORE)
 
   return name;
 }
@@ -2227,6 +2244,7 @@ void ChromeContentBrowserClient::OverrideURLLoaderFactoryParams(
     content::BrowserContext* browser_context,
     const url::Origin& origin,
     bool is_for_isolated_world,
+    bool is_for_service_worker,
     network::mojom::URLLoaderFactoryParams* factory_params) {
 #if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
   if (ChromeContentBrowserClientExtensionsPart::AreExtensionsDisabledForProfile(
@@ -2235,7 +2253,8 @@ void ChromeContentBrowserClient::OverrideURLLoaderFactoryParams(
   }
 
   ChromeContentBrowserClientExtensionsPart::OverrideURLLoaderFactoryParams(
-      browser_context, origin, is_for_isolated_world, factory_params);
+      browser_context, origin, is_for_isolated_world, is_for_service_worker,
+      factory_params);
 #endif
 }
 
@@ -2307,7 +2326,7 @@ bool ChromeContentBrowserClient::HasCustomSchemeHandler(
 
 bool ChromeContentBrowserClient::HasWebRequestAPIProxy(
     content::BrowserContext* browser_context) {
-#if BUILDFLAG(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
   const auto* web_request_api =
       extensions::BrowserContextKeyedAPIFactory<extensions::WebRequestAPI>::Get(
           browser_context);
@@ -2559,7 +2578,27 @@ ChromeContentBrowserClient::GetOriginsRequiringDedicatedProcess() {
 }
 
 bool ChromeContentBrowserClient::ShouldEnableStrictSiteIsolation() {
-  return base::FeatureList::IsEnabled(features::kSitePerProcess);
+  if (base::FeatureList::IsEnabled(features::kSitePerProcess)) {
+    return true;
+  }
+
+#if BUILDFLAG(IS_ANDROID)
+  // Minimum memory requirements are checked in ShouldDisableSiteIsolation().
+  // See crbug.com/395862563
+
+  if (g_disable_advanced_protection_caching_for_tests) {
+    return safe_browsing::AdvancedProtectionStatusManagerAndroid::
+        QueryIsUnderAdvancedProtection();
+  }
+  // Don't change ShouldEnableStrictSiteIsolation() return value at runtime. A
+  // restart is needed to update site isolation mode when the Advanced
+  // Protection state changes.
+  static bool g_in_os_advanced_protection_mode = safe_browsing::
+      AdvancedProtectionStatusManagerAndroid::QueryIsUnderAdvancedProtection();
+  return g_in_os_advanced_protection_mode;
+#else
+  return false;
+#endif
 }
 
 bool ChromeContentBrowserClient::ShouldDisableSiteIsolation(
@@ -2634,7 +2673,6 @@ void ChromeContentBrowserClient::CheckGetAllScreensMediaAllowed(
     content::RenderFrameHost* render_frame_host,
     base::OnceCallback<void(bool)> callback) {
   capture_policy::CheckGetAllScreensMediaAllowed(
-      render_frame_host->GetBrowserContext(),
       render_frame_host->GetMainFrame()->GetLastCommittedOrigin().GetURL(),
       std::move(callback));
 }
@@ -2805,10 +2843,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
             blink::switches::kDisableBlobUrlPartitioning);
       }
 
-      if (prefs->GetBoolean(policy::policy_prefs::kMutationEventsEnabled)) {
-        command_line->AppendSwitch(blink::switches::kMutationEventsEnabled);
-      }
-
       if (!prefs->GetBoolean(
               policy::policy_prefs::kKeyboardFocusableScrollersEnabled)) {
         command_line->AppendSwitch(
@@ -2959,7 +2993,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
 #if BUILDFLAG(IS_CHROMEOS)
         switches::kShortMergeSessionTimeoutForTest,  // For tests only.
 #endif
-#if BUILDFLAG(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
         extensions::switches::kAllowHTTPBackgroundPage,
         extensions::switches::kAllowLegacyExtensionManifests,
         extensions::switches::kDisableExtensionsHttpThrottling,
@@ -2981,6 +3015,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
 #endif
         switches::kEnableNetBenchmarking,
         switches::kExtensionAiDataCollection,
+        switches::kExtensionExperimentalActor,
 #if BUILDFLAG(IS_CHROMEOS)
         chromeos::switches::
             kTelemetryExtensionPwaOriginOverrideForTesting,  // For tests only.
@@ -3001,7 +3036,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
 
     command_line->CopySwitchesFrom(browser_command_line, kSwitchNames);
   } else if (process_type == switches::kUtilityProcess) {
-#if BUILDFLAG(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
     static const char* const kSwitchNames[] = {
         extensions::switches::kAllowHTTPBackgroundPage,
         extensions::switches::kEnableExperimentalExtensionApis,
@@ -3057,6 +3092,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
   if (!performance_manager::ShouldPreReadDllInChild()) {
     command_line->AppendSwitch(switches::kNoPreReadMainDll);
   }
+
+  base::TimeTicks::MaybeAddHighResolutionTimeTicksSwitch(command_line);
 #endif
 
   ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
@@ -4208,8 +4245,11 @@ base::OnceClosure ChromeContentBrowserClient::SelectClientCertificate(
     // result in always proceeding with no certificate for any request from an
     // extension service worker. That decision would be remembered across the
     // entire profile, potentially locking the user out of the origin.
-    // Allow background requests on desktop android even if there are no
-    // matching certificates.
+    // For now, allow all extension background requests on desktop android to
+    // proceed without a certificate. This is done as a temporary workaround to
+    // enable testing.
+    // TODO(wenz): This should instead proceed with the selected certificate
+    // when there are matching certificates in the OS.
 #if BUILDFLAG(ENABLE_EXTENSIONS) && \
     !(BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_DESKTOP_ANDROID))
     if (matching_certificates.empty() && nonmatching_certificates.empty()) {
@@ -4692,6 +4732,10 @@ void ChromeContentBrowserClient::OverrideWebPreferences(
 
   web_prefs->prefers_default_scrollbar_styles =
       prefs->GetBoolean(prefs::kPrefersDefaultScrollbarStyles);
+#if BUILDFLAG(IS_ANDROID)
+  web_prefs->always_show_context_menu_on_touch =
+      base::FeatureList::IsEnabled(::features::kContextMenuEmptySpace);
+#endif
 }
 
 bool ChromeContentBrowserClientParts::OverrideWebPreferencesAfterNavigation(
@@ -5499,6 +5543,13 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
   MaybeAddThrottle(
       ManagedProfileRequiredNavigationThrottle::MaybeCreateThrottleFor(handle),
       &throttles);
+
+  if (base::FeatureList::IsEnabled(
+          enterprise::webstore::kChromeWebStoreNavigationThrottle)) {
+    throttles.push_back(
+        std::make_unique<enterprise_webstore::ChromeWebStoreNavigationThrottle>(
+            handle));
+  }
 #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 
 #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -5656,15 +5707,23 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
   // TODO(b:296844164) Handle captive portal signin properly.
   if (profile && profile->IsIncognitoProfile() && profile->IsOffTheRecord() &&
       !profile->GetOTRProfileID().IsCaptivePortal()) {
-    MaybeAddThrottle(
-        chromeos::IncognitoNavigationThrottle::MaybeCreateThrottleFor(handle),
-        &throttles);
+    MaybeAddThrottle(enterprise_incognito::IncognitoNavigationThrottle::
+                         MaybeCreateThrottleFor(handle),
+                     &throttles);
   }
 
   MaybeAddThrottle(apps::AppInstallNavigationThrottle::MaybeCreate(handle),
                    &throttles);
 #endif  // BUILDFLAG(IS_CHROMEOS)
 
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+  if (profile && profile->IsIncognitoProfile() && profile->IsOffTheRecord()) {
+    MaybeAddThrottle(enterprise_incognito::IncognitoNavigationThrottle::
+                         MaybeCreateThrottleFor(handle),
+                     &throttles);
+  }
+#endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+
 #if !BUILDFLAG(IS_ANDROID)
   MaybeAddThrottle(PreviewNavigationThrottle::MaybeCreateThrottleFor(handle),
                    &throttles);
@@ -6180,9 +6239,7 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
 
 std::vector<std::unique_ptr<blink::URLLoaderThrottle>>
 ChromeContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive(
-    const network::ResourceRequest& request,
     content::BrowserContext* browser_context,
-    const base::RepeatingCallback<content::WebContents*()>& wc_getter,
     content::FrameTreeNodeId frame_tree_node_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
@@ -6192,15 +6249,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive(
   Profile* profile = Profile::FromBrowserContext(browser_context);
   DCHECK(profile);
 
-#if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
-  if (auto safe_browsing_throttle = MaybeCreateSafeBrowsingURLLoaderThrottle(
-          request, browser_context, wc_getter, frame_tree_node_id,
-          /*navigation_id=*/std::nullopt, profile);
-      safe_browsing_throttle) {
-    result.push_back(std::move(safe_browsing_throttle));
-  }
-#endif
-
 #if BUILDFLAG(IS_ANDROID)
   auto [client_data_header, unused_is_custom_tab] =
       GetClientDataHeader(frame_tree_node_id);
@@ -6479,13 +6527,14 @@ void InitializeFileURLLoaderFactoryForExtension(
 }
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS_CORE)
 
-#if BUILDFLAG(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
 void AddChromeSchemeFactories(
     int render_process_id,
     content::RenderFrameHost* frame_host,
     content::WebContents* web_contents,
     const extensions::Extension* extension,
     ChromeContentBrowserClient::NonNetworkURLLoaderFactoryMap* factories) {
+#if BUILDFLAG(ENABLE_EXTENSIONS)
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   InstantService* instant_service =
@@ -6503,6 +6552,7 @@ void AddChromeSchemeFactories(
                            frame_host, chrome::kChromeSearchScheme,
                            /*allowed_hosts=*/base::flat_set<std::string>()));
   }
+#endif  // BUILDFLAG(ENABLE_EXTENSIONS)
 
   extensions::ExtensionWebContentsObserver* web_observer =
       extensions::ExtensionWebContentsObserver::GetForWebContents(web_contents);
@@ -6541,7 +6591,7 @@ void AddChromeSchemeFactories(
                            std::move(allowed_webui_hosts)));
   }
 }
-#endif  // BUILDFLAG(ENABLE_EXTENSIONS)
+#endif  // BUILDFLAG(ENABLE_EXTENSIONS_CORE)
 }  // namespace
 
 void ChromeContentBrowserClient::
@@ -6550,12 +6600,12 @@ void ChromeContentBrowserClient::
         int render_frame_id,
         const std::optional<url::Origin>& request_initiator_origin,
         NonNetworkURLLoaderFactoryMap* factories) {
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(ENABLE_EXTENSIONS) || \
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(ENABLE_EXTENSIONS_CORE) || \
     !BUILDFLAG(IS_ANDROID)
   content::RenderFrameHost* frame_host =
       RenderFrameHost::FromID(render_process_id, render_frame_id);
   WebContents* web_contents = WebContents::FromRenderFrameHost(frame_host);
-#endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(ENABLE_EXTENSIONS) || \
+#endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(ENABLE_EXTENSIONS_CORE) || \
         // !BUILDFLAG(IS_ANDROID)
 
 #if BUILDFLAG(IS_CHROMEOS)
@@ -6598,8 +6648,9 @@ void ChromeContentBrowserClient::
       content::RenderProcessHost::FromID(render_process_id)
           ->GetBrowserContext();
   if (ChromeContentBrowserClientExtensionsPart::AreExtensionsDisabledForProfile(
-          browser_context))
+          browser_context)) {
     return;
+  }
 
   factories->emplace(extensions::kExtensionScheme,
                      extensions::CreateExtensionURLLoaderFactory(
@@ -6625,14 +6676,12 @@ void ChromeContentBrowserClient::
         render_process_id, browser_context, extension, factories);
   }
 
-#if BUILDFLAG(ENABLE_EXTENSIONS)
   // This logic should match
   // ChromeExtensionWebContentsObserver::RenderFrameCreated.
   if (web_contents) {
     AddChromeSchemeFactories(render_process_id, frame_host, web_contents,
                              extension, factories);
   }
-#endif  // BUILDFLAG(ENABLE_EXTENSIONS)
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS_CORE)
 }
 
@@ -6747,7 +6796,7 @@ ChromeContentBrowserClient::
 
 bool ChromeContentBrowserClient::WillInterceptWebSocket(
     content::RenderFrameHost* frame) {
-#if BUILDFLAG(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
   if (!frame) {
     return false;
   }
@@ -6775,7 +6824,7 @@ void ChromeContentBrowserClient::CreateWebSocket(
     const std::optional<std::string>& user_agent,
     mojo::PendingRemote<network::mojom::WebSocketHandshakeClient>
         handshake_client) {
-#if BUILDFLAG(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
   // TODO(crbug.com/40195467): Request w/o a frame also should be proxied.
   if (!frame) {
     return;
@@ -6799,7 +6848,7 @@ void ChromeContentBrowserClient::WillCreateWebTransport(
     mojo::PendingRemote<network::mojom::WebTransportHandshakeClient>
         handshake_client,
     WillCreateWebTransportCallback callback) {
-#if BUILDFLAG(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // TODO(crbug.com/40195467): Add a unit test which calls
   // ChromeContentBrowserClient::WillCreateWebTransport() with invalid process
@@ -6838,7 +6887,7 @@ bool ChromeContentBrowserClient::WillCreateRestrictedCookieManager(
     int routing_id,
     mojo::PendingReceiver<network::mojom::RestrictedCookieManager>* receiver) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-#if BUILDFLAG(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
   if (origin.scheme() == extensions::kExtensionScheme) {
     DCHECK_EQ(network::mojom::RestrictedCookieManagerRole::SCRIPT, role);
     extensions::ChromeExtensionCookies::Get(browser_context)
@@ -7197,17 +7246,16 @@ ChromeContentBrowserClient::CreateWindowForVideoPictureInPicture(
   return content::VideoOverlayWindow::Create(controller);
 }
 
-media::PictureInPictureEventsInfo::AutoPipReason
-ChromeContentBrowserClient::GetAutoPipReason(
+media::PictureInPictureEventsInfo::AutoPipInfo
+ChromeContentBrowserClient::GetAutoPipInfo(
     const content::WebContents& web_contents) const {
 #if BUILDFLAG(IS_ANDROID)
-  return media::PictureInPictureEventsInfo::AutoPipReason::kUnknown;
+  return media::PictureInPictureEventsInfo::AutoPipInfo();
 #else
   auto* auto_pip_tab_helper =
       AutoPictureInPictureTabHelper::FromWebContents(&web_contents);
-  return auto_pip_tab_helper
-             ? auto_pip_tab_helper->GetAutoPipTriggerReason()
-             : media::PictureInPictureEventsInfo::AutoPipReason::kUnknown;
+  return auto_pip_tab_helper ? auto_pip_tab_helper->GetAutoPipInfo()
+                             : media::PictureInPictureEventsInfo::AutoPipInfo();
 #endif  // BUILDFLAG(IS_ANDROID)
 }
 
@@ -7788,7 +7836,10 @@ bool ChromeContentBrowserClient::IsClipboardPasteAllowed(
       browser_context->GetPermissionController();
   blink::mojom::PermissionStatus status =
       permission_controller->GetPermissionStatusForCurrentDocument(
-          blink::PermissionType::CLIPBOARD_READ_WRITE, render_frame_host);
+          content::PermissionDescriptorUtil::
+              CreatePermissionDescriptorForPermissionType(
+                  blink::PermissionType::CLIPBOARD_READ_WRITE),
+          render_frame_host);
   if (status == blink::mojom::PermissionStatus::GRANTED)
     return true;
 
@@ -8701,12 +8752,12 @@ void ChromeContentBrowserClient::NotifyMultiCaptureStateChanged(
 }
 #endif  // BUILDFLAG(IS_CHROMEOS)
 
-bool ChromeContentBrowserClient::ShouldEnableDips(
+bool ChromeContentBrowserClient::ShouldEnableBtm(
     content::BrowserContext* browser_context) {
-  return ShouldBrowserContextEnableDips(browser_context);
+  return ShouldBrowserContextEnableBtm(browser_context);
 }
 
-bool ShouldBrowserContextEnableDips(content::BrowserContext* browser_context) {
+bool ShouldBrowserContextEnableBtm(content::BrowserContext* browser_context) {
   Profile* profile = Profile::FromBrowserContext(browser_context);
   Profile* result = GetHumanProfileSelections().ApplyProfileSelection(profile);
   CHECK(!result || result == profile)
@@ -8714,7 +8765,7 @@ bool ShouldBrowserContextEnableDips(content::BrowserContext* browser_context) {
   return result == profile;
 }
 
-void ChromeContentBrowserClient::OnDipsServiceCreated(
+void ChromeContentBrowserClient::OnBtmServiceCreated(
     content::BrowserContext* browser_context,
     content::BtmService* btm_service) {
   // Create BtmBrowserSigninDetector.
@@ -8722,18 +8773,18 @@ void ChromeContentBrowserClient::OnDipsServiceCreated(
   btm::StatefulBounceCounter::CreateFor(btm_service);
 }
 
-static_assert(content::ContentBrowserClient::kDefaultDipsRemoveMask ==
+static_assert(content::ContentBrowserClient::kDefaultBtmRemoveMask ==
                   (chrome_browsing_data_remover::FILTERABLE_DATA_TYPES &
                    ((content::BrowsingDataRemover::DATA_TYPE_CONTENT_END << 1) -
                     1)),
-              "kDefaultDipsRemoveMask must contain all the entries of "
+              "kDefaultBtmRemoveMask must contain all the entries of "
               "FILTERABLE_DATA_TYPES that are known in //content");
 
-uint64_t ChromeContentBrowserClient::GetDipsRemoveMask() {
+uint64_t ChromeContentBrowserClient::GetBtmRemoveMask() {
   return chrome_browsing_data_remover::FILTERABLE_DATA_TYPES;
 }
 
-bool ChromeContentBrowserClient::ShouldDipsDeleteInteractionRecords(
+bool ChromeContentBrowserClient::ShouldBtmDeleteInteractionRecords(
     uint64_t remove_mask) {
   return remove_mask & chrome_browsing_data_remover::DATA_TYPE_HISTORY;
 }
@@ -8751,10 +8802,12 @@ bool ChromeContentBrowserClient::ShouldSuppressAXLoadComplete(
 void ChromeContentBrowserClient::BindAIManager(
     content::BrowserContext* browser_context,
     base::SupportsUserData* context_user_data,
+    content::RenderFrameHost* rfh,
     mojo::PendingReceiver<blink::mojom::AIManager> receiver) {
   if (!context_user_data->GetUserData(kAIManagerUserDataKey)) {
     context_user_data->SetUserData(
-        kAIManagerUserDataKey, std::make_unique<AIManager>(browser_context));
+        kAIManagerUserDataKey,
+        std::make_unique<AIManager>(browser_context, rfh));
   }
 
   AIManager* ai_manager = static_cast<AIManager*>(
@@ -8918,6 +8971,31 @@ void ChromeContentBrowserClient::OnUiaProviderRequested(
     }
   }
 }
+
+void ChromeContentBrowserClient::OnUiaProviderDisabled() {
+  // Regardless of whether another request has been handled before, we want to
+  // make this user as part of the "Rejected" group.
+  handled_uia_provider_request_ = true;
+
+  if (features::kUiaProvider.default_state ==
+      base::FEATURE_ENABLED_BY_DEFAULT) {
+    // Do nothing if the feature has launched.
+    // TODO: Remove all code relating to this synthetic field trial.
+    return;
+  }
+
+  // See the comment in `ChromeContentBrowserClient::OnUiaProviderRequested`.
+  if (auto* trial = base::FeatureList::GetFieldTrial(features::kUiaProvider)) {
+    // When the UI Automation Provider is forcibly disabled despite the user
+    // being in the "Enabled" group, we want to ensure that the user is properly
+    // assigned to the "Rejected" group.
+    if (base::StartsWith(trial->GetGroupNameWithoutActivation(), "Enabled")) {
+      ChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial(
+          "UiaProviderActiveSynthetic", "Rejected",
+          variations::SyntheticTrialAnnotationMode::kCurrentLog);
+    }
+  }
+}
 #endif  // BUILDFLAG(IS_WIN)
 
 void ChromeContentBrowserClient::SetSamplingProfiler(
@@ -9031,10 +9109,8 @@ std::unique_ptr<content::KeepAliveRequestTracker>
 ChromeContentBrowserClient::MaybeCreateKeepAliveRequestTracker(
     const network::ResourceRequest& request,
     std::optional<ukm::SourceId> ukm_source_id,
-    bool is_attribution_reporting_eligible_request,
     content::KeepAliveRequestTracker::IsContextDetachedCallback
         is_context_detached_callback) {
   return ChromeKeepAliveRequestTracker::MaybeCreateKeepAliveRequestTracker(
-      request, ukm_source_id, is_attribution_reporting_eligible_request,
-      std::move(is_context_detached_callback));
+      request, ukm_source_id, std::move(is_context_detached_callback));
 }

tools/under-control/src/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

@@ -154,31 +154,37 @@ public abstract class ChromeFeatureList {
     // Feature names.
     /* Alphabetical: */
     public static final String ACT_USER_BYPASS_UX = "ActUserBypassUx";
-    public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =
-            "AdaptiveButtonInTopToolbarPageSummary";
     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
             "AdaptiveButtonInTopToolbarCustomizationV2";
+    public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =
+            "AdaptiveButtonInTopToolbarPageSummary";
     public static final String ALLOW_NEW_INCOGNITO_TAB_INTENTS = "AllowNewIncognitoTabIntents";
     public static final String ALWAYS_BLOCK_3PCS_INCOGNITO = "AlwaysBlock3pcsIncognito";
+    public static final String ANDROID_APPEARANCE_SETTINGS = "AndroidAppearanceSettings";
     public static final String ANDROID_APP_INTEGRATION = "AndroidAppIntegration";
     public static final String ANDROID_APP_INTEGRATION_MODULE = "AndroidAppIntegrationModule";
-    public static final String ANDROID_APP_INTEGRATION_V2 = "AndroidAppIntegrationV2";
-    public static final String NEW_TAB_PAGE_CUSTOMIZATION = "NewTabPageCustomization";
-    public static final String ANDROID_APP_INTEGRATION_WITH_FAVICON =
-            "AndroidAppIntegrationWithFavicon";
     public static final String ANDROID_APP_INTEGRATION_MULTI_DATA_SOURCE =
             "AndroidAppIntegrationMultiDataSource";
-    public static final String ANDROID_APPEARANCE_SETTINGS = "AndroidAppearanceSettings";
+    public static final String ANDROID_APP_INTEGRATION_V2 = "AndroidAppIntegrationV2";
+    public static final String ANDROID_APP_INTEGRATION_WITH_FAVICON =
+            "AndroidAppIntegrationWithFavicon";
     public static final String ANDROID_BOOKMARK_BAR = "AndroidBookmarkBar";
     public static final String ANDROID_BOTTOM_TOOLBAR = "AndroidBottomToolbar";
     public static final String ANDROID_DUMP_ON_SCROLL_WITHOUT_RESOURCE =
             "AndroidDumpOnScrollWithoutResource";
     public static final String ANDROID_ELEGANT_TEXT_HEIGHT = "AndroidElegantTextHeight";
     public static final String ANDROID_KEYBOARD_A11Y = "AndroidKeyboardA11y";
+    public static final String ANDROID_META_CLICK_HISTORY_NAVIGATION =
+            "AndroidMetaClickHistoryNavigation";
+    public static final String ANDROID_MINIMAL_UI_LARGE_SCREEN = "AndroidMinimalUiLargeScreen";
+    public static final String ANDROID_NATIVE_PAGES_IN_NEW_TAB = "AndroidNativePagesInNewTab";
     public static final String ANDROID_NO_VISIBLE_HINT_FOR_DIFFERENT_TLD =
             "AndroidNoVisibleHintForDifferentTLD";
+    public static final String ANDROID_OMNIBOX_FOCUSED_NEW_TAB_PAGE =
+            "AndroidOmniboxFocusedNewTabPage";
     public static final String ANDROID_OPEN_PDF_INLINE_BACKPORT = "AndroidOpenPdfInlineBackport";
     public static final String ANDROID_PDF_ASSIST_CONTENT = "AndroidPdfAssistContent";
+    public static final String ANDROID_SURFACE_COLOR_UPDATE = "AndroidSurfaceColorUpdate";
     public static final String ANDROID_TAB_DECLUTTER = "AndroidTabDeclutter";
     public static final String ANDROID_TAB_DECLUTTER_ARCHIVE_ALL_BUT_ACTIVE =
             "AndroidTabDeclutterArchiveAllButActiveTab";
@@ -193,22 +199,23 @@ public abstract class ChromeFeatureList {
     public static final String ANDROID_TAB_SKIP_SAVE_TABS_TASK_KILLSWITCH =
             "AndroidTabSkipSaveTabsTaskKillswitch";
     public static final String ANDROID_THEME_MODULE = "AndroidThemeModule";
+    public static final String ANDROID_WEB_APP_LAUNCH_HANDLER = "AndroidWebAppLaunchHandler";
     public static final String ANDROID_WINDOW_POPUP_LARGE_SCREEN = "AndroidWindowPopupLargeScreen";
     public static final String ANIMATED_IMAGE_DRAG_SHADOW = "AnimatedImageDragShadow";
-    public static final String ANDROID_MINIMAL_UI_LARGE_SCREEN = "AndroidMinimalUiLargeScreen";
     public static final String APP_SPECIFIC_HISTORY = "AppSpecificHistory";
     public static final String ASYNC_NOTIFICATION_MANAGER = "AsyncNotificationManager";
     public static final String ASYNC_NOTIFICATION_MANAGER_FOR_DOWNLOAD =
             "AsyncNotificationManagerForDownload";
     public static final String AUTOFILL_ALLOW_NON_HTTP_ACTIVATION =
             "AutofillAllowNonHttpActivation";
+    public static final String AUTOFILL_DEEP_LINK_AUTOFILL_OPTIONS =
+            "AutofillDeepLinkAutofillOptions";
     public static final String AUTOFILL_ENABLE_CARD_BENEFITS_FOR_AMERICAN_EXPRESS =
             "AutofillEnableCardBenefitsForAmericanExpress";
     public static final String AUTOFILL_ENABLE_CARD_BENEFITS_FOR_BMO =
             "AutofillEnableCardBenefitsForBmo";
-    public static final String AUTOFILL_ENABLE_LOCAL_IBAN = "AutofillEnableLocalIban";
-    public static final String AUTOFILL_ENABLE_SERVER_IBAN = "AutofillEnableServerIban";
     public static final String AUTOFILL_ENABLE_CVC_STORAGE = "AutofillEnableCvcStorageAndFilling";
+    public static final String AUTOFILL_ENABLE_LOCAL_IBAN = "AutofillEnableLocalIban";
     public static final String AUTOFILL_ENABLE_PAYMENT_SETTINGS_CARD_PROMO_AND_SCAN_CARD =
             "AutofillEnablePaymentSettingsCardPromoAndScanCard";
     public static final String AUTOFILL_ENABLE_PAYMENT_SETTINGS_SERVER_CARD_SAVE =
@@ -217,29 +224,29 @@ public abstract class ChromeFeatureList {
             "AutofillEnableRankingFormulaAddressProfiles";
     public static final String AUTOFILL_ENABLE_RANKING_FORMULA_CREDIT_CARDS =
             "AutofillEnableRankingFormulaCreditCards";
+    public static final String AUTOFILL_ENABLE_SECURITY_TOUCH_EVENT_FILTERING_ANDROID =
+            "AutofillEnableSecurityTouchEventFilteringAndroid";
+    public static final String AUTOFILL_ENABLE_SERVER_IBAN = "AutofillEnableServerIban";
     public static final String AUTOFILL_ENABLE_SUPPORT_FOR_HOME_AND_WORK =
             "AutofillEnableSupportForHomeAndWork";
     public static final String AUTOFILL_ENABLE_SYNCING_OF_PIX_BANK_ACCOUNTS =
             "AutofillEnableSyncingOfPixBankAccounts";
     public static final String AUTOFILL_ENABLE_VERVE_CARD_SUPPORT =
             "AutofillEnableVerveCardSupport";
-    public static final String AUTOFILL_DEEP_LINK_AUTOFILL_OPTIONS =
-            "AutofillDeepLinkAutofillOptions";
-    public static final String AUTOFILL_VIRTUAL_VIEW_STRUCTURE_ANDROID =
-            "AutofillVirtualViewStructureAndroid";
+    public static final String AUTOFILL_RETRY_IMAGE_FETCH_ON_FAILURE =
+            "AutofillRetryImageFetchOnFailure";
+    public static final String AUTOFILL_SYNC_EWALLET_ACCOUNTS = "AutofillSyncEwalletAccounts";
     public static final String AUTOFILL_THIRD_PARTY_MODE_CONTENT_PROVIDER =
             "AutofillThirdPartyModeContentProvider";
-    public static final String AUTOFILL_ENABLE_SECURITY_TOUCH_EVENT_FILTERING_ANDROID =
-            "AutofillEnableSecurityTouchEventFilteringAndroid";
-    public static final String AUTOFILL_SYNC_EWALLET_ACCOUNTS = "AutofillSyncEwalletAccounts";
-    public static final String AUTOMOTIVE_FULLSCREEN_TOOLBAR_IMPROVEMENTS =
-            "AutomotiveFullscreenToolbarImprovements";
-    public static final String AVOID_SELECTED_TAB_FOCUS_ON_LAYOUT_DONE_SHOWING =
-            "AvoidSelectedTabFocusOnLayoutDoneShowing";
+    public static final String AUTOFILL_VIRTUAL_VIEW_STRUCTURE_ANDROID =
+            "AutofillVirtualViewStructureAndroid";
+    public static final String AVOID_RELAYOUT_DURING_FOCUS_ANIMATION =
+            "AvoidRelayoutDuringFocusAnimation";
     public static final String BACKGROUND_THREAD_POOL = "BackgroundThreadPool";
     public static final String BACK_FORWARD_CACHE = "BackForwardCache";
     public static final String BACK_FORWARD_TRANSITIONS = "BackForwardTransitions";
     public static final String BCIV_BOTTOM_CONTROLS = "AndroidBcivBottomControls";
+    public static final String BIOMETRIC_AUTH_IDENTITY_CHECK = "BiometricAuthIdentityCheck";
     public static final String BLOCK_INTENTS_WHILE_LOCKED = "BlockIntentsWhileLocked";
     public static final String BOARDING_PASS_DETECTOR = "BoardingPassDetector";
     public static final String BOOKMARK_PANE_ANDROID = "BookmarkPaneAndroid";
@@ -267,23 +274,22 @@ public abstract class ChromeFeatureList {
     public static final String CCT_EPHEMERAL_MODE = "CCTEphemeralMode";
     public static final String CCT_EXTEND_TRUSTED_CDN_PUBLISHER = "CCTExtendTrustedCdnPublisher";
     public static final String CCT_FRE_IN_SAME_TASK = "CCTFreInSameTask";
+    public static final String CCT_GOOGLE_BOTTOM_BAR = "CCTGoogleBottomBar";
+    public static final String CCT_GOOGLE_BOTTOM_BAR_VARIANT_LAYOUTS =
+            "CCTGoogleBottomBarVariantLayouts";
     public static final String CCT_INCOGNITO_AVAILABLE_TO_THIRD_PARTY =
             "CCTIncognitoAvailableToThirdParty";
+    public static final String CCT_INTENT_FEATURE_OVERRIDES = "CCTIntentFeatureOverrides";
     public static final String CCT_MINIMIZED = "CCTMinimized";
     public static final String CCT_MINIMIZED_ENABLED_BY_DEFAULT = "CCTMinimizedEnabledByDefault";
     public static final String CCT_NAVIGATIONAL_PREFETCH = "CCTNavigationalPrefetch";
     public static final String CCT_NESTED_SECURITY_ICON = "CCTNestedSecurityIcon";
-    public static final String CCT_INTENT_FEATURE_OVERRIDES = "CCTIntentFeatureOverrides";
-
-    public static final String CCT_GOOGLE_BOTTOM_BAR = "CCTGoogleBottomBar";
-    public static final String CCT_GOOGLE_BOTTOM_BAR_VARIANT_LAYOUTS =
-            "CCTGoogleBottomBarVariantLayouts";
     public static final String CCT_OPEN_IN_BROWSER_BUTTON_IF_ALLOWED_BY_EMBEDDER =
             "CCTOpenInBrowserButtonIfAllowedByEmbedder";
     public static final String CCT_OPEN_IN_BROWSER_BUTTON_IF_ENABLED_BY_EMBEDDER =
             "CCTOpenInBrowserButtonIfEnabledByEmbedder";
-    // NOTE: Do not query this feature directly, use
-    // WarmupManager#isCCTPrewarmTabFeatureEnabled.
+    public static final String CCT_PREDICTIVE_BACK_GESTURE = "CCTPredictiveBackGesture";
+    // NOTE: Do not query this feature directly, use WarmupManager#isCCTPrewarmTabFeatureEnabled.
     public static final String CCT_PREWARM_TAB = "CCTPrewarmTab";
     public static final String CCT_REPORT_PARALLEL_REQUEST_STATUS =
             "CCTReportParallelRequestStatus";
@@ -327,14 +333,15 @@ public abstract class ChromeFeatureList {
     public static final String DATA_SHARING_NON_PRODUCTION_ENVIRONMENT =
             "DataSharingNonProductionEnvironment";
     public static final String DEFAULT_BROWSER_PROMO_ANDROID2 = "DefaultBrowserPromoAndroid2";
-    public static final String DEVICE_AUTHENTICATOR_ANDROIDX = "DeviceAuthenticatorAndroidx";
     public static final String DETAILED_LANGUAGE_SETTINGS = "DetailedLanguageSettings";
+    public static final String DEVICE_AUTHENTICATOR_ANDROIDX = "DeviceAuthenticatorAndroidx";
     public static final String DISABLE_COMPOSITED_PROGRESS_BAR = "DisableCompositedProgressBar";
     public static final String DISABLE_INSTANCE_LIMIT = "DisableInstanceLimit";
     public static final String DISABLE_LIST_TAB_SWITCHER = "DisableListTabSwitcher";
     public static final String DISCO_FEED_ENDPOINT = "DiscoFeedEndpoint";
     public static final String DISPLAY_WILDCARD_CONTENT_SETTINGS =
             "DisplayWildcardInContentSettings";
+    public static final String DISPLAY_EDGE_TO_EDGE_FULLSCREEN = "DisplayEdgeToEdgeFullscreen";
     public static final String DRAW_CUTOUT_EDGE_TO_EDGE = "DrawCutoutEdgeToEdge";
     public static final String DRAW_KEY_NATIVE_EDGE_TO_EDGE = "DrawKeyNativeEdgeToEdge";
     public static final String DYNAMIC_SAFE_AREA_INSETS = "DynamicSafeAreaInsets";
@@ -347,13 +354,16 @@ public abstract class ChromeFeatureList {
     public static final String EDUCATIONAL_TIP_MODULE = "EducationalTipModule";
     public static final String EMPTY_TAB_LIST_ANIMATION_KILL_SWITCH =
             "EmptyTabListAnimationKillSwitch";
-    public static final String ENABLE_DISCOUNT_INFO_API = "EnableDiscountInfoApi";
-    public static final String ENABLE_X_AXIS_ACTIVITY_TRANSITION = "EnableXAxisActivityTransition";
+    public static final String ENABLE_BATCH_UPLOAD_FROM_SETTINGS = "EnableBatchUploadFromSettings";
+    public static final String ENABLE_SAVE_PACKAGE_FOR_OFF_THE_RECORD =
+            "EnableSavePackageForOffTheRecord";
     public static final String ENABLE_CLIPBOARD_DATA_CONTROLS_ANDROID =
             "EnableClipboardDataControlsAndroid";
-    public static final String ESB_AI_STRING_UPDATE = "EsbAiStringUpdate";
+    public static final String ENABLE_DISCOUNT_INFO_API = "EnableDiscountInfoApi";
+    public static final String ENABLE_X_AXIS_ACTIVITY_TRANSITION = "EnableXAxisActivityTransition";
     public static final String FEED_CONTAINMENT = "FeedContainment";
     public static final String FEED_FOLLOW_UI_UPDATE = "FeedFollowUiUpdate";
+    public static final String FEED_HEADER_REMOVAL = "FeedHeaderRemoval";
     public static final String FEED_IMAGE_MEMORY_CACHE_SIZE_PERCENTAGE =
             "FeedImageMemoryCacheSizePercentage";
     public static final String FEED_LOADING_PLACEHOLDER = "FeedLoadingPlaceholder";
@@ -373,11 +383,14 @@ public abstract class ChromeFeatureList {
     public static final String FULLSCREEN_INSETS_API_MIGRATION = "FullscreenInsetsApiMigration";
     public static final String FULLSCREEN_INSETS_API_MIGRATION_ON_AUTOMOTIVE =
             "FullscreenInsetsApiMigrationOnAutomotive";
+    public static final String GRID_TAB_SWITCHER_UPDATE = "GridTabSwitcherUpdate";
+    public static final String GRID_TAB_SWITCHER_SURFACE_COLOR_UPDATE =
+            "GridTabSwitcherSurfaceColorUpdate";
     public static final String GROUP_NEW_TAB_WITH_PARENT = "GroupNewTabWithParent";
     public static final String GROUP_SUGGESTION_SERVICE = "GroupSuggestionService";
-    public static final String LOCK_BACK_PRESS_HANDLER_AT_START = "LockBackPressHandlerAtStart";
     public static final String HASH_PREFIX_REAL_TIME_LOOKUPS =
             "SafeBrowsingHashPrefixRealTimeLookups";
+    public static final String HEADLESS_TAB_MODEL = "HeadlessTabModel";
     public static final String HIDE_TABLET_TOOLBAR_DOWNLOAD_BUTTON =
             "HideTabletToolbarDownloadButton";
     public static final String HISTORY_JOURNEYS = "Journeys";
@@ -385,48 +398,49 @@ public abstract class ChromeFeatureList {
     public static final String HTTPS_FIRST_BALANCED_MODE = "HttpsFirstBalancedMode";
     public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot";
     public static final String IP_PROTECTION_UX = "IpProtectionUx";
+    public static final String KEYBOARD_ESC_BACK_NAVIGAION = "KeyboardEscBackNavigation";
     public static final String LEGACY_TAB_STATE_DEPRECATION = "LegacyTabStateDeprecation";
     public static final String LENS_ON_QUICK_ACTION_SEARCH_WIDGET = "LensOnQuickActionSearchWidget";
     public static final String LINKED_SERVICES_SETTING = "LinkedServicesSetting";
     public static final String LOADING_PREDICTOR_LIMIT_PRECONNECT_SOCKET_COUNT =
             "LoadingPredictorLimitPreconnectSocketCount";
+    public static final String LOCK_BACK_PRESS_HANDLER_AT_START = "LockBackPressHandlerAtStart";
     public static final String LOGIN_DB_DEPRECATION_ANDROID = "LoginDbDeprecationAndroid";
     public static final String LOOKALIKE_NAVIGATION_URL_SUGGESTIONS_UI =
             "LookalikeUrlNavigationSuggestionsUI";
     public static final String MAGIC_STACK_ANDROID = "MagicStackAndroid";
     public static final String MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION =
             "MayLaunchUrlUsesSeparateStoragePartition";
+    public static final String MINI_ORIGIN_BAR = "MiniOriginBar";
     public static final String MOST_VISITED_TILES_CUSTOMIZATION = "MostVisitedTilesCustomization";
     public static final String MOST_VISITED_TILES_RESELECT = "MostVisitedTilesReselect";
-    public static final String MUlTI_INSTANCE_APPLICATION_STATUS_CLEANUP =
+    public static final String MULTI_INSTANCE_APPLICATION_STATUS_CLEANUP =
             "MultiInstanceApplicationStatusCleanup";
     public static final String NATIVE_PAGE_TRANSITION_HARDWARE_CAPTURE =
             "NativePageTransitionHardwareCapture";
+    public static final String NAVIGATION_CAPTURE_REFACTOR = "NavigationCaptureRefactorAndroid";
     public static final String NAV_BAR_COLOR_ANIMATION = "NavBarColorAnimation";
     public static final String NAV_BAR_COLOR_MATCHES_TAB_BACKGROUND =
             "NavBarColorMatchesTabBackground";
-    public static final String NAVIGATION_CAPTURE_REFACTOR = "NavigationCaptureRefactorAndroid";
-    public static final String NEW_TAB_SEARCH_ENGINE_URL_ANDROID = "NewTabSearchEngineUrlAndroid";
     public static final String NEW_TAB_PAGE_ANDROID_TRIGGER_FOR_PRERENDER2 =
             "NewTabPageAndroidTriggerForPrerender2";
+    public static final String NEW_TAB_PAGE_CUSTOMIZATION = "NewTabPageCustomization";
+    public static final String NEW_TAB_SEARCH_ENGINE_URL_ANDROID = "NewTabSearchEngineUrlAndroid";
     public static final String NOTIFICATION_ONE_TAP_UNSUBSCRIBE = "NotificationOneTapUnsubscribe";
-    public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
     public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =
             "NotificationPermissionBottomSheet";
+    public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
     public static final String NOTIFICATION_TRAMPOLINE = "NotificationTrampoline";
     public static final String OMAHA_MIN_SDK_VERSION_ANDROID = "OmahaMinSdkVersionAndroid";
     public static final String OMNIBOX_CACHE_SUGGESTION_RESOURCES =
             "OmniboxCacheSuggestionResources";
-    public static final String AVOID_RELAYOUT_DURING_FOCUS_ANIMATION =
-            "AvoidRelayoutDuringFocusAnimation";
     public static final String OPTIMIZATION_GUIDE_PUSH_NOTIFICATIONS =
             "OptimizationGuidePushNotifications";
+    public static final String PAGE_CONTENT_PROVIDER = "PageContentProvider";
     public static final String PAGE_INFO_ABOUT_THIS_SITE_MORE_LANGS =
             "PageInfoAboutThisSiteMoreLangs";
-    public static final String PAGE_CONTENT_PROVIDER = "PageContentProvider";
     public static final String PAINT_PREVIEW_DEMO = "PaintPreviewDemo";
     public static final String PARTNER_CUSTOMIZATIONS_UMA = "PartnerCustomizationsUma";
-    public static final String BIOMETRIC_AUTH_IDENTITY_CHECK = "BiometricAuthIdentityCheck";
     public static final String PASSWORD_FORM_GROUPED_AFFILIATIONS =
             "PasswordFormGroupedAffiliations";
     public static final String PASSWORD_LEAK_TOGGLE_MOVE = "PasswordLeakToggleMove";
@@ -437,65 +451,68 @@ public abstract class ChromeFeatureList {
     public static final String PLUS_ADDRESSES_ENABLED = "PlusAddressesEnabled";
     public static final String PLUS_ADDRESS_ANDROID_OPEN_GMS_CORE_MANAGEMENT_PAGE =
             "PlusAddressAndroidOpenGmsCoreManagementPage";
+    public static final String POST_GET_MEMORY_PRESSURE_TO_BACKGROUND =
+            BaseFeatures.POST_GET_MY_MEMORY_STATE_TO_BACKGROUND;
     public static final String POWER_SAVING_MODE_BROADCAST_RECEIVER_IN_BACKGROUND =
             "PowerSavingModeBroadcastReceiverInBackground";
+    public static final String PRECONNECT_ON_TAB_CREATION = "PreconnectOnTabCreation";
     public static final String PREFETCH_BROWSER_INITIATED_TRIGGERS =
             "PrefetchBrowserInitiatedTriggers";
     public static final String PRERENDER2 = "Prerender2";
-    public static final String PRECONNECT_ON_TAB_CREATION = "PreconnectOnTabCreation";
     public static final String PRICE_ANNOTATIONS = "PriceAnnotations";
     public static final String PRICE_CHANGE_MODULE = "PriceChangeModule";
     public static final String PRIVACY_SANDBOX_ACTIVITY_TYPE_STORAGE =
             "PrivacySandboxActivityTypeStorage";
-    public static final String PRIVACY_SANDBOX_NOTICE_ACTION_DEBOUNCING_ANDROID =
-            "PrivacySandboxNoticeActionDebouncingAndroid";
     public static final String PRIVACY_SANDBOX_ADS_API_UX_ENHANCEMENTS =
             "PrivacySandboxAdsApiUxEnhancements";
     public static final String PRIVACY_SANDBOX_ADS_NOTICE_CCT = "PrivacySandboxAdsNoticeCCT";
-    public static final String PRIVACY_SANDBOX_EQUALIZED_PROMPT_BUTTONS =
-            "PrivacySandboxEqualizedPromptButtons";
-    public static final String PRIVACY_SANDBOX_RELATED_WEBSITE_SETS_UI =
-            "PrivacySandboxRelatedWebsiteSetsUi";
-    public static final String PRIVACY_SANDBOX_SETTINGS_4 = "PrivacySandboxSettings4";
-    public static final String PRIVACY_SANDBOX_SENTIMENT_SURVEY = "PrivacySandboxSentimentSurvey";
-    public static final String PRIVACY_SANDBOX_CCT_ADS_NOTICE_SURVEY =
-            "PrivacySandboxCctAdsNoticeSurvey";
     public static final String PRIVACY_SANDBOX_AD_TOPICS_CONTENT_PARITY =
             "PrivacySandboxAdTopicsContentParity";
-    public static final String PRIVACY_SANDBOX_PRIVACY_POLICY = "PrivacySandboxPrivacyPolicy";
+    public static final String PRIVACY_SANDBOX_CCT_ADS_NOTICE_SURVEY =
+            "PrivacySandboxCctAdsNoticeSurvey";
+    public static final String PRIVACY_SANDBOX_NOTICE_ACTION_DEBOUNCING_ANDROID =
+            "PrivacySandboxNoticeActionDebouncingAndroid";
+    public static final String PRIVACY_SANDBOX_RELATED_WEBSITE_SETS_UI =
+            "PrivacySandboxRelatedWebsiteSetsUi";
+    public static final String PRIVACY_SANDBOX_SENTIMENT_SURVEY = "PrivacySandboxSentimentSurvey";
+    public static final String PRIVACY_SANDBOX_SETTINGS_4 = "PrivacySandboxSettings4";
+    public static final String PROCESS_RANK_POLICY_ANDROID = "ProcessRankPolicyAndroid";
     public static final String PUSH_MESSAGING_DISALLOW_SENDER_IDS =
             "PushMessagingDisallowSenderIDs";
-    public static final String PWA_UPDATE_DIALOG_FOR_ICON = "PwaUpdateDialogForIcon";
     public static final String PWA_RESTORE_UI = "PwaRestoreUi";
     public static final String PWA_RESTORE_UI_AT_STARTUP = "PwaRestoreUiAtStartup";
+    public static final String PWA_UPDATE_DIALOG_FOR_ICON = "PwaUpdateDialogForIcon";
     public static final String QUICK_DELETE_ANDROID_SURVEY = "QuickDeleteAndroidSurvey";
     public static final String QUIET_NOTIFICATION_PROMPTS = "QuietNotificationPrompts";
     public static final String READALOUD = "ReadAloud";
     public static final String READALOUD_AUDIO_OVERVIEWS = "ReadAloudAudioOverviews";
     public static final String READALOUD_BACKGROUND_PLAYBACK = "ReadAloudBackgroundPlayback";
-    public static final String READALOUD_IN_OVERFLOW_MENU_IN_CCT = "ReadAloudInOverflowMenuInCCT";
     public static final String READALOUD_IN_MULTI_WINDOW = "ReadAloudInMultiWindow";
-    public static final String READALOUD_PLAYBACK = "ReadAloudPlayback";
-    public static final String READALOUD_TAP_TO_SEEK = "ReadAloudTapToSeek";
+    public static final String READALOUD_IN_OVERFLOW_MENU_IN_CCT = "ReadAloudInOverflowMenuInCCT";
     public static final String READALOUD_IPH_MENU_BUTTON_HIGHLIGHT_CCT =
             "ReadAloudIPHMenuButtonHighlightCCT";
+    public static final String READALOUD_PLAYBACK = "ReadAloudPlayback";
+    public static final String READALOUD_TAP_TO_SEEK = "ReadAloudTapToSeek";
     public static final String RECORD_SUPPRESSION_METRICS = "RecordSuppressionMetrics";
     public static final String REENGAGEMENT_NOTIFICATION = "ReengagementNotification";
-    public static final String RELATED_SEARCHES_SWITCH = "RelatedSearchesSwitch";
     public static final String RELATED_SEARCHES_ALL_LANGUAGE = "RelatedSearchesAllLanguage";
+    public static final String RELATED_SEARCHES_SWITCH = "RelatedSearchesSwitch";
     public static final String REMOVE_TAB_FOCUS_ON_SHOWING_AND_SELECT =
             "RemoveTabFocusOnShowingAndSelect";
     public static final String RENAME_JOURNEYS = "RenameJourneys";
     public static final String RIGHT_EDGE_GOES_FORWARD_GESTURE_NAV =
             "RightEdgeGoesForwardGestureNav";
-
     public static final String SAFETY_HUB = "SafetyHub";
     public static final String SAFETY_HUB_ANDROID_ORGANIC_SURVEY = "SafetyHubAndroidOrganicSurvey";
     public static final String SAFETY_HUB_ANDROID_SURVEY = "SafetyHubAndroidSurvey";
     public static final String SAFETY_HUB_ANDROID_SURVEY_V2 = "SafetyHubAndroidSurveyV2";
+    public static final String SAFETY_HUB_DISRUPTIVE_NOTIFICATION_REVOCATION =
+            "SafetyHubDisruptiveNotificationRevocation";
     public static final String SAFETY_HUB_FOLLOWUP = "SafetyHubFollowup";
     public static final String SAFETY_HUB_LOCAL_PASSWORDS_MODULE = "SafetyHubLocalPasswordsModule";
     public static final String SAFETY_HUB_MAGIC_STACK = "SafetyHubMagicStack";
+    public static final String SAFETY_HUB_UNIFIED_PASSWORDS_MODULE =
+            "SafetyHubUnifiedPasswordsModule";
     public static final String SAFETY_HUB_WEAK_AND_REUSED_PASSWORDS =
             "SafetyHubWeakAndReusedPasswords";
     public static final String SAFE_BROWSING_DELAYED_WARNINGS = "SafeBrowsingDelayedWarnings";
@@ -504,23 +521,20 @@ public abstract class ChromeFeatureList {
     public static final String SEARCH_IN_CCT = "SearchInCCT";
     public static final String SEARCH_IN_CCT_ALTERNATE_TAP_HANDLING =
             "SearchInCCTAlternateTapHandling";
-    public static final String SETTINGS_SINGLE_ACTIVITY = "SettingsSingleActivity";
-    public static final String SHARE_CUSTOM_ACTIONS_IN_CCT = "ShareCustomActionsInCCT";
-    public static final String SHOW_NEW_TAB_ANIMATIONS = "ShowNewTabAnimations";
     public static final String SEARCH_RESUMPTION_MODULE_ANDROID = "SearchResumptionModuleAndroid";
     public static final String SEED_ACCOUNTS_REVAMP = "SeedAccountsRevamp";
     public static final String SEGMENTATION_PLATFORM_ANDROID_HOME_MODULE_RANKER =
             "SegmentationPlatformAndroidHomeModuleRanker";
-
     public static final String SEGMENTATION_PLATFORM_ANDROID_HOME_MODULE_RANKER_V2 =
             "SegmentationPlatformAndroidHomeModuleRankerV2";
-
     public static final String SEGMENTATION_PLATFORM_EPHEMERAL_CARD_RANKER =
             "SegmentationPlatformEphemeralCardRanker";
-
     public static final String SENSITIVE_CONTENT = "SensitiveContent";
     public static final String SENSITIVE_CONTENT_WHILE_SWITCHING_TABS =
             "SensitiveContentWhileSwitchingTabs";
+    public static final String SETTINGS_SINGLE_ACTIVITY = "SettingsSingleActivity";
+    public static final String SHARE_CUSTOM_ACTIONS_IN_CCT = "ShareCustomActionsInCCT";
+    public static final String SHOW_NEW_TAB_ANIMATIONS = "ShowNewTabAnimations";
     public static final String SHOW_WARNINGS_FOR_SUSPICIOUS_NOTIFICATIONS =
             "ShowWarningsForSuspiciousNotifications";
     public static final String SKIP_ISOLATED_SPLIT_PRELOAD = "SkipIsolatedSplitPreload";
@@ -534,27 +548,26 @@ public abstract class ChromeFeatureList {
     public static final String SUGGESTION_ANSWERS_COLOR_REVERSE = "SuggestionAnswersColorReverse";
     public static final String SUPPRESS_TOOLBAR_CAPTURES_AT_GESTURE_END =
             "SuppressToolbarCapturesAtGestureEnd";
-    public static final String ENABLE_BATCH_UPLOAD_FROM_SETTINGS = "EnableBatchUploadFromSettings";
+    public static final String SWAP_NEW_TAB_AND_NEW_TAB_IN_GROUP_ANDROID =
+            "SwapNewTabAndNewTabInGroupAndroid";
     public static final String SYNC_ENABLE_PASSWORDS_SYNC_ERROR_MESSAGE_ALTERNATIVE =
             "SyncEnablePasswordsSyncErrorMessageAlternative";
     public static final String TAB_CLOSURE_METHOD_REFACTOR = "TabClosureMethodRefactor";
-    public static final String TAB_GROUP_PANE_ANDROID = "TabGroupPaneAndroid";
-    public static final String TAB_GROUP_SYNC_ANDROID = "TabGroupSyncAndroid";
-    public static final String TAB_GROUP_SYNC_AUTO_OPEN_KILL_SWITCH =
-            "TabGroupSyncAutoOpenKillSwitch";
     public static final String TAB_GROUP_ENTRY_POINTS_ANDROID = "TabGroupEntryPointsAndroid";
     public static final String TAB_GROUP_PARITY_BOTTOM_SHEET_ANDROID =
             "TabGroupParityBottomSheetAndroid";
+    public static final String TAB_GROUP_SYNC_ANDROID = "TabGroupSyncAndroid";
+    public static final String TAB_GROUP_SYNC_AUTO_OPEN_KILL_SWITCH =
+            "TabGroupSyncAutoOpenKillSwitch";
     public static final String TAB_RESUMPTION_MODULE_ANDROID = "TabResumptionModuleAndroid";
+    public static final String TAB_STATE_FLAT_BUFFER = "TabStateFlatBuffer";
     public static final String TAB_STRIP_CONTEXT_MENU = "TabStripContextMenuAndroid";
-    public static final String TAB_STRIP_GROUP_COLLAPSE = "TabStripGroupCollapseAndroid";
     public static final String TAB_STRIP_GROUP_DRAG_DROP_ANDROID = "TabStripGroupDragDropAndroid";
     public static final String TAB_STRIP_GROUP_REORDER = "TabStripGroupReorderAndroid";
     public static final String TAB_STRIP_INCOGNITO_MIGRATION = "TabStripIncognitoMigration";
     public static final String TAB_STRIP_LAYOUT_OPTIMIZATION = "TabStripLayoutOptimization";
     public static final String TAB_STRIP_TRANSITION_IN_DESKTOP_WINDOW =
             "TabStripTransitionInDesktopWindow";
-    public static final String TAB_STATE_FLAT_BUFFER = "TabStateFlatBuffer";
     public static final String TAB_SWITCHER_COLOR_BLEND_ANIMATE = "TabSwitcherColorBlendAnimate";
     public static final String TAB_SWITCHER_FOREIGN_FAVICON_SUPPORT =
             "TabSwitcherForeignFaviconSupport";
@@ -568,17 +581,14 @@ public abstract class ChromeFeatureList {
     public static final String TOOLBAR_SCROLL_ABLATION = "AndroidToolbarScrollAblation";
     public static final String TRACE_BINDER_IPC = "TraceBinderIpc";
     public static final String TRACKING_PROTECTION_3PCD = "TrackingProtection3pcd";
+    public static final String TRACKING_PROTECTION_CONTENT_SETTING_UB_CONTROL =
+            "TrackingProtectionContentSettingUbControl";
     public static final String TRACKING_PROTECTION_USER_BYPASS_PWA =
             "TrackingProtectionUserBypassPwa";
     public static final String TRACKING_PROTECTION_USER_BYPASS_PWA_TRIGGER =
             "TrackingProtectionUserBypassPwaTrigger";
-    public static final String TRACKING_PROTECTION_CONTENT_SETTING_UB_CONTROL =
-            "TrackingProtectionContentSettingUbControl";
     public static final String TRANSLATE_MESSAGE_UI = "TranslateMessageUI";
     public static final String TRANSLATE_TFLITE = "TFLiteLanguageDetectionEnabled";
-    public static final String
-            UNIFIED_PASSWORD_MANAGER_LOCAL_PASSWORDS_ANDROID_ACCESS_LOSS_WARNING =
-                    "UnifiedPasswordManagerLocalPasswordsAndroidAccessLossWarning";
     public static final String UNIFIED_PASSWORD_MANAGER_LOCAL_PWD_MIGRATION_WARNING =
             "UnifiedPasswordManagerLocalPasswordsMigrationWarning";
     public static final String UNO_PHASE_2_FOLLOW_UP = "UnoPhase2FollowUp";
@@ -599,35 +609,33 @@ public abstract class ChromeFeatureList {
     public static final String WEB_FEED_SORT = "WebFeedSort";
     public static final String WEB_OTP_CROSS_DEVICE_SIMPLE_STRING = "WebOtpCrossDeviceSimpleString";
     public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting";
-    public static final String POST_GET_MEMORY_PRESSURE_TO_BACKGROUND =
-            BaseFeatures.POST_GET_MY_MEMORY_STATE_TO_BACKGROUND;
-    public static final String ANDROID_WEB_APP_LAUNCH_HANDLER = "AndroidWebAppLaunchHandler";
 
     /* Alphabetical: */
     public static final CachedFlag sAndroidAppIntegration =
             newCachedFlag(ANDROID_APP_INTEGRATION, true);
     public static final CachedFlag sAndroidAppIntegrationModule =
-            newCachedFlag(ANDROID_APP_INTEGRATION_MODULE, false, true);
-    public static final CachedFlag sAndroidAppIntegrationV2 =
-            newCachedFlag(ANDROID_APP_INTEGRATION_V2, false, true);
-    public static final CachedFlag sAndroidTabSkipSaveTabsKillswitch =
-            newCachedFlag(ANDROID_TAB_SKIP_SAVE_TABS_TASK_KILLSWITCH, true, true);
-    public static final CachedFlag sNewTabPageCustomization =
-            newCachedFlag(NEW_TAB_PAGE_CUSTOMIZATION, false);
-    public static final CachedFlag sAndroidAppIntegrationWithFavicon =
-            newCachedFlag(ANDROID_APP_INTEGRATION_WITH_FAVICON, false, true);
-
+            newCachedFlag(ANDROID_APP_INTEGRATION_MODULE, true);
     public static final CachedFlag sAndroidAppIntegrationMultiDataSource =
             newCachedFlag(ANDROID_APP_INTEGRATION_MULTI_DATA_SOURCE, false);
+    public static final CachedFlag sAndroidAppIntegrationV2 =
+            newCachedFlag(ANDROID_APP_INTEGRATION_V2, true);
+    public static final CachedFlag sAndroidAppIntegrationWithFavicon =
+            newCachedFlag(ANDROID_APP_INTEGRATION_WITH_FAVICON, true);
     public static final CachedFlag sAndroidBottomToolbar =
             newCachedFlag(ANDROID_BOTTOM_TOOLBAR, false, true);
     public static final CachedFlag sAndroidElegantTextHeight =
             newCachedFlag(ANDROID_ELEGANT_TEXT_HEIGHT, true);
-    public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch =
-            newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true);
     public static final CachedFlag sAndroidMinimalUiLargeScreen =
             newCachedFlag(ANDROID_MINIMAL_UI_LARGE_SCREEN, false);
+    public static final CachedFlag sAndroidSurfaceColorUpdate =
+            newCachedFlag(ANDROID_SURFACE_COLOR_UPDATE, /* defaultValue= */ false);
+    public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch =
+            newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true);
+    public static final CachedFlag sAndroidTabSkipSaveTabsKillswitch =
+            newCachedFlag(ANDROID_TAB_SKIP_SAVE_TABS_TASK_KILLSWITCH, true, true);
     public static final CachedFlag sAndroidThemeModule = newCachedFlag(ANDROID_THEME_MODULE, false);
+    public static final CachedFlag sAndroidWebAppLaunchHandler =
+            newCachedFlag(ANDROID_WEB_APP_LAUNCH_HANDLER, false);
     public static final CachedFlag sAndroidWindowPopupLargeScreen =
             newCachedFlag(ANDROID_WINDOW_POPUP_LARGE_SCREEN, false);
     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
@@ -653,13 +661,20 @@ public abstract class ChromeFeatureList {
     public static final CachedFlag sCctAutoTranslate = newCachedFlag(CCT_AUTO_TRANSLATE, true);
     public static final CachedFlag sCctBlockTouchesDuringEnterAnimation =
             newCachedFlag(CCT_BLOCK_TOUCHES_DURING_ENTER_ANIMATION, true);
-    public static final CachedFlag sCCTEphemeralMediaViewerExperiment =
+    public static final CachedFlag sCctEphemeralMediaViewerExperiment =
             newCachedFlag(
                     CCT_EPHEMERAL_MEDIA_VIEWER_EXPERIMENT,
                     /* defaultValue= */ false,
                     /* defaultValueInTests= */ true);
     public static final CachedFlag sCctEphemeralMode = newCachedFlag(CCT_EPHEMERAL_MODE, true);
     public static final CachedFlag sCctFreInSameTask = newCachedFlag(CCT_FRE_IN_SAME_TASK, true);
+    public static final CachedFlag sCctGoogleBottomBar =
+            newCachedFlag(
+                    CCT_GOOGLE_BOTTOM_BAR,
+                    /* defaultValue= */ false,
+                    /* defaultValueInTests= */ true);
+    public static final CachedFlag sCctGoogleBottomBarVariantLayouts =
+            newCachedFlag(CCT_GOOGLE_BOTTOM_BAR_VARIANT_LAYOUTS, false);
     public static final CachedFlag sCctIncognitoAvailableToThirdParty =
             newCachedFlag(CCT_INCOGNITO_AVAILABLE_TO_THIRD_PARTY, false);
     public static final CachedFlag sCctIntentFeatureOverrides =
@@ -670,23 +685,18 @@ public abstract class ChromeFeatureList {
                     CCT_NAVIGATIONAL_PREFETCH,
                     /* defaultValue= */ false,
                     /* defaultValueInTests= */ true);
-    public static final CachedFlag sCctGoogleBottomBar =
-            newCachedFlag(
-                    CCT_GOOGLE_BOTTOM_BAR,
-                    /* defaultValue= */ false,
-                    /* defaultValueInTests= */ true);
-    public static final CachedFlag sCctGoogleBottomBarVariantLayouts =
-            newCachedFlag(CCT_GOOGLE_BOTTOM_BAR_VARIANT_LAYOUTS, false);
-    public static final CachedFlag sCctResizableForThirdParties =
-            newCachedFlag(CCT_RESIZABLE_FOR_THIRD_PARTIES, true);
+    public static final CachedFlag sCctNestedSecurityIcon =
+            newCachedFlag(CCT_NESTED_SECURITY_ICON, true);
+    public static final CachedFlag sCctPredictiveBackGesture =
+            newCachedFlag(CCT_PREDICTIVE_BACK_GESTURE, false);
     public static final CachedFlag sCctOpenInBrowserButtonIfAllowedByEmbedder =
             newCachedFlag(CCT_OPEN_IN_BROWSER_BUTTON_IF_ALLOWED_BY_EMBEDDER, false);
     public static final CachedFlag sCctOpenInBrowserButtonIfEnabledByEmbedder =
             newCachedFlag(CCT_OPEN_IN_BROWSER_BUTTON_IF_ENABLED_BY_EMBEDDER, true);
+    public static final CachedFlag sCctResizableForThirdParties =
+            newCachedFlag(CCT_RESIZABLE_FOR_THIRD_PARTIES, true);
     public static final CachedFlag sCctRevampedBranding =
             newCachedFlag(CCT_REVAMPED_BRANDING, true);
-    public static final CachedFlag sCctNestedSecurityIcon =
-            newCachedFlag(CCT_NESTED_SECURITY_ICON, true);
     public static final CachedFlag sCctTabModalDialog = newCachedFlag(CCT_TAB_MODAL_DIALOG, true);
     public static final CachedFlag sCctToolbarRefactor = newCachedFlag(CCT_TOOLBAR_REFACTOR, false);
     public static final CachedFlag sClankStartupLatencyInjection =
@@ -713,10 +723,7 @@ public abstract class ChromeFeatureList {
     public static final CachedFlag sDrawKeyNativeEdgeToEdge =
             newCachedFlag(DRAW_KEY_NATIVE_EDGE_TO_EDGE, true);
     public static final CachedFlag sEdgeToEdgeBottomChin =
-            newCachedFlag(
-                    EDGE_TO_EDGE_BOTTOM_CHIN,
-                    /* defaultValue= */ false,
-                    /* defaultValueInTests= */ true);
+            newCachedFlag(EDGE_TO_EDGE_BOTTOM_CHIN, /* defaultValue= */ true);
     public static final CachedFlag sEdgeToEdgeEverywhere =
             newCachedFlag(
                     EDGE_TO_EDGE_EVERYWHERE,
@@ -732,13 +739,7 @@ public abstract class ChromeFeatureList {
             newCachedFlag(ENABLE_DISCOUNT_INFO_API, false, true);
     public static final CachedFlag sEnableXAxisActivityTransition =
             newCachedFlag(ENABLE_X_AXIS_ACTIVITY_TRANSITION, false);
-    public static final CachedFlag sEsbAiStringUpdate =
-            newCachedFlag(
-                    ESB_AI_STRING_UPDATE,
-                    /* defaultValue= */ false,
-                    /* defaultValueInTests= */ true);
-
-    public static final CachedFlag sFloatingSnackbar = newCachedFlag(FLOATING_SNACKBAR, false);
+    public static final CachedFlag sFloatingSnackbar = newCachedFlag(FLOATING_SNACKBAR, true);
     public static final CachedFlag sForceListTabSwitcher =
             newCachedFlag(FORCE_LIST_TAB_SWITCHER, false);
     public static final CachedFlag sForceTranslucentNotificationTrampoline =
@@ -747,12 +748,15 @@ public abstract class ChromeFeatureList {
             newCachedFlag(FULLSCREEN_INSETS_API_MIGRATION, false);
     public static final CachedFlag sFullscreenInsetsApiMigrationOnAutomotive =
             newCachedFlag(FULLSCREEN_INSETS_API_MIGRATION_ON_AUTOMOTIVE, true);
+    public static final CachedFlag sGridTabSwitcherSurfaceColorUpdate =
+            newCachedFlag(GRID_TAB_SWITCHER_SURFACE_COLOR_UPDATE, /* defaultValue= */ false);
+    public static final CachedFlag sGridTabSwitcherUpdate =
+            newCachedFlag(GRID_TAB_SWITCHER_UPDATE, false);
     public static final CachedFlag sHideTabletToolbarDownloadButton =
-            newCachedFlag(
-                    HIDE_TABLET_TOOLBAR_DOWNLOAD_BUTTON,
-                    /* defaultValue= */ false,
-                    /* defaultValueInTests= */ true);
+            newCachedFlag(HIDE_TABLET_TOOLBAR_DOWNLOAD_BUTTON, true);
     public static final CachedFlag sHistoryPaneAndroid = newCachedFlag(HISTORY_PANE_ANDROID, false);
+    public static final CachedFlag sKeyboardEscBackNavigation =
+            newCachedFlag(KEYBOARD_ESC_BACK_NAVIGAION, false);
     public static final CachedFlag sLegacyTabStateDeprecation =
             newCachedFlag(
                     LEGACY_TAB_STATE_DEPRECATION,
@@ -761,34 +765,38 @@ public abstract class ChromeFeatureList {
     public static final CachedFlag sLockBackPressHandlerAtStart =
             newCachedFlag(LOCK_BACK_PRESS_HANDLER_AT_START, true);
     public static final CachedFlag sMagicStackAndroid = newCachedFlag(MAGIC_STACK_ANDROID, true);
+    public static final CachedFlag sMiniOriginBar = newCachedFlag(MINI_ORIGIN_BAR, false);
     public static final CachedFlag sMostVisitedTilesCustomization =
             newCachedFlag(MOST_VISITED_TILES_CUSTOMIZATION, false);
     public static final CachedFlag sMostVisitedTilesReselect =
             newCachedFlag(MOST_VISITED_TILES_RESELECT, false);
     public static final CachedFlag sMultiInstanceApplicationStatusCleanup =
-            newCachedFlag(MUlTI_INSTANCE_APPLICATION_STATUS_CLEANUP, false);
+            newCachedFlag(MULTI_INSTANCE_APPLICATION_STATUS_CLEANUP, false);
     public static final CachedFlag sNavBarColorAnimation =
             newCachedFlag(NAV_BAR_COLOR_ANIMATION, false);
     public static final CachedFlag sNavBarColorMatchesTabBackground =
             newCachedFlag(NAV_BAR_COLOR_MATCHES_TAB_BACKGROUND, true);
     public static final CachedFlag sNewTabPageAndroidTriggerForPrerender2 =
             newCachedFlag(NEW_TAB_PAGE_ANDROID_TRIGGER_FOR_PRERENDER2, true);
+    public static final CachedFlag sNewTabPageCustomization =
+            newCachedFlag(NEW_TAB_PAGE_CUSTOMIZATION, false);
     public static final CachedFlag sNotificationTrampoline =
             newCachedFlag(NOTIFICATION_TRAMPOLINE, false);
-    public static final CachedFlag sPowerSavingModeBroadcastReceiverInBackground =
-            newCachedFlag(POWER_SAVING_MODE_BROADCAST_RECEIVER_IN_BACKGROUND, false);
-    public static final CachedFlag sPriceChangeModule = newCachedFlag(PRICE_CHANGE_MODULE, true);
     public static final CachedFlag sOptimizationGuidePushNotifications =
             newCachedFlag(OPTIMIZATION_GUIDE_PUSH_NOTIFICATIONS, true);
     public static final CachedFlag sPaintPreviewDemo = newCachedFlag(PAINT_PREVIEW_DEMO, false);
     public static final CachedFlag sPostGetMyMemoryStateToBackground =
             newCachedFlag(POST_GET_MEMORY_PRESSURE_TO_BACKGROUND, true);
+    public static final CachedFlag sPowerSavingModeBroadcastReceiverInBackground =
+            newCachedFlag(
+                    POWER_SAVING_MODE_BROADCAST_RECEIVER_IN_BACKGROUND,
+                    /* defaultValue= */ false,
+                    /* defaultValueInTests= */ true);
     public static final CachedFlag sPrefetchBrowserInitiatedTriggers =
             newCachedFlag(PREFETCH_BROWSER_INITIATED_TRIGGERS, true);
-
+    public static final CachedFlag sPriceChangeModule = newCachedFlag(PRICE_CHANGE_MODULE, true);
     public static final CachedFlag sRightEdgeGoesForwardGestureNav =
             newCachedFlag(RIGHT_EDGE_GOES_FORWARD_GESTURE_NAV, false);
-
     public static final CachedFlag sSafetyHubMagicStack =
             newCachedFlag(SAFETY_HUB_MAGIC_STACK, false);
     public static final CachedFlag sSafetyHubWeakAndReusedPasswords =
@@ -811,8 +819,6 @@ public abstract class ChromeFeatureList {
             newCachedFlag(START_SURFACE_RETURN_TIME, true);
     public static final CachedFlag sTabClosureMethodRefactor =
             newCachedFlag(TAB_CLOSURE_METHOD_REFACTOR, false);
-    public static final CachedFlag sTabGroupPaneAndroid =
-            newCachedFlag(TAB_GROUP_PANE_ANDROID, /* defaultValue= */ true);
     public static final CachedFlag sTabStateFlatBuffer =
             newCachedFlag(
                     TAB_STATE_FLAT_BUFFER,
@@ -826,10 +832,8 @@ public abstract class ChromeFeatureList {
     public static final CachedFlag sTabStripLayoutOptimization =
             newCachedFlag(
                     TAB_STRIP_LAYOUT_OPTIMIZATION,
-                    /* defaultValue= */ true,
+                    /* defaultValue= */ false,
                     /* defaultValueInTests= */ true);
-    public static final CachedFlag sTabStripGroupCollapse =
-            newCachedFlag(TAB_STRIP_GROUP_COLLAPSE, /* defaultValue= */ true);
     public static final CachedFlag sTabWindowManagerReportIndicesMismatch =
             newCachedFlag(TAB_WINDOW_MANAGER_REPORT_INDICES_MISMATCH, true);
     public static final CachedFlag sTestDefaultDisabled =
@@ -847,18 +851,20 @@ public abstract class ChromeFeatureList {
             List.of(
                     sAndroidAppIntegration,
                     sAndroidAppIntegrationModule,
+                    sAndroidAppIntegrationMultiDataSource,
                     sAndroidAppIntegrationV2,
                     sAndroidAppIntegrationWithFavicon,
-                    sAndroidAppIntegrationMultiDataSource,
-                    sAndroidTabSkipSaveTabsKillswitch,
-                    sAndroidThemeModule,
                     sAndroidBottomToolbar,
                     sAndroidElegantTextHeight,
+                    sAndroidMinimalUiLargeScreen,
+                    sAndroidSurfaceColorUpdate,
                     sAndroidTabDeclutterDedupeTabIdsKillSwitch,
+                    sAndroidTabSkipSaveTabsKillswitch,
+                    sAndroidThemeModule,
+                    sAndroidWebAppLaunchHandler,
                     sAndroidWindowPopupLargeScreen,
                     sAppSpecificHistory,
                     sAsyncNotificationManager,
-                    sAndroidMinimalUiLargeScreen,
                     sBlockIntentsWhileLocked,
                     sBookmarkPaneAndroid,
                     sCacheIsMultiInstanceApi31Enabled,
@@ -868,20 +874,21 @@ public abstract class ChromeFeatureList {
                     sCctAuthTabEnableHttpsRedirects,
                     sCctAutoTranslate,
                     sCctBlockTouchesDuringEnterAnimation,
-                    sCCTEphemeralMediaViewerExperiment,
+                    sCctEphemeralMediaViewerExperiment,
                     sCctEphemeralMode,
                     sCctFreInSameTask,
+                    sCctGoogleBottomBar,
+                    sCctGoogleBottomBarVariantLayouts,
                     sCctIncognitoAvailableToThirdParty,
                     sCctIntentFeatureOverrides,
                     sCctMinimized,
                     sCctNavigationalPrefetch,
-                    sCctGoogleBottomBar,
-                    sCctGoogleBottomBarVariantLayouts,
+                    sCctNestedSecurityIcon,
+                    sCctPredictiveBackGesture,
                     sCctOpenInBrowserButtonIfAllowedByEmbedder,
                     sCctOpenInBrowserButtonIfEnabledByEmbedder,
                     sCctResizableForThirdParties,
                     sCctRevampedBranding,
-                    sCctNestedSecurityIcon,
                     sCctTabModalDialog,
                     sCctToolbarRefactor,
                     sClankStartupLatencyInjection,
@@ -898,17 +905,20 @@ public abstract class ChromeFeatureList {
                     sEducationalTipModule,
                     sEnableDiscountInfoApi,
                     sEnableXAxisActivityTransition,
-                    sEsbAiStringUpdate,
                     sFloatingSnackbar,
                     sForceListTabSwitcher,
                     sForceTranslucentNotificationTrampoline,
                     sFullscreenInsetsApiMigration,
                     sFullscreenInsetsApiMigrationOnAutomotive,
+                    sGridTabSwitcherSurfaceColorUpdate,
+                    sGridTabSwitcherUpdate,
                     sHideTabletToolbarDownloadButton,
                     sHistoryPaneAndroid,
+                    sKeyboardEscBackNavigation,
+                    sLegacyTabStateDeprecation,
                     sLockBackPressHandlerAtStart,
-                    sNotificationTrampoline,
                     sMagicStackAndroid,
+                    sMiniOriginBar,
                     sMostVisitedTilesCustomization,
                     sMostVisitedTilesReselect,
                     sMultiInstanceApplicationStatusCleanup,
@@ -916,26 +926,24 @@ public abstract class ChromeFeatureList {
                     sNavBarColorMatchesTabBackground,
                     sNewTabPageAndroidTriggerForPrerender2,
                     sNewTabPageCustomization,
-                    sPowerSavingModeBroadcastReceiverInBackground,
-                    sPriceChangeModule,
+                    sNotificationTrampoline,
                     sOptimizationGuidePushNotifications,
                     sPaintPreviewDemo,
                     sPostGetMyMemoryStateToBackground,
+                    sPowerSavingModeBroadcastReceiverInBackground,
                     sPrefetchBrowserInitiatedTriggers,
+                    sPriceChangeModule,
                     sRightEdgeGoesForwardGestureNav,
                     sSafetyHubMagicStack,
                     sSafetyHubWeakAndReusedPasswords,
                     sSearchInCCT,
                     sSearchInCCTAlternateTapHandling,
-                    sLegacyTabStateDeprecation,
                     sSettingsSingleActivity,
                     sSkipIsolatedSplitPreload,
                     sSmallerTabStripTitleLimit,
                     sStartSurfaceReturnTime,
                     sTabClosureMethodRefactor,
-                    sTabGroupPaneAndroid,
                     sTabStateFlatBuffer,
-                    sTabStripGroupCollapse,
                     sTabStripIncognitoMigration,
                     sTabStripLayoutOptimization,
                     sTabWindowManagerReportIndicesMismatch,
@@ -959,32 +967,32 @@ public abstract class ChromeFeatureList {
 
     // MutableFlagWithSafeDefault instances.
     /* Alphabetical: */
-    public static final MutableFlagWithSafeDefault sAdaptiveButtonInTopToolbarCustomizationV2 =
-            newMutableFlagWithSafeDefault(ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2, false);
     public static final MutableFlagWithSafeDefault sAndroidAppearanceSettings =
             newMutableFlagWithSafeDefault(ANDROID_APPEARANCE_SETTINGS, false);
     public static final MutableFlagWithSafeDefault sAndroidBookmarkBar =
             newMutableFlagWithSafeDefault(ANDROID_BOOKMARK_BAR, false);
     public static final MutableFlagWithSafeDefault sAndroidDumpOnScrollWithoutResource =
             newMutableFlagWithSafeDefault(ANDROID_DUMP_ON_SCROLL_WITHOUT_RESOURCE, false);
+    public static final MutableFlagWithSafeDefault sAndroidNativePagesInNewTab =
+            newMutableFlagWithSafeDefault(ANDROID_NATIVE_PAGES_IN_NEW_TAB, false);
     public static final MutableFlagWithSafeDefault sAndroidTabDeclutter =
             newMutableFlagWithSafeDefault(ANDROID_TAB_DECLUTTER, true);
     public static final MutableFlagWithSafeDefault sAndroidTabDeclutterArchiveAllButActiveTab =
             newMutableFlagWithSafeDefault(ANDROID_TAB_DECLUTTER_ARCHIVE_ALL_BUT_ACTIVE, false);
     public static final MutableFlagWithSafeDefault sAndroidTabDeclutterArchiveDuplicateTabs =
-            newMutableFlagWithSafeDefault(ANDROID_TAB_DECLUTTER_ARCHIVE_DUPLICATE_TABS, false);
+            newMutableFlagWithSafeDefault(ANDROID_TAB_DECLUTTER_ARCHIVE_DUPLICATE_TABS, true);
     public static final MutableFlagWithSafeDefault sAndroidTabDeclutterArchiveTabGroups =
             newMutableFlagWithSafeDefault(ANDROID_TAB_DECLUTTER_ARCHIVE_TAB_GROUPS, false);
     public static final MutableFlagWithSafeDefault sAndroidTabDeclutterRescueKillSwitch =
             newMutableFlagWithSafeDefault(ANDROID_TAB_DECLUTTER_RESCUE_KILLSWITCH, true);
-    public static final MutableFlagWithSafeDefault sBottomBrowserControlsRefactor =
-            newMutableFlagWithSafeDefault(BOTTOM_BROWSER_CONTROLS_REFACTOR, true);
     public static final MutableFlagWithSafeDefault sBcivBottomControls =
             newMutableFlagWithSafeDefault(BCIV_BOTTOM_CONTROLS, false);
-    public static final MutableFlagWithSafeDefault sBrowserControlsInViz =
-            newMutableFlagWithSafeDefault(BROWSER_CONTROLS_IN_VIZ, true);
+    public static final MutableFlagWithSafeDefault sBottomBrowserControlsRefactor =
+            newMutableFlagWithSafeDefault(BOTTOM_BROWSER_CONTROLS_REFACTOR, true);
     public static final MutableFlagWithSafeDefault sBrowserControlsEarlyResize =
             newMutableFlagWithSafeDefault(BROWSER_CONTROLS_EARLY_RESIZE, false);
+    public static final MutableFlagWithSafeDefault sBrowserControlsInViz =
+            newMutableFlagWithSafeDefault(BROWSER_CONTROLS_IN_VIZ, true);
     public static final MutableFlagWithSafeDefault sClearBrowsingDataAndroidSurvey =
             newMutableFlagWithSafeDefault(CLEAR_BROWSING_DATA_ANDROID_SURVEY, false);
     public static final MutableFlagWithSafeDefault sControlsVisibilityFromNavigations =
@@ -992,7 +1000,7 @@ public abstract class ChromeFeatureList {
     public static final MutableFlagWithSafeDefault sDynamicSafeAreaInsets =
             newMutableFlagWithSafeDefault(DYNAMIC_SAFE_AREA_INSETS, false);
     public static final MutableFlagWithSafeDefault sEdgeToEdgeSafeAreaConstraint =
-            newMutableFlagWithSafeDefault(EDGE_TO_EDGE_SAFE_AREA_CONSTRAINT, false);
+            newMutableFlagWithSafeDefault(EDGE_TO_EDGE_SAFE_AREA_CONSTRAINT, true);
     // Defaulted to true in native, but since it is being used as a kill switch set the default
     // value pre-native to false as it is safer if the feature needs to be killed via Finch config.
     public static final MutableFlagWithSafeDefault sEmptyTabListAnimationKillSwitch =
@@ -1023,6 +1031,8 @@ public abstract class ChromeFeatureList {
             newMutableFlagWithSafeDefault(SHOW_NEW_TAB_ANIMATIONS, false);
     public static final MutableFlagWithSafeDefault sSuppressToolbarCapturesAtGestureEnd =
             newMutableFlagWithSafeDefault(SUPPRESS_TOOLBAR_CAPTURES_AT_GESTURE_END, false);
+    public static final MutableFlagWithSafeDefault sSwapNewTabAndNewTabInGroupAndroid =
+            newMutableFlagWithSafeDefault(SWAP_NEW_TAB_AND_NEW_TAB_IN_GROUP_ANDROID, false);
     public static final MutableFlagWithSafeDefault sTabGroupEntryPointsAndroid =
             newMutableFlagWithSafeDefault(TAB_GROUP_ENTRY_POINTS_ANDROID, false);
     public static final MutableFlagWithSafeDefault sTabGroupParityBottomSheetAndroid =
@@ -1030,12 +1040,17 @@ public abstract class ChromeFeatureList {
     public static final MutableFlagWithSafeDefault sTabSwitcherColorBlendAnimate =
             newMutableFlagWithSafeDefault(TAB_SWITCHER_COLOR_BLEND_ANIMATE, true);
     public static final MutableFlagWithSafeDefault sTabSwitcherForeignFaviconSupport =
-            newMutableFlagWithSafeDefault(TAB_SWITCHER_FOREIGN_FAVICON_SUPPORT, false);
+            newMutableFlagWithSafeDefault(TAB_SWITCHER_FOREIGN_FAVICON_SUPPORT, true);
     public static final MutableFlagWithSafeDefault sToolbarScrollAblation =
             newMutableFlagWithSafeDefault(TOOLBAR_SCROLL_ABLATION, false);
+    public static final MutableFlagWithSafeDefault sAdaptiveButtonInTopToolbarCustomizationV2 =
+            newMutableFlagWithSafeDefault(ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2, false);
 
     // CachedFeatureParam instances.
     /* Alphabetical order by feature name, arbitrary order by param name: */
+    public static final BooleanCachedFeatureParam sAndroidThemeModuleForceDependencies =
+            newBooleanCachedFeatureParam(
+                    ANDROID_THEME_MODULE, "force_theme_module_dependencies", false);
     public static final BooleanCachedFeatureParam sCctAdaptiveButtonEnableOpenInBrowser =
             newBooleanCachedFeatureParam(CCT_ADAPTIVE_BUTTON, "open_in_browser", false);
     public static final BooleanCachedFeatureParam sCctAdaptiveButtonEnableVoice =
@@ -1065,7 +1080,7 @@ public abstract class ChromeFeatureList {
                     ANDROID_APP_INTEGRATION_WITH_FAVICON, "schedule_delay_time_ms", 0);
     public static final BooleanCachedFeatureParam sAndroidAppIntegrationWithFaviconUseLargeFavicon =
             newBooleanCachedFeatureParam(
-                    ANDROID_APP_INTEGRATION_WITH_FAVICON, "use_large_favicon", false);
+                    ANDROID_APP_INTEGRATION_WITH_FAVICON, "use_large_favicon", true);
     public static final IntCachedFeatureParam
             sAndroidAppIntegrationWithFaviconZeroStateFaviconNumber =
                     newIntCachedFeatureParam(
@@ -1267,7 +1282,7 @@ public abstract class ChromeFeatureList {
      */
     public static final StringCachedFeatureParam sEdgeToEdgeBottomChinOemMinVersions =
             newStringCachedFeatureParam(
-                    EDGE_TO_EDGE_BOTTOM_CHIN, "e2e_field_trial_oem_min_versions", "");
+                    EDGE_TO_EDGE_BOTTOM_CHIN, "e2e_field_trial_oem_min_versions", "34,34");
 
     public static final StringCachedFeatureParam sEdgeToEdgeEverywhereOemMinVersions =
             newStringCachedFeatureParam(
@@ -1279,7 +1294,8 @@ public abstract class ChromeFeatureList {
      * #sEdgeToEdgeBottomChinOemMinVersions}.
      */
     public static final StringCachedFeatureParam sEdgeToEdgeBottomChinOemList =
-            newStringCachedFeatureParam(EDGE_TO_EDGE_BOTTOM_CHIN, "e2e_field_trial_oem_list", "");
+            newStringCachedFeatureParam(
+                    EDGE_TO_EDGE_BOTTOM_CHIN, "e2e_field_trial_oem_list", "oppo,xiaomi");
 
     public static final StringCachedFeatureParam sEdgeToEdgeEverywhereOemList =
             newStringCachedFeatureParam(EDGE_TO_EDGE_EVERYWHERE, "e2e_field_trial_oem_list", "");
@@ -1287,16 +1303,21 @@ public abstract class ChromeFeatureList {
     public static final BooleanCachedFeatureParam sEdgeToEdgeEverywhereIsDebugging =
             newBooleanCachedFeatureParam(EDGE_TO_EDGE_EVERYWHERE, "e2e_everywhere_debug", false);
 
+    public static final BooleanCachedFeatureParam sTabGroupListContainment =
+            newBooleanCachedFeatureParam(
+                    GRID_TAB_SWITCHER_SURFACE_COLOR_UPDATE, "tab_group_list_containment", true);
+
     public static final BooleanCachedFeatureParam sMagicStackAndroidShowAllModules =
             newBooleanCachedFeatureParam(MAGIC_STACK_ANDROID, "show_all_modules", false);
-    public static final BooleanCachedFeatureParam mMostVisitedTilesReselectLaxSchemeHost =
+    public static final BooleanCachedFeatureParam sMostVisitedTilesReselectLaxSchemeHost =
             newBooleanCachedFeatureParam(MOST_VISITED_TILES_RESELECT, "lax_scheme_host", false);
-    public static final BooleanCachedFeatureParam mMostVisitedTilesReselectLaxRef =
+    public static final BooleanCachedFeatureParam sMostVisitedTilesReselectLaxRef =
             newBooleanCachedFeatureParam(MOST_VISITED_TILES_RESELECT, "lax_ref", false);
-    public static final BooleanCachedFeatureParam mMostVisitedTilesReselectLaxQuery =
+    public static final BooleanCachedFeatureParam sMostVisitedTilesReselectLaxQuery =
             newBooleanCachedFeatureParam(MOST_VISITED_TILES_RESELECT, "lax_query", false);
-    public static final BooleanCachedFeatureParam mMostVisitedTilesReselectLaxPath =
+    public static final BooleanCachedFeatureParam sMostVisitedTilesReselectLaxPath =
             newBooleanCachedFeatureParam(MOST_VISITED_TILES_RESELECT, "lax_path", false);
+
     public static final BooleanCachedFeatureParam
             sNavBarColorMatchesTabBackgroundColorAnimationDisabled =
                     newBooleanCachedFeatureParam(
@@ -1363,60 +1384,61 @@ public abstract class ChromeFeatureList {
     /** All {@link CachedFeatureParam}s of features in this FeatureList */
     public static final List<CachedFeatureParam<?>> sParamsCached =
             List.of(
-                    sAndroidAppIntegrationV2ContentTtlHours,
-                    sAndroidAppIntegrationMultiDataSourceHistoryContentTtlHours,
-                    sAndroidAppIntegrationWithFaviconSkipDeviceCheck,
                     sAndroidAppIntegrationModuleForceCardShow,
                     sAndroidAppIntegrationModuleShowThirdPartyCard,
-                    sAndroidAppIntegrationWithFaviconScheduleDelayTimeMs,
-                    sAndroidAppIntegrationWithFaviconSkipSchemaCheck,
-                    sAndroidAppIntegrationMultiDataSourceUseSchemaV1,
+                    sAndroidAppIntegrationMultiDataSourceHistoryContentTtlHours,
                     sAndroidAppIntegrationMultiDataSourceSkipDeviceCheck,
+                    sAndroidAppIntegrationMultiDataSourceUseSchemaV1,
+                    sAndroidAppIntegrationV2ContentTtlHours,
+                    sAndroidAppIntegrationWithFaviconScheduleDelayTimeMs,
+                    sAndroidAppIntegrationWithFaviconSkipDeviceCheck,
+                    sAndroidAppIntegrationWithFaviconSkipSchemaCheck,
                     sAndroidAppIntegrationWithFaviconUseLargeFavicon,
                     sAndroidAppIntegrationWithFaviconZeroStateFaviconNumber,
                     sAndroidBottomToolbarDefaultToTop,
+                    sAndroidThemeModuleForceDependencies,
                     sCctAdaptiveButtonEnableOpenInBrowser,
                     sCctAdaptiveButtonEnableVoice,
                     sCctAuthTabEnableHttpsRedirectsVerificationTimeoutMs,
-                    sCctAutoTranslatePackageNamesAllowlist,
                     sCctAutoTranslateAllowAllFirstParties,
-                    sCctMinimizedIconVariant,
-                    sCctMinimizedEnabledByDefaultManufacturerExcludeList,
-                    sCctGoogleBottomBarNoVariantHeightDp,
+                    sCctAutoTranslatePackageNamesAllowlist,
                     sCctGoogleBottomBarButtonList,
+                    sCctGoogleBottomBarNoVariantHeightDp,
+                    sCctGoogleBottomBarVariantLayoutsGoogleDseCheckEnabled,
                     sCctGoogleBottomBarVariantLayoutsSingleDeckerHeightDp,
                     sCctGoogleBottomBarVariantLayoutsVariantLayout,
-                    sCctGoogleBottomBarVariantLayoutsGoogleDseCheckEnabled,
+                    sCctMinimizedEnabledByDefaultManufacturerExcludeList,
+                    sCctMinimizedIconVariant,
                     sCctResizableForThirdPartiesAllowlistEntries,
-                    sCctResizableForThirdPartiesDenylistEntries,
                     sCctResizableForThirdPartiesDefaultPolicy,
+                    sCctResizableForThirdPartiesDenylistEntries,
                     sClankStartupLatencyInjectionAmountMs,
                     sCollectAndroidFrameTimelineMetricsJankTrackerDelayedStartMs,
-                    sDeleteMigratedLegacyTabStateFilesAfterRestore,
                     sDeleteLegacyTabStateFilesBatchSize,
-                    sMaxLegacyTabStateFilesDeletedPerSession,
-                    sDrawKeyNativeEdgeToEdgeDisableRecentTabsE2e,
+                    sDeleteMigratedLegacyTabStateFilesAfterRestore,
                     sDrawKeyNativeEdgeToEdgeDisableCctMediaViewerE2e,
                     sDrawKeyNativeEdgeToEdgeDisableHubE2e,
-                    sDrawKeyNativeEdgeToEdgeDisableNtpE2e,
                     sDrawKeyNativeEdgeToEdgeDisableIncognitoNtpE2e,
-                    sEdgeToEdgeBottomChinOemMinVersions,
+                    sDrawKeyNativeEdgeToEdgeDisableNtpE2e,
+                    sDrawKeyNativeEdgeToEdgeDisableRecentTabsE2e,
                     sEdgeToEdgeBottomChinOemList,
+                    sEdgeToEdgeBottomChinOemMinVersions,
                     sEdgeToEdgeEverywhereIsDebugging,
-                    sEdgeToEdgeEverywhereOemMinVersions,
                     sEdgeToEdgeEverywhereOemList,
+                    sEdgeToEdgeEverywhereOemMinVersions,
                     sMagicStackAndroidShowAllModules,
-                    mMostVisitedTilesReselectLaxSchemeHost,
-                    mMostVisitedTilesReselectLaxRef,
-                    mMostVisitedTilesReselectLaxQuery,
-                    mMostVisitedTilesReselectLaxPath,
+                    sMaxLegacyTabStateFilesDeletedPerSession,
+                    sMostVisitedTilesReselectLaxQuery,
+                    sMostVisitedTilesReselectLaxPath,
+                    sMostVisitedTilesReselectLaxRef,
+                    sMostVisitedTilesReselectLaxSchemeHost,
                     sNavBarColorAnimationDisableBottomChinColorAnimation,
                     sNavBarColorAnimationDisableEdgeToEdgeLayoutColorAnimation,
                     sNavBarColorMatchesTabBackgroundColorAnimationDisabled,
                     sNewTabSearchEngineUrlAndroidSwapOutNtp,
+                    sNotificationTrampolineImmediateJobDurationMs,
                     sNotificationTrampolineLongJobDurationMs,
                     sNotificationTrampolineNormalJobDurationMs,
-                    sNotificationTrampolineImmediateJobDurationMs,
                     sNotificationTrampolineTimeoutPriorNativeInitMs,
                     sOmahaMinSdkVersionMinSdkVersion,
                     sOptimizationGuidePushNotificationsMaxCacheSize,
@@ -1424,6 +1446,7 @@ public abstract class ChromeFeatureList {
                     sSearchinCctApplyReferrerId,
                     sSearchinCctOmniboxAllowedPackageNames,
                     sStartSurfaceReturnTimeTabletSecs,
+                    sTabGroupListContainment,
                     sTabStateFlatBufferMigrateStaleTabs,
                     sTabWindowManagerReportIndicesMismatchTimeDiffThresholdMs,
                     sUseChimeAndroidSdkAlwaysRegister,
@@ -1431,6 +1454,14 @@ public abstract class ChromeFeatureList {
 
     // Mutable*ParamWithSafeDefault instances.
     /* Alphabetical: */
+    public static final MutableBooleanParamWithSafeDefault
+            sAndroidNativePagesInNewTabBookmarksEnabled =
+            sAndroidNativePagesInNewTab.newBooleanParam(
+                    "android_native_pages_in_new_tab_bookmarks_enabled", true);
+    public static final MutableBooleanParamWithSafeDefault
+            sAndroidNativePagesInNewTabDownloadsEnabled =
+            sAndroidNativePagesInNewTab.newBooleanParam(
+                    "android_native_pages_in_new_tab_downloads_enabled", true);
     public static final MutableBooleanParamWithSafeDefault sAndroidTabDeclutterArchiveEnabled =
             sAndroidTabDeclutter.newBooleanParam("android_tab_declutter_archive_enabled", true);
     public static final MutableIntParamWithSafeDefault sAndroidTabDeclutterArchiveTimeDeltaHours =
@@ -1456,7 +1487,7 @@ public abstract class ChromeFeatureList {
     public static final MutableBooleanParamWithSafeDefault
             sDisableBottomControlsStackerYOffsetDispatching =
                     sBottomBrowserControlsRefactor.newBooleanParam(
-                            "disable_bottom_controls_stacker_y_offset", true);
+                            "disable_bottom_controls_stacker_y_offset", false);
     public static final MutableIntParamWithSafeDefault sTabSwitcherColorBlendAnimateDurationMs =
             sTabSwitcherColorBlendAnimate.newIntParam("animation_duration_ms", 240);
     public static final MutableIntParamWithSafeDefault sTabSwitcherColorBlendAnimateInterpolator =

tools/under-control/src/chrome/browser/prefs/browser_prefs.cc

@@ -50,6 +50,7 @@
 #include "chrome/browser/notifications/notifier_state_tracker.h"
 #include "chrome/browser/notifications/platform_notification_service_impl.h"
 #include "chrome/browser/permissions/quiet_notification_permission_ui_state.h"
+#include "chrome/browser/policy/developer_tools_policy_handler.h"
 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
@@ -57,6 +58,7 @@
 #include "chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_service.h"
 #include "chrome/browser/preloading/preloading_prefs.h"
 #include "chrome/browser/printing/print_preview_sticky_settings.h"
+#include "chrome/browser/privacy_sandbox/notice/notice_storage.h"
 #include "chrome/browser/profiles/chrome_version_service.h"
 #include "chrome/browser/profiles/profile_attributes_entry.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
@@ -64,6 +66,7 @@
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h"
 #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
+#include "chrome/browser/push_messaging/push_messaging_unsubscribed_entry.h"
 #include "chrome/browser/rlz/chrome_rlz_tracker_delegate.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/serial/serial_policy_allowed_ports.h"
@@ -99,6 +102,7 @@
 #include "components/breadcrumbs/core/breadcrumbs_status.h"
 #include "components/browsing_data/core/pref_names.h"
 #include "components/certificate_transparency/pref_names.h"
+#include "components/collaboration/public/pref_names.h"
 #include "components/commerce/core/pref_names.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/pref_names.h"
@@ -125,6 +129,7 @@
 #include "components/metrics/demographics/user_demographics.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/network_time/network_time_tracker.h"
+#include "components/ntp_tiles/custom_links_manager_impl.h"
 #include "components/ntp_tiles/most_visited_sites.h"
 #include "components/offline_pages/buildflags/buildflags.h"
 #include "components/omnibox/browser/document_provider.h"
@@ -149,10 +154,10 @@
 #include "components/prefs/pref_registry.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
-#include "components/privacy_sandbox/privacy_sandbox_notice_storage.h"
 #include "components/privacy_sandbox/privacy_sandbox_prefs.h"
 #include "components/privacy_sandbox/tpcd_pref_names.h"
 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
+#include "components/regional_capabilities/regional_capabilities_prefs.h"
 #include "components/safe_browsing/buildflags.h"
 #include "components/safe_browsing/core/common/safe_browsing_prefs.h"
 #include "components/saved_tab_groups/public/pref_names.h"
@@ -185,9 +190,11 @@
 #include "components/translate/core/browser/translate_prefs.h"
 #include "components/update_client/update_client.h"
 #include "components/variations/service/variations_service.h"
+#include "components/visited_url_ranking/internal/url_grouping/group_suggestions_service_impl.h"
 #include "components/webui/chrome_urls/pref_names.h"
 #include "components/webui/flags/pref_service_flags_storage.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/common/buildflags.h"
 #include "extensions/buildflags/buildflags.h"
 #include "net/http/http_server_properties_manager.h"
 #include "pdf/buildflags.h"
@@ -200,6 +207,8 @@
 #endif
 
 #if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
+#include "chrome/browser/extensions/commands/command_service.h"
+#include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/ui/webui/extensions/extensions_ui_prefs.h"
 #include "extensions/browser/api/runtime/runtime_api.h"
@@ -213,7 +222,6 @@
 #include "chrome/browser/apps/platform_apps/shortcut_manager.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
-#include "chrome/browser/extensions/commands/command_service.h"
 #include "chrome/browser/extensions/preinstalled_apps.h"
 #include "chrome/browser/ui/extensions/settings_api_bubble_helpers.h"
 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"
@@ -281,7 +289,6 @@
 #include "chrome/browser/new_tab_page/modules/v2/calendar/outlook_calendar_page_handler.h"
 #include "chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption/most_relevant_tab_resumption_page_handler.h"
 #include "chrome/browser/new_tab_page/promos/promo_service.h"
-#include "chrome/browser/policy/developer_tools_policy_handler.h"
 #include "chrome/browser/promos/promos_utils.h"  // nogncheck crbug.com/1125897
 #include "chrome/browser/screen_ai/pref_names.h"
 #include "chrome/browser/search/background/ntp_custom_background_service.h"
@@ -299,6 +306,7 @@
 #include "chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.h"
 #include "chrome/browser/ui/webui/cr_components/theme_color_picker/theme_color_picker_handler.h"
 #include "chrome/browser/ui/webui/history/foreign_session_handler.h"
+#include "chrome/browser/ui/webui/new_tab_footer/new_tab_footer_ui.h"
 #include "chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.h"
 #include "chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h"
 #include "chrome/browser/ui/webui/settings/settings_ui.h"
@@ -309,12 +317,11 @@
 #include "components/lens/lens_overlay_permission_utils.h"
 #include "components/live_caption/live_caption_controller.h"
 #include "components/live_caption/live_translate_controller.h"
-#include "components/ntp_tiles/custom_links_manager_impl.h"
 #endif  // BUILDFLAG(IS_ANDROID)
 
-#if !BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_DESKTOP_ANDROID)
+#if BUILDFLAG(ENABLE_DEVTOOLS_FRONTEND)
 #include "chrome/browser/devtools/devtools_window.h"
-#endif  // !BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_DESKTOP_ANDROID)
+#endif  // BUILDFLAG(ENABLE_DEVTOOLS_FRONTEND)
 
 #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
@@ -372,8 +379,8 @@
 #include "chrome/browser/ash/login/security_token_session_controller.h"
 #include "chrome/browser/ash/login/session/chrome_session_manager.h"
 #include "chrome/browser/ash/login/session/user_session_manager.h"
+#include "chrome/browser/ash/login/signin/legacy_token_handle_fetcher.h"
 #include "chrome/browser/ash/login/signin/signin_error_notifier.h"
-#include "chrome/browser/ash/login/signin/token_handle_fetcher.h"
 #include "chrome/browser/ash/login/startup_utils.h"
 #include "chrome/browser/ash/login/users/avatar/user_image_manager_impl.h"
 #include "chrome/browser/ash/login/users/avatar/user_image_prefs.h"
@@ -556,23 +563,7 @@ constexpr char kLastUploadedEuiccStatusPrefLegacy[] =
     "esim.last_upload_euicc_status";
 #endif  // BUILDFLAG(IS_CHROMEOS)
 
-// Deprecated 04/2024.
-inline constexpr char kOmniboxInstantKeywordUsed[] =
-    "omnibox.instant_keyword_used";
-
-// Deprecated 04/2024.
-inline constexpr char kWebAppPreinstalledAppWindowExperiment[] =
-    "web_apps.preinstalled_app_window_experiment";
-
-// Deprecated 04/2024.
-inline constexpr char kDIPSTimerLastUpdate[] = "dips_timer_last_update";
-
 #if BUILDFLAG(IS_CHROMEOS)
-// Deprecated 04/2024
-constexpr char kMetricsUserInheritOwnerConsent[] =
-    "metrics.user_inherit_owner_consent";
-constexpr char kGlanceablesEnabled[] = "ash.glanceables_enabled";
-
 // Deprecated 05/2024.
 // A preference to keep track of the device registered time.
 constexpr char kDeviceRegisteredTime[] = "DeviceRegisteredTime";
@@ -1084,11 +1075,29 @@ constexpr char kSunfishEnabled[] = "ash.capture_mode.sunfish_enabled";
 inline constexpr char kRecurrentSSLInterstitial[] =
     "profile.ssl_recurrent_interstitial";
 
+// Deprecated 04/2025.
+inline constexpr char kDefaultSearchProviderChoiceScreenShuffleMilestone[] =
+    "default_search_provider.choice_screen_shuffle_milestone";
 #if !BUILDFLAG(IS_ANDROID)
 inline char kPerformanceInterventionNotificationAcceptHistoryDeprecated[] =
     "performance_tuning.intervention_notification.accept_history";
 #endif  // !BUILDFLAG(IS_ANDROID)
 
+// Deprecated 04/2025.
+inline constexpr char kAddedBookmarkSincePowerBookmarksLaunch[] =
+    "bookmarks.added_since_power_bookmarks_launch";
+inline constexpr char kGlicRolloutEligibility[] = "glic.rollout_eligibility";
+
+// Deprecated 04/2025.
+inline constexpr char kManagedAccessToGetAllScreensMediaAllowedForUrls[] =
+    "profile.managed_access_to_get_all_screens_media_allowed_for_urls";
+
+#if BUILDFLAG(IS_ANDROID)
+// Deprecated 04/2025.
+constexpr char kObsoleteUserAcknowledgedLocalPasswordsMigrationWarning[] =
+    "user_acknowledged_local_passwords_migration_warning";
+#endif
+
 // Register local state used only for migration (clearing or moving to a new
 // key).
 void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) {
@@ -1206,20 +1215,7 @@ void RegisterProfilePrefsForMigration(
     user_prefs::PrefRegistrySyncable* registry) {
   chrome_browser_net::secure_dns::RegisterProbesSettingBackupPref(registry);
 
-  // Deprecated 04/2024.
-  registry->RegisterBooleanPref(kOmniboxInstantKeywordUsed, false);
-
-  // Deprecated 04/2024.
-  registry->RegisterDictionaryPref(kWebAppPreinstalledAppWindowExperiment);
-
-  // Deprecated 04/2024.
-  registry->RegisterTimePref(kDIPSTimerLastUpdate, base::Time());
-
 #if BUILDFLAG(IS_CHROMEOS)
-  // Deprecated 04/2024.
-  registry->RegisterBooleanPref(kMetricsUserInheritOwnerConsent, true);
-  registry->RegisterBooleanPref(kGlanceablesEnabled, true);
-
   // Deprecated 05/2024.
   registry->RegisterBooleanPref(kAccessibilityMouseKeysShortcutToPauseEnabled,
                                 true);
@@ -1527,6 +1523,25 @@ void RegisterProfilePrefsForMigration(
 
   // Deprecated 03/2025
   registry->RegisterDictionaryPref(kRecurrentSSLInterstitial);
+
+  // Deprecated 04/2025.
+  registry->RegisterIntegerPref(
+      kDefaultSearchProviderChoiceScreenShuffleMilestone, 0);
+
+  // Deprecated 04/2025.
+  registry->RegisterBooleanPref(kAddedBookmarkSincePowerBookmarksLaunch, false);
+
+  // Deprecated 04/2025.
+  registry->RegisterIntegerPref(kGlicRolloutEligibility, 0);
+
+  // Deprecated 04/2025.
+  registry->RegisterListPref(kManagedAccessToGetAllScreensMediaAllowedForUrls);
+
+#if BUILDFLAG(IS_ANDROID)
+  // Deprecated 04/2025.
+  registry->RegisterBooleanPref(
+      kObsoleteUserAcknowledgedLocalPasswordsMigrationWarning, false);
+#endif
 }
 
 }  // namespace
@@ -1557,6 +1572,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
   chrome_labs_prefs::RegisterLocalStatePrefs(registry);
   chrome_urls::RegisterPrefs(registry);
   ChromeMetricsServiceClient::RegisterPrefs(registry);
+  enterprise_connectors::RegisterLocalStatePrefs(registry);
   enterprise_util::RegisterLocalStatePrefs(registry);
   component_updater::RegisterPrefs(registry);
   domain_reliability::RegisterPrefs(registry);
@@ -1643,8 +1659,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
 
   registry->RegisterIntegerPref(first_run::kTosDialogBehavior, 0);
   registry->RegisterBooleanPref(lens::kLensCameraAssistedSearchEnabled, true);
-#else   // BUILDFLAG(IS_ANDROID)
-  enterprise_connectors::RegisterLocalStatePrefs(registry);
+#else  // BUILDFLAG(IS_ANDROID)
   gcm::RegisterPrefs(registry);
   headless::RegisterPrefs(registry);
   IntranetRedirectDetector::RegisterPrefs(registry);
@@ -1862,6 +1877,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   ChromeVersionService::RegisterProfilePrefs(registry);
   chrome_browser_net::NetErrorTabHelper::RegisterProfilePrefs(registry);
   chrome_prefs::RegisterProfilePrefs(registry);
+  collaboration::prefs::RegisterProfilePrefs(registry);
   commerce::RegisterPrefs(registry);
   enterprise::RegisterIdentifiersProfilePrefs(registry);
   enterprise_connectors::RegisterProfilePrefs(registry);
@@ -1892,6 +1908,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   metrics::RegisterDemographicsProfilePrefs(registry);
   NotificationDisplayServiceImpl::RegisterProfilePrefs(registry);
   NotifierStateTracker::RegisterProfilePrefs(registry);
+  ntp_tiles::CustomLinksManagerImpl::RegisterProfilePrefs(registry);
   ntp_tiles::MostVisitedSites::RegisterProfilePrefs(registry);
   optimization_guide::prefs::RegisterProfilePrefs(registry);
   optimization_guide::model_execution::prefs::RegisterProfilePrefs(registry);
@@ -1903,6 +1920,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   PermissionBubbleMediaAccessHandler::RegisterProfilePrefs(registry);
   PlatformNotificationServiceImpl::RegisterProfilePrefs(registry);
   plus_addresses::prefs::RegisterProfilePrefs(registry);
+  policy::DeveloperToolsPolicyHandler::RegisterProfilePrefs(registry);
   policy::URLBlocklistManager::RegisterProfilePrefs(registry);
   PolicyUI::RegisterProfilePrefs(registry);
   PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry);
@@ -1910,12 +1928,15 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   PrefetchOriginDecider::RegisterPrefs(registry);
   PrefsTabHelper::RegisterProfilePrefs(registry, locale);
   privacy_sandbox::RegisterProfilePrefs(registry);
+  privacy_sandbox::PrivacySandboxNoticeStorage::RegisterProfilePrefs(registry);
   Profile::RegisterProfilePrefs(registry);
   ProfileImpl::RegisterProfilePrefs(registry);
   ProfileNetworkContextService::RegisterProfilePrefs(registry);
   custom_handlers::ProtocolHandlerRegistry::RegisterProfilePrefs(registry);
   PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
+  PushMessagingUnsubscribedEntry::RegisterProfilePrefs(registry);
   QuietNotificationPermissionUiState::RegisterProfilePrefs(registry);
+  regional_capabilities::prefs::RegisterProfilePrefs(registry);
   RegisterBrowserUserPrefs(registry);
   RegisterGeminiSettingsPrefs(registry);
   RegisterPrefersDefaultScrollbarStylesPrefs(registry);
@@ -1949,6 +1970,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   tab_groups::prefs::RegisterProfilePrefs(registry);
   tpcd::experiment::RegisterProfilePrefs(registry);
   translate::TranslatePrefs::RegisterProfilePrefs(registry);
+  visited_url_ranking::GroupSuggestionsServiceImpl::RegisterProfilePrefs(
+      registry);
   omnibox::RegisterProfilePrefs(registry);
   ZeroSuggestProvider::RegisterProfilePrefs(registry);
 
@@ -1961,8 +1984,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   extensions::PermissionsManager::RegisterProfilePrefs(registry);
   extensions::ExtensionPrefs::RegisterProfilePrefs(registry);
   extensions::RuntimeAPI::RegisterPrefs(registry);
+  extensions::CommandService::RegisterProfilePrefs(registry);
+  extensions::util::RegisterProfilePrefs(registry);
   extensions_ui_prefs::RegisterProfilePrefs(registry);
   ExtensionWebUI::RegisterProfilePrefs(registry);
+  update_client::RegisterProfilePrefs(registry);
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS_CORE)
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -1973,7 +1999,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   // were nested in either a class or separate namespace with a simple
   // Register[Profile]Prefs() name.
   extensions::RegisterSettingsOverriddenUiPrefs(registry);
-  update_client::RegisterProfilePrefs(registry);
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
 
 #if BUILDFLAG(ENABLE_PDF)
@@ -2018,7 +2043,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   commerce::CommerceUiTabHelper::RegisterProfilePrefs(registry);
   DeviceServiceImpl::RegisterProfilePrefs(registry);
   DriveService::RegisterProfilePrefs(registry);
-  extensions::CommandService::RegisterProfilePrefs(registry);
   extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
   first_run::RegisterProfilePrefs(registry);
   gcm::RegisterProfilePrefs(registry);
@@ -2030,13 +2054,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   media_router::RegisterProfilePrefs(registry);
   MicrosoftAuthPageHandler::RegisterProfilePrefs(registry);
   MicrosoftFilesPageHandler::RegisterProfilePrefs(registry);
+  NewTabFooterUI::RegisterProfilePrefs(registry);
   NewTabPageHandler::RegisterProfilePrefs(registry);
   NewTabPageUI::RegisterProfilePrefs(registry);
   ntp::SafeBrowsingHandler::RegisterProfilePrefs(registry);
-  ntp_tiles::CustomLinksManagerImpl::RegisterProfilePrefs(registry);
   OutlookCalendarPageHandler::RegisterProfilePrefs(registry);
   PinnedTabCodec::RegisterProfilePrefs(registry);
-  policy::DeveloperToolsPolicyHandler::RegisterProfilePrefs(registry);
   promos_utils::RegisterProfilePrefs(registry);
   PromoService::RegisterProfilePrefs(registry);
   RegisterReadAnythingProfilePrefs(registry);
@@ -2053,9 +2076,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   UnifiedAutoplayConfig::RegisterProfilePrefs(registry);
 #endif  // BUILDFLAG(IS_ANDROID)
 
-#if !BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_DESKTOP_ANDROID)
+#if BUILDFLAG(ENABLE_DEVTOOLS_FRONTEND)
   DevToolsWindow::RegisterProfilePrefs(registry);
-#endif  // !BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_DESKTOP_ANDROID)
+#endif  // BUILDFLAG(ENABLE_DEVTOOLS_FRONTEND)
 
 #if BUILDFLAG(IS_CHROMEOS)
   extensions::DocumentScanRegisterProfilePrefs(registry);
@@ -2287,7 +2310,7 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
 #endif
 #if BUILDFLAG(IS_CHROMEOS)
   ash::RegisterUserProfilePrefs(registry, locale);
-  ash::TokenHandleFetcher::RegisterPrefs(registry);
+  ash::LegacyTokenHandleFetcher::RegisterPrefs(registry);
 #endif
 }
 
@@ -2491,20 +2514,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs,
           password_manager_android_util::PasswordManagerUtilBridge>());
 #endif
 
-  // Added 04/2024.
-  profile_prefs->ClearPref(kOmniboxInstantKeywordUsed);
-
-  // Added 04/2024.
-  profile_prefs->ClearPref(kWebAppPreinstalledAppWindowExperiment);
-
-  // Added 04/2024.
-  profile_prefs->ClearPref(kDIPSTimerLastUpdate);
-
 #if BUILDFLAG(IS_CHROMEOS)
-  // Added 04/2024.
-  profile_prefs->ClearPref(kMetricsUserInheritOwnerConsent);
-  profile_prefs->ClearPref(kGlanceablesEnabled);
-
   // Added 05/2024.
   profile_prefs->ClearPref(kAccessibilityMouseKeysShortcutToPauseEnabled);
   profile_prefs->ClearPref(kAccessibilityMouseKeysDisableInTextFields);
@@ -2805,6 +2815,24 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs,
   // Added 03/2025.
   profile_prefs->ClearPref(kRecurrentSSLInterstitial);
 
+  // Added 04/2025.
+  profile_prefs->ClearPref(kDefaultSearchProviderChoiceScreenShuffleMilestone);
+
+  // Added 04/2025.
+  profile_prefs->ClearPref(kAddedBookmarkSincePowerBookmarksLaunch);
+
+  // Added 04/2025.
+  profile_prefs->ClearPref(kGlicRolloutEligibility);
+
+  // Added 04/2025
+  profile_prefs->ClearPref(kManagedAccessToGetAllScreensMediaAllowedForUrls);
+
+#if BUILDFLAG(IS_ANDROID)
+  // Added 04/2025
+  profile_prefs->ClearPref(
+      kObsoleteUserAcknowledgedLocalPasswordsMigrationWarning);
+#endif
+
   // Please don't delete the following line. It is used by PRESUBMIT.py.
   // END_MIGRATE_OBSOLETE_PROFILE_PREFS
 

tools/under-control/src/chrome/browser/ui/tab_helpers.cc

@@ -91,8 +91,8 @@
 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt_helper.h"
 #include "chrome/browser/ui/recently_audible_helper.h"
-#include "chrome/browser/ui/safety_hub/unused_site_permissions_service.h"
-#include "chrome/browser/ui/safety_hub/unused_site_permissions_service_factory.h"
+#include "chrome/browser/ui/safety_hub/revoked_permissions_service.h"
+#include "chrome/browser/ui/safety_hub/revoked_permissions_service_factory.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_dialogs.h"
@@ -572,17 +572,17 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
   TrustedVaultEncryptionKeysTabHelper::CreateForWebContents(web_contents);
 #if BUILDFLAG(IS_ANDROID)
   if (base::FeatureList::IsEnabled(features::kSafetyHub)) {
-    auto* service = UnusedSitePermissionsServiceFactory::GetForProfile(profile);
+    auto* service = RevokedPermissionsServiceFactory::GetForProfile(profile);
     if (service) {
-      UnusedSitePermissionsService::TabHelper::CreateForWebContents(
-          web_contents, service);
+      RevokedPermissionsService::TabHelper::CreateForWebContents(web_contents,
+                                                                 service);
     }
   }
 #else   // BUILDFLAG(IS_ANDROID)
-  auto* service = UnusedSitePermissionsServiceFactory::GetForProfile(profile);
+  auto* service = RevokedPermissionsServiceFactory::GetForProfile(profile);
   if (service) {
-    UnusedSitePermissionsService::TabHelper::CreateForWebContents(web_contents,
-                                                                  service);
+    RevokedPermissionsService::TabHelper::CreateForWebContents(web_contents,
+                                                               service);
   }
 #endif  // BUILDFLAG(IS_ANDROID)
   ukm::InitializeSourceUrlRecorderForWebContents(web_contents);

tools/under-control/src/chrome/common/extensions/api/autofill_private.idl

@@ -355,6 +355,11 @@ namespace autofillPrivate {
     // dynamically, because the "<entity type>" string might need declension in
     // some languages.
     DOMString editEntityTypeString;
+    // The i18n string representation of "Delete <entity type>". Used in the
+    // entity instance deletion settings UI. The string cannot be constructed
+    // dynamically, because the "<entity type>" string might need declension in
+    // some languages.
+    DOMString deleteEntityTypeString;
   };
 
   // Contains date information: month, day and year.
@@ -420,6 +425,9 @@ namespace autofillPrivate {
 
     // The Pay Over Time issuer image source.
     DOMString? imageSrc;
+
+    // The Pay Over Time issuer image source for dark theme.
+    DOMString? imageSrcDark;
   };
 
   callback VoidCallback = void();

tools/under-control/src/chrome/common/extensions/api/experimental_actor.idl

@@ -0,0 +1,30 @@
+// Copyright 2025 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Experimental API to handle acting and returning new browser state.
+[implemented_in="chrome/browser/extensions/api/experimental_actor/experimental_actor_api.h"]
+namespace experimentalActor {
+  callback DataCallback = void(ArrayBuffer data);
+  callback ClosureCallback = void();
+
+  interface Functions {
+    // Creates and starts a new task.  By default, opens a new tab to
+    // about:blank that is ready for actions.
+    // startTaskProto: encoded optimization_guide.proto.BrowserStartTask
+    // startTaskcallback:
+    //   encoded optimization_guide.proto.BrowserStartTaskResult
+    static void startTask(ArrayBuffer startTaskProto,
+                          DataCallback startTaskcallback);
+    // Executes one or more actions according to request.
+    // request: encoded optimization_guide.proto.BrowserAction
+    // response: encoded optimization_guide.proto.BrowserActionResult
+    static void executeAction(ArrayBuffer browserActionProto,
+                              DataCallback executeActioncallback);
+    // Stops a task.
+    // taskId: id of the task to stop.
+    // stopTaskcallback: a closure that is called when the task is stopped.
+    static void stopTask(long taskId,
+                         ClosureCallback stopTaskcallback);
+  };
+};

tools/under-control/src/chrome/common/extensions/api/image_writer_private.idl

@@ -4,9 +4,6 @@
 
 // Use the <code>chrome.image_writer</code> API to write images to
 // removable media.
-//
-// See the design doc for a detailed description of this API.
-// https://goo.gl/KzMEFq
 namespace imageWriterPrivate {
   // The different stages of a write call.
   //

tools/under-control/src/chrome/common/extensions/api/webrtc_audio_private.idl

@@ -11,7 +11,8 @@
 // extension calling this API (i.e. they cannot be shared between
 // extensions).
 //
-// See http://goo.gl/8rOmgk for further documentation of this API.
+// See this document for further details of this API:
+// https://docs.google.com/document/d/1un8aJoUvyt5jMUkK_hoeEJ4HRw-Nf8bA25hYUOpg_Oo/
 
 namespace webrtcAudioPrivate {
 

tools/under-control/src/chrome/renderer/chrome_content_renderer_client.cc

@@ -1711,15 +1711,18 @@ void ChromeContentRendererClient::
   if (base::FeatureList::IsEnabled(subresource_filter::kAdTagging))
     blink::WebRuntimeFeatures::EnableAdTagging(true);
 
-#if BUILDFLAG(ENABLE_EXTENSIONS)
-  // WebHID and WebUSB on service workers is only available in extensions.
   if (IsStandaloneContentExtensionProcess()) {
+    // These Web APIs are only exposed to workers in extensions.
     blink::WebRuntimeFeatures::EnableWebUSBOnServiceWorkers(true);
 #if !BUILDFLAG(IS_ANDROID)
     blink::WebRuntimeFeatures::EnableWebHIDOnServiceWorkers(true);
 #endif  // !BUILDFLAG(IS_ANDROID)
+    blink::WebRuntimeFeatures::EnableAIRewriterAPIForWorkers(true);
+    blink::WebRuntimeFeatures::EnableAISummarizationAPIForWorkers(true);
+    blink::WebRuntimeFeatures::EnableAIWriterAPIForWorkers(true);
+    blink::WebRuntimeFeatures::EnableLanguageDetectionAPIForWorkers(true);
+    blink::WebRuntimeFeatures::EnableTranslationAPIForWorkers(true);
   }
-#endif  // BUILDFLAG(ENABLE_EXTENSIONS)
 }
 
 bool ChromeContentRendererClient::AllowScriptExtensionForServiceWorker(

tools/under-control/src/components/policy/resources/templates/manual_device_policy_proto_map.yaml

@@ -73,6 +73,7 @@ DeviceLoginScreenDictationEnabled: accessibility_settings.login_screen_dictation
 DeviceLoginScreenDomainAutoComplete: login_screen_domain_auto_complete.login_screen_domain_auto_complete
 DeviceLoginScreenExtensions: device_login_screen_extensions.device_login_screen_extensions
 DeviceLoginScreenExtensionManifestV2Availability: login_screen_extension_manifest_v2_availability.login_screen_extension_manifest_v2_availability
+DeviceLoginScreenFaceGazeEnabled: accessibility_settings.login_screen_face_gaze_enabled
 DeviceLoginScreenHighContrastEnabled: accessibility_settings.login_screen_high_contrast_enabled
 DeviceLoginScreenInputMethods: login_screen_input_methods.login_screen_input_methods
 DeviceLoginScreenIsolateOrigins: device_login_screen_isolate_origins.isolate_origins

tools/under-control/src/components/policy/resources/templates/policies.yaml

@@ -1336,11 +1336,11 @@ policies:
   1335: GeminiSettings
   1336: GenAISmartGroupingSettings
   1337: GenAiChromeOsSmartActionsSettings
-  1338: RelaunchSupersededReleaseAge
+  1338: RelaunchFastIfOutdated
   1339: ClassManagementCaptionsEnabled
   1340: ClassManagementClassroomIntegrationEnabled
   1341: ClassManagementNetworkRestrictionEnabled
-  1342: ClassManagementSendingContentEnabled
+  1342: ''
   1343: ClassManagementViewScreenEnabled
   1344: KioskChromeAppsForceAllowed
   1345: ReduceAcceptLanguageEnabled
@@ -1348,6 +1348,17 @@ policies:
   1347: UserSecuritySignalsReporting
   1348: UserSecurityAuthenticatedReporting
   1349: HappyEyeballsV3Enabled
+  1350: FaceGazeEnabled
+  1351: ProvisionalNotificationsAllowed
+  1352: DeviceLoginScreenFaceGazeEnabled
+  1353: EnterpriseLogoUrlForBrowser
+  1354: EnterpriseCustomLabelForBrowser
+  1355: DefaultSmartCardConnectSetting
+  1356: DeviceUserInitiatedFirmwareUpdatesEnabled
+  1357: BuiltInAIAPIsEnabled
+  1358: TabGroupSharingSettings
+  1359: NTPFooterManagementNoticeEnabled
+  1360: NTPFooterThemeAttributionEnabled
 
 atomic_groups:
   1: Homepage

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/AccessibilityShortcutsEnabled.yaml

@@ -23,7 +23,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/AutoclickEnabled.yaml

@@ -25,7 +25,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- amraboelkher@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/CaretHighlightEnabled.yaml

@@ -25,7 +25,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- amraboelkher@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/ColorCorrectionEnabled.yaml

@@ -27,6 +27,7 @@ items:
 owners:
 - katie@chromium.org
 - chromeos-a11y-eng@google.com
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/CursorHighlightEnabled.yaml

@@ -25,7 +25,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenAccessibilityShortcutsEnabled.yaml

@@ -24,7 +24,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenAutoclickEnabled.yaml

@@ -25,7 +25,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenCaretHighlightEnabled.yaml

@@ -23,7 +23,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenCursorHighlightEnabled.yaml

@@ -23,7 +23,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenDefaultHighContrastEnabled.yaml

@@ -22,8 +22,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
-- rsorokin@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenDefaultLargeCursorEnabled.yaml

@@ -20,8 +20,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
-- rsorokin@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenDefaultScreenMagnifierType.yaml

@@ -25,8 +25,7 @@ items:
   name: Docked
   value: 2
 owners:
-- file://components/policy/OWNERS
-- rsorokin@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   enum:
   - 0

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenDefaultSpokenFeedbackEnabled.yaml

@@ -22,7 +22,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenDefaultVirtualKeyboardEnabled.yaml

@@ -25,8 +25,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
-- rsorokin@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenDictationEnabled.yaml

@@ -23,7 +23,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenFaceGazeEnabled.yaml

@@ -0,0 +1,37 @@
+caption: Enable face control on the login screen
+default: null
+desc: |-
+  When face control is active, you can use your head to control the mouse cursor and use
+  facial gestures to perform system actions. This allows you to control your device
+  hands-free.
+
+  If this policy is set to true, face control will always be enabled on the login screen.
+
+  If this policy is set to false, face control will always be disabled on the login screen.
+
+  If you set this policy, users cannot change or override it.
+
+  If this policy is left unset, face control is disabled on the login screen initially but can be enabled by the user anytime.
+device_only: true
+example_value: true
+features:
+  can_be_recommended: true
+  dynamic_refresh: true
+items:
+- caption: Enable face control on the login screen
+  value: true
+- caption: Disable face control on the login screen
+  value: false
+- caption: Allow the user to decide
+  value: null
+owners:
+- akihiroota@chromium.org
+- file://ash/accessibility/OWNERS
+- file://components/policy/OWNERS
+schema:
+  type: boolean
+supported_on:
+- chrome_os:137-
+tags: []
+type: main
+generate_device_proto: False

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenHighContrastEnabled.yaml

@@ -23,7 +23,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenKeyboardFocusHighlightEnabled.yaml

@@ -25,7 +25,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- amraboelkher@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenLargeCursorEnabled.yaml

@@ -23,7 +23,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenMonoAudioEnabled.yaml

@@ -25,7 +25,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenScreenMagnifierType.yaml

@@ -28,7 +28,7 @@ items:
   name: Docked
   value: 2
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   enum:
   - 0

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenSelectToSpeakEnabled.yaml

@@ -23,7 +23,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenShowOptionsInSystemTrayMenu.yaml

@@ -19,8 +19,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
-- bartfab@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenSpokenFeedbackEnabled.yaml

@@ -23,7 +23,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DeviceLoginScreenStickyKeysEnabled.yaml

@@ -23,7 +23,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/DictationEnabled.yaml

@@ -23,7 +23,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/EnhancedNetworkVoicesInSelectToSpeakAllowed.yaml

@@ -17,7 +17,7 @@ items:
 - caption: Disallow enhanced network text-to-speech voices when using Select-to-Speak
   value: false
 owners:
-- file://ui/accessibility/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/FaceGazeEnabled.yaml

@@ -0,0 +1,35 @@
+caption: Enable the face control accessibility feature
+default: null
+desc: |-
+  Enable the face control accessibility feature. When face control is active, you
+  can use your head to control the mouse cursor and use facial gestures to perform
+  system actions. This allows you to control your device hands-free.
+
+  If this policy is set to enabled, face control will always be enabled.
+
+  If this policy is set to disabled, face control will always be disabled.
+
+  If you set this policy, users cannot change or override it.
+
+  If this policy is left unset, face control is disabled initially but can be enabled by the user anytime.
+example_value: true
+features:
+  can_be_recommended: true
+  dynamic_refresh: true
+  per_profile: true
+items:
+- caption: Enable face control
+  value: true
+- caption: Disable face control
+  value: false
+- caption: Allow the user to decide
+  value: null
+owners:
+- akihiroota@chromium.org
+- file://ash/accessibility/OWNERS
+schema:
+  type: boolean
+supported_on:
+- chrome_os:137-
+tags: []
+type: main

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/FloatingAccessibilityMenuEnabled.yaml

@@ -16,7 +16,7 @@ items:
 - caption: Do not show the floating accessibility menu in kiosk mode
   value: false
 owners:
-- apotapchuk@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/HighContrastEnabled.yaml

@@ -17,8 +17,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
-- rsorokin@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/KeyboardDefaultToFunctionKeys.yaml

@@ -15,8 +15,7 @@ items:
 - caption: Treat top-row keys as media keys, but allow user to change
   value: false
 owners:
-- file://components/policy/OWNERS
-- rsorokin@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/KeyboardFocusHighlightEnabled.yaml

@@ -25,7 +25,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- amraboelkher@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/LargeCursorEnabled.yaml

@@ -17,8 +17,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
-- rsorokin@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/MonoAudioEnabled.yaml

@@ -25,7 +25,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- amraboelkher@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/ScreenMagnifierType.yaml

@@ -20,8 +20,7 @@ items:
   name: Docked
   value: 2
 owners:
-- file://components/policy/OWNERS
-- rsorokin@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   enum:
   - 0

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/SelectToSpeakEnabled.yaml

@@ -23,7 +23,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- amraboelkher@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/ShowAccessibilityOptionsInSystemTrayMenu.yaml

@@ -20,6 +20,7 @@ items:
   value: null
 owners:
 - katie@chromium.org
+- file://ash/accessibility/OWNERS
 - file://ui/accessibility/OWNERS
 schema:
   type: boolean

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/SpokenFeedbackEnabled.yaml

@@ -17,8 +17,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
-- rsorokin@chromium.org
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Accessibility/StickyKeysEnabled.yaml

@@ -17,7 +17,7 @@ items:
 - caption: Allow the user to decide
   value: null
 owners:
-- file://components/policy/OWNERS
+- file://ash/accessibility/OWNERS
 schema:
   type: boolean
 supported_on:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Boca/ClassManagementCaptionsEnabled.yaml

@@ -1,14 +1,14 @@
 caption: Configure <ph name="CLASS_TOOLS_NAME">Class Tools</ph> caption feature
 default: true
 desc: |-
-   Setting the policy specifies if teachers can use caption feature.
+  Setting the policy specifies if teachers can use caption feature.
 
-      If value is set to true or unset, selected teachers can caption their voice and send the transcription to students.
+  If value is set to true or unset, selected teachers can caption their voice and send the transcription to students.
 
-      If set to false they cannot access the feature.
+  If set to false they cannot access the feature.
 example_value: true
 features:
-  dynamic_refresh: true
+  dynamic_refresh: false
   per_profile: true
 items:
 - caption: Allow teachers to send transcription to students.
@@ -20,7 +20,7 @@ owners:
 - aprilzhou@google.com
 schema:
   type: boolean
-future_on:
-- chrome_os
+supported_on:
+- chrome_os:137-
 tags: []
 type: main

tools/under-control/src/components/policy/resources/templates/policy_definitions/Boca/ClassManagementClassroomIntegrationEnabled.yaml

@@ -3,12 +3,12 @@ default: true
 desc: |-
   Setting the policy specifies if teachers can connect to students using a Google Classroom class roster. See <ph name="GOOGLE_CLASSROOM_LINK">https://support.google.com/edu/classroom/answer/10495270</ph>.
 
-      If value set to true or unset, they can use Google Classroom class roster.
+  If value set to true or unset, they can use Google Classroom class roster.
 
-      If set to false they cannot access the feature.
+  If set to false they cannot access the feature.
 example_value: true
 features:
-  dynamic_refresh: true
+  dynamic_refresh: false
   per_profile: true
 items:
 - caption: Allow teachers to use Google Classroom class roster.
@@ -20,7 +20,7 @@ owners:
 - aprilzhou@google.com
 schema:
   type: boolean
-future_on:
-- chrome_os
+supported_on:
+- chrome_os:137-
 tags: []
 type: main

tools/under-control/src/components/policy/resources/templates/policy_definitions/Boca/ClassManagementEnabled.yaml

@@ -4,7 +4,7 @@ desc: |-
   Setting the policy specifies whether users use <ph name="CLASS_TOOLS_NAME">Class Tools</ph> for sending/receiving content, sending/receiving caption as students, teachers, or if class management tools is disabled for users.
 example_value: disabled
 features:
-  dynamic_refresh: true
+  dynamic_refresh: false
   per_profile: true
 items:
 - caption: Users are not able to use any of the <ph name="CLASS_TOOLS_NAME">Class Tools</ph> or be added to a <ph name="CLASS_TOOLS_NAME">Class Tools</ph> session.

tools/under-control/src/components/policy/resources/templates/policy_definitions/Boca/ClassManagementNetworkRestrictionEnabled.yaml

@@ -1,14 +1,14 @@
 caption: Configure <ph name="CLASS_TOOLS_NAME">Class Tools</ph> network restriction
-default: false
+default: true
 desc: |-
   Setting the policy specifies if selected users' devices must be on a managed network in order to be part of <ph name="CLASS_TOOLS_NAME">Class Tools</ph> class.
 
-     If value set to true they must be on a managed network.
+  If value set to true or unset, they must be on a managed network.
 
-     If set to false or unset they can join without being on a managed network.
+  If set to false they can join without being on a managed network.
 example_value: True
 features:
-  dynamic_refresh: true
+  dynamic_refresh: false
   per_profile: true
 items:
 - caption: Require users' devices to be on a managed network in order to be part of <ph name="CLASS_TOOLS_NAME">Class Tools</ph> class
@@ -20,7 +20,7 @@ owners:
 - aprilzhou@google.com
 schema:
   type: boolean
-future_on:
-- chrome_os
+supported_on:
+- chrome_os:137-
 tags: []
 type: main

tools/under-control/src/components/policy/resources/templates/policy_definitions/Boca/ClassManagementSendingContentEnabled.yaml

@@ -1,26 +0,0 @@
-caption: Configure <ph name="CLASS_TOOLS_NAME">Class Tools</ph> sending content feature
-default: true
-desc: |-
-  Setting the policy specifies if selected teachers can send and lock content on students' screens.
-
-    If set to true of unset they can send and lock content.
-
-    If set to false they cannot access the feature.
-example_value: true
-features:
-  dynamic_refresh: true
-  per_profile: true
-items:
-- caption: Allow teachers to send and lock content to students' screens
-  value: true
-- caption: Prevent teachers from sending and locking content to students' screens
-  value: false
-owners:
-- cros-edu-eng@google.com
-- aprilzhou@google.com
-schema:
-  type: boolean
-future_on:
-- chrome_os
-tags: []
-type: main

tools/under-control/src/components/policy/resources/templates/policy_definitions/Boca/ClassManagementViewScreenEnabled.yaml

@@ -3,9 +3,9 @@ default: true
 desc: |-
   Setting the policy specifies if the selected teachers can remotely view students' screens.
 
-     If set to true or unset they can view students' screens.
+  If set to true or unset they can view students' screens.
 
-     If set to false they cannot access the feature.
+  If set to false they cannot access the feature.
 example_value: true
 features:
   dynamic_refresh: true
@@ -20,7 +20,7 @@ owners:
 - aprilzhou@google.com
 schema:
   type: boolean
-future_on:
-- chrome_os
+supported_on:
+- chrome_os:137-
 tags: []
 type: main

tools/under-control/src/components/policy/resources/templates/policy_definitions/CloudReporting/UserSecurityAuthenticatedReporting.yaml

@@ -15,8 +15,8 @@ features:
   per_profile: true
   cloud_only: true
   user_only: true
-future_on:
-- chrome.*
+supported_on:
+- chrome.*:137-
 owners:
 - seblalancette@chromium.org
 - cbe-device-trust-eng@google.com

tools/under-control/src/components/policy/resources/templates/policy_definitions/CloudReporting/UserSecuritySignalsReporting.yaml

@@ -15,8 +15,8 @@ features:
   per_profile: true
   cloud_only: true
   user_only: true
-future_on:
-- chrome.*
+supported_on:
+- chrome.*:137-
 owners:
 - seblalancette@chromium.org
 - cbe-device-trust-eng@google.com

tools/under-control/src/components/policy/resources/templates/policy_definitions/ContentSettings/DefaultImagesSetting.yaml

@@ -10,6 +10,7 @@ features:
   per_profile: true
 future_on:
 - fuchsia
+- android
 items:
 - caption: Allow all sites to show all images
   name: AllowImages

tools/under-control/src/components/policy/resources/templates/policy_definitions/ContentSettings/DefaultSmartCardConnectSetting.yaml

@@ -0,0 +1,33 @@
+caption: Control use of the Web Smart Card API
+default: null
+desc: |-
+  Setting the policy specifies whether Isolated Web Apps will by default be able to connect to smart card readers.
+
+  Setting the policy to 3 or leaving it unset allows Isolated Web App origins to ask for permission to connect to smart card readers. Leaving it unset also allows users to change this setting.
+
+  Setting the policy to 2 blocks Isolated Web App origins from connecting to smart card readers.
+
+  This policy can be overridden for specific Isolated Web App origins using the <ph name="SMART_CARD_CONNECT_ALLOWED_FOR_URLS_POLICY_NAME">SmartCardConnectAllowedForUrls</ph> and <ph name="SMART_CARD_CONNECT_BLOCKED_FOR_URLS_POLICY_NAME">SmartCardConnectBlockedForUrls</ph> policies.
+
+example_value: 3
+features:
+  dynamic_refresh: true
+  per_profile: true
+future_on:
+- chrome_os
+items:
+- caption: Do not allow Isolated Web App origins to connect to smart card readers
+  name: BlockSmartCardConnect
+  value: 2
+- caption: Allow Isolated Web App origins to ask to connect to smart card readers.
+  name: AskSmartCardConnect
+  value: 3
+owners:
+- file://content/browser/smart_card/OWNERS
+schema:
+  enum:
+  - 2
+  - 3
+  type: integer
+tags: []
+type: int-enum

tools/under-control/src/components/policy/resources/templates/policy_definitions/ContentSettings/GetDisplayMediaSetSelectAllScreensAllowedForUrls.yaml

@@ -1,4 +1,5 @@
 caption: Enables auto-select for multi screen captures
+deprecated: true
 desc: |-
   The <ph name="GET_DISPLAY_MEDIA_SET_NAME">getDisplayMediaSet</ph> API allows web applications to capture multiple surfaces at once.
         This policy unlocks the <ph name="AUTO_SELECT_ALL_SCREENS_NAME">autoSelectAllScreens</ph> property for web applications at defined origins.
@@ -20,7 +21,7 @@ schema:
     type: string
   type: array
 supported_on:
-- chrome_os:102-
+- chrome_os:102-136
 - chrome.linux:111-123
 tags: []
 type: list

tools/under-control/src/components/policy/resources/templates/policy_definitions/ContentSettings/ImagesAllowedForUrls.yaml

@@ -15,6 +15,7 @@ features:
   per_profile: true
 future_on:
 - fuchsia
+- android
 owners:
 - engedy@chromium.org
 - file://components/content_settings/OWNERS

tools/under-control/src/components/policy/resources/templates/policy_definitions/ContentSettings/ImagesBlockedForUrls.yaml

@@ -15,6 +15,7 @@ features:
   per_profile: true
 future_on:
 - fuchsia
+- android
 owners:
 - engedy@chromium.org
 - file://components/content_settings/OWNERS

tools/under-control/src/components/policy/resources/templates/policy_definitions/ContentSettings/SmartCardConnectAllowedForUrls.yaml

@@ -1,8 +1,8 @@
 caption: Allow Smart Card connection by Isolated Apps
 desc: |-
-  Setting the policy specifies which Isolated Web Apps (IWAs) can connect to smart cards using Web Smart Card API without having the user prompted for permission. This policy does not accept wildcards.
+  Setting the policy specifies which Isolated Web Apps (IWAs) can connect to smart cards using Web Smart Card API without having the user prompted for permission.
 
-  This policy overrides <ph name="POLICY_NAME">SmartCardConnectBlockedForUrls</ph>; in particular, a blocklist value of <ph name="ALL_ISOLATED_WEB_APPS">*</ph> means that all IWAs will be unable to connect to smart card readers (users won't even be prompted for permission) except for the ones listed in this policy.
+  This policy overrides the behavior of <ph name="DEFAULT_SMART_CARD_CONNECT_POLICY_NAME">DefaultSmartCardConnectSetting</ph> and is overridden by <ph name="SMART_CARD_CONNECT_BLOCKED_FOR_URLS_POLICY_NAME">SmartCardConnectBlockedForUrls</ph>.
 
   By default, IWAs that specify Smart Card permissions within their manifest can connect to smart cards provided that user grants the permission interactively per-reader.
 

tools/under-control/src/components/policy/resources/templates/policy_definitions/ContentSettings/SmartCardConnectBlockedForUrls.yaml

@@ -1,8 +1,8 @@
 caption: Block Smart Card connection by Isolated Apps
 desc: |-
-  Setting the policy specifies which Isolated Web Apps (IWAs) won't be able to connect to smart card readers (users won't even be prompted for permission). This policy accepts wildcards - for example, <ph name="ALL_ISOLATED_WEB_APPS">*</ph> will block access for all IWAs.
+  Setting the policy specifies which Isolated Web Apps (IWAs) won't be able to connect to smart card readers (users won't even be prompted for permission).
 
-  This policy is overridden by <ph name="POLICY_NAME">SmartCardConnectAllowedForUrls</ph>; in particular, a blocklist value of <ph name="ALL_ISOLATED_WEB_APPS">*</ph> means that all IWAs will be unable to connect to smart card readers (users won't even be prompted for permission) except for the ones listed in <ph name="POLICY_NAME">SmartCardConnectAllowedForUrls</ph>.
+  This policy overrides the behavior of <ph name="DEFAULT_SMART_CARD_CONNECT_POLICY_NAME">DefaultSmartCardConnectSetting</ph> and <ph name="SMART_CARD_CONNECT_ALLOWED_FOR_URLS_POLICY_NAME">SmartCardConnectAllowedForUrls</ph>.
 
   By default, IWAs that specify Smart Card permissions within their manifest can connect to smart cards provided that user grants the permission interactively per-reader.
 

tools/under-control/src/components/policy/resources/templates/policy_definitions/ContentSettings/policy_atomic_groups.yaml

@@ -107,3 +107,4 @@ SmartCardConnectSettings:
   policies:
   - SmartCardConnectAllowedForUrls
   - SmartCardConnectBlockedForUrls
+  - DefaultSmartCardConnectSetting

tools/under-control/src/components/policy/resources/templates/policy_definitions/Edu/ContentTransferEnablementStatus.yaml

@@ -27,7 +27,7 @@ features:
   dynamic_refresh: true
   per_profile: true
 owners:
-- courtneywong@chromium.org
+- agawronska@chromium.org
 - file://chrome/browser/ash/child_accounts/OWNERS
 schema:
   properties:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Extensions/ExtensionInstallAllowlist.yaml

@@ -12,6 +12,7 @@ features:
   dynamic_refresh: true
   per_profile: true
 future_on:
+- android
 - fuchsia
 label: Extension IDs to exempt from the blocklist
 owners:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Extensions/ExtensionInstallBlocklist.yaml

@@ -12,6 +12,7 @@ features:
   dynamic_refresh: true
   per_profile: true
 future_on:
+- android
 - fuchsia
 label: Extension IDs the user should be prevented from installing (or * for all)
 owners:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Extensions/ExtensionInstallForcelist.yaml

@@ -26,6 +26,7 @@ features:
   dynamic_refresh: true
   per_profile: true
 future_on:
+- android
 - fuchsia
 label: Extension/App IDs and update URLs to be silently installed
 owners:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Extensions/MandatoryExtensionsForIncognitoNavigation.yaml

@@ -14,6 +14,7 @@ features:
   per_profile: true
 future_on:
 - fuchsia
+- chrome.*
 supported_on:
 - chrome_os:114-
 owners:

tools/under-control/src/components/policy/resources/templates/policy_definitions/GenerativeAI/AutofillPredictionSettings.yaml

@@ -1,9 +1,9 @@
-caption: Settings for Autofill Prediction Settings
+caption: Settings for Autofill with AI
 
 desc: |-
-  Enables Autofill Prediction Settings.
+  Specifies whether users can let <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> use Generative AI to better understand forms and help them fill more fields.
 
-  0 = Allow the feature to be used, while allowing Google to use relevant data to improve its AI models. Relevant data may include prompts, inputs, outputs, source materials, and written feedback, depending on the feature. It may also be reviewed by humans to improve AI models. 0 is the default value, except when noted below.
+  0 = Allow the feature to be used, while allowing Google to use relevant data to improve its AI models. Relevant data may include prompts, inputs, outputs, source materials, and written feedback, depending on the feature. 0 is the default value, except when noted below.
 
   1 = Allow the feature to be used, but does not allow Google to improve models using users' content (including prompts, inputs, outputs, source materials, and written feedback). 1 is the default value for Enterprise users managed by <ph name="GOOGLE_ADMIN_CONSOLE_PRODUCT_NAME">Google Admin console</ph> and for Education accounts managed by <ph name="GOOGLE_WORKSPACE_PRODUCT_NAME">Google Workspace</ph>.
 
@@ -19,26 +19,26 @@ features:
   dynamic_refresh: true
   per_profile: true
 items:
-- caption: Allow Autofill Prediction and improve AI models.
+- caption: Allow autofill with AI and improve AI models.
   name: Allowed
   value: 0
-- caption: Allow Autofill Prediction without improving AI models.
+- caption: Allow autofill with AI without improving AI models.
   name: AllowedWithoutLogging
   value: 1
-- caption: Do not allow Autofill Prediction.
+- caption: Do not allow autofill with AI.
   name: Disabled
   value: 2
 owners:
 - file://components/autofill_ai/OWNERS
-- file://components/optimization_guide/OWNERS
+- jkeitel@google.com
 schema:
   enum:
   - 0
   - 1
   - 2
   type: integer
-future_on:
-- chrome.*
-- chrome_os
+supported_on:
+- chrome.*:137-
+- chrome_os:137-
 tags: []
 type: int-enum

tools/under-control/src/components/policy/resources/templates/policy_definitions/GenerativeAI/GeminiSettings.yaml

@@ -1,10 +1,14 @@
 caption: Settings for Gemini integration
 desc: |-
-  Enables Gemini app integration
+  This setting allows Gemini app integrations.
 
-  0/unset = Gemini integration will be available for users
+  0/unset = Gemini integration will be available for users.
 
-  1 = Gemini integration will not be available for users
+  1 = Gemini integration will not be available for users.
+
+  If the policy is unset, its behavior is determined by the <ph name="GEN_AI_DEFAULT_SETTINGS_POLICY_NAME">GenAiDefaultSettings</ph> policy.
+
+  For more information, please check the Enterprise Release Notes (https://support.google.com/chrome/a/answer/7679408).
 owners:
 - salg@google.com
 - ssid@chromium.org
@@ -12,7 +16,7 @@ owners:
 example_value: 1
 future_on:
 - android
-- chrome.*
+- chrome.linux
 - chrome_os
 features:
   dynamic_refresh: true
@@ -24,11 +28,14 @@ schema:
   - 0
   - 1
 items:
-- caption: Enable Gemini integration.
-  name: Enabled
+- caption: Allow Gemini integrations.
+  name: Allowed
   value: 0
-- caption: Do not enable Gemini integration.
+- caption: Do not allow Gemini integrations.
   name: Disabled
   value: 1
 default: 0
-tags: []
+supported_on:
+- chrome.win:137-
+- chrome.mac:137-
+tags: []

tools/under-control/src/components/policy/resources/templates/policy_definitions/GenerativeAI/GenAiDefaultSettings.yaml

@@ -1,7 +1,7 @@
 caption: Set the default policy value for <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>'s covered generative AI features
 
 desc: |-
-  This policy defines the default setting for all covered generative AI features. For example, if this policy is set to value 1, then 1 will be the default setting for all covered generative AI features. It will not impact any manually set policy values. See https://support.google.com/chrome/a?p=generative_ai_settings for the list of covered features.
+  This policy defines the default setting for all covered generative AI features. For example, if this policy is set to value 1, then 1 will be the default setting for all covered generative AI features. It will not impact any manually set policy values. This setting will define the defaults for <ph name="GEMINI_SETTINGS_POLICY_NAME">GeminiSettings</ph> and covered Chrome generative AI features. See https://support.google.com/chrome/a?p=generative_ai_settings for the list of covered features.
 
   0 = Allow the feature to be used, while allowing Google to use relevant data to improve its AI models. Relevant data may include prompts, inputs, outputs, source materials, and written feedback, depending on the feature. It may also be reviewed by humans to improve AI models. 0 is the default value, except when noted below.
 
@@ -9,7 +9,7 @@ desc: |-
 
   2 = Do not allow the feature.
 
-  If a covered feature does not have an equivalent policy value, the closest higher value will be used. Please review documentation for that feature for more details about how it interacts with values in this policy.
+  If a covered Chrome feature does not have an equivalent policy value, the closest higher value will be used. Some policies, e.g. <ph name="GEMINI_SETTINGS_POLICY_NAME">GeminiSettings</ph>, only support the states Allowed and Not Allowed. If <ph name="GEN_AI_DEFAULT_SETTINGS_POLICY_NAME">GenAiDefaultSettings</ph> policy is set to 0 or 1, this feature will be allowed. If policy is set to 2, this feature will not be allowed. Please review documentation for each feature for more details about how it interacts with values in this policy.
 
   For more information on data handling for generative AI features, please see https://support.google.com/chrome/a?p=generative_ai_settings.
 
@@ -35,12 +35,14 @@ items:
 owners:
 - igorruvinov@chromium.org
 - file://components/policy/OWNERS
+# LINT.IfChange
 schema:
   enum:
   - 0
   - 1
   - 2
   type: integer
+# LINT.ThenChange(//components/policy/core/browser/gen_ai_default_settings_policy_handler.cc, //chrome/browser/policy/configuration_policy_handler_list_factory.cc)
 supported_on:
 - android:130-
 - chrome.*:130-

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/BuiltInAIAPIsEnabled.yaml

@@ -0,0 +1,28 @@
+owners:
+- leimy@chromium.org
+- file://chrome/browser/ai/OWNERS
+caption: |-
+  Allow pages to use the built-in AI APIs.
+desc: |-
+  This policy controls if a page can use the built-in AI APIs (such as <ph name="LANGUAGE_MODEL_API_NAME">LanguageModel API</ph>, <ph name="SUMMARIZATION_API_NAME">Summarization API</ph>, <ph name="WRITER_API_NAME">Writer API</ph>, and <ph name="REWRITER_API_NAME">Rewriter API</ph>).
+
+  If the policy is enabled or unset, the APIs are enabled to be used.
+
+  If the policy is disabled, attempting using the APIs will result in an error.
+supported_on:
+- chrome.*:137-
+- chrome_os:137-
+features:
+  dynamic_refresh: true
+  per_profile: true
+type: main
+schema:
+  type: boolean
+items:
+- caption: Allow the usage of the built-in AI APIs.
+  value: true
+- caption: Disallow the usage of the built-in AI APIs.
+  value: false
+default: true
+example_value: true
+tags: []

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/CopyPreventionSettings.yaml

@@ -24,7 +24,7 @@ future_on:
 - fuchsia
 owners:
 - domfc@chromium.org
-- dpr-eng@google.com
+- cbe-cep-eng@google.com
 schema:
   properties:
     disable:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/DataControlsRules.yaml

@@ -125,7 +125,7 @@ features:
 owners:
 - file://chrome/browser/enterprise/data_controls/OWNERS
 - domfc@chromium.org
-- dpr-eng@google.com
+- cbe-cep-eng@google.com
 schema:
   items:
     properties:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/DeveloperToolsAvailability.yaml

@@ -19,6 +19,7 @@ features:
   dynamic_refresh: true
   per_profile: true
 future_on:
+- android
 - fuchsia
 items:
 - caption: Disallow usage of the Developer Tools on apps and extensions

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/DeviceUserInitiatedFirmwareUpdatesEnabled.yaml

@@ -0,0 +1,30 @@
+owners:
+- skend@google.com
+- chromeos-flex-eng@google.com
+caption: Allow users to initiate firmware updates
+desc: |-
+  This policy allows users to initiate any kind of firmware update.
+
+        Setting the policy to Enabled allows users such as device owner to initiate firmware updates.
+
+        Setting the policy to Disabled or leaving it unset prevents all users from applying firmware updates.
+
+        This policy applies to firmware for external peripheral firmware updates and internal component firmware updates for <ph name="PRODUCT_OS_FLEX_NAME">Google ChromeOS Flex</ph> devices. Internal component firmware updates for <ph name="PRODUCT_OS_NAME">$2<ex>Google ChromeOS</ex></ph> devices are not affected by this policy.
+future_on:
+- chrome_os
+device_only: true
+features:
+  dynamic_refresh: true
+  per_profile: false
+type: main
+schema:
+  type: boolean
+items:
+- caption: Users may initiate firmware updates
+  value: true
+- caption: Users may not initiate firmware updates
+  value: false
+default: false
+example_value: true
+tags: ['google-sharing']
+generate_device_proto: True

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/DownloadRestrictions.yaml

@@ -47,7 +47,7 @@ items:
   value: 4
 label: Download restrictions
 owners:
-- dpr-eng@google.com
+- cbe-cep-eng@google.com
 - zmin@chromium.org
 schema:
   enum:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/EnterpriseCustomLabel.yaml

@@ -1,4 +1,4 @@
-caption: Set a custom enterprise label
+caption: Set a custom enterprise label for a managed profile
 default: null
 desc: |-
   This policy controls a custom label used to identify managed profiles. For managed profiles, this label will be shown next to the avatar in the toolbar. The custom label will not be translated.

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/EnterpriseCustomLabelForBrowser.yaml

@@ -0,0 +1,21 @@
+caption: Set a custom enterprise label for a managed browser
+default: null
+desc: |-
+  This policy controls a custom label used to indicate a managed browser. For managed browsers, this label will be shown in a management disclaimer on a footer on the New Tab page. The custom label will not be translated.
+
+  When this policy is applied, any strings that surpass 16 characters will be truncated with a “...” Please refrain from using extended names.
+
+  Note that this policy is only applied for managed browsers, so it will have no effect for managed users on unmanaged browsers.
+example_value: Chromium
+features:
+  dynamic_refresh: true
+  per_profile: false
+future_on:
+- chrome.*
+owners:
+- file://components/enterprise/OWNERS
+- esalma@google.com
+schema:
+  type: string
+tags: []
+type: string

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/EnterpriseLogoUrl.yaml

@@ -1,4 +1,4 @@
-caption: Enterprise Logo URL
+caption: Enterprise Logo URL for a managed profile
 default: null
 desc: |-
   A URL to an image that will be used as an enterprise badge for a managed profile. The URL must point to an image.

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/EnterpriseLogoUrlForBrowser.yaml

@@ -0,0 +1,21 @@
+caption: Enterprise Logo URL for a managed browser
+default: null
+desc: |-
+  A URL to an image that will be used as an enterprise badge for a managed browser. The URL must point to an image.
+
+  It is recommended to use the favicon (example https://www.google.com/favicon.ico) or an icon no smaller than 48 x 48 px.
+
+  Note that this policy is only applied for managed browsers, so it will have no effect for managed users on unmanaged browsers.
+example_value: https://example.com/image.png
+features:
+  dynamic_refresh: true
+  per_profile: false
+future_on:
+- chrome.*
+owners:
+- file://components/policy/OWNERS
+- esalma@google.com
+schema:
+  type: string
+tags: []
+type: string

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/EnterpriseSearchAggregatorSettings.yaml

@@ -12,7 +12,7 @@ desc: |-
 
   The <ph name="SEARCH_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD">search_url</ph> field specifies the URL on which to search. Enter the web address for the search engine's results page, and use <ph name="SEARCH_TERM_MARKER">'{searchTerms}'</ph> in place of the query.
 
-  The <ph name="SUGGEST_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD">suggest_url</ph> field specifies the URL that provides search suggestions. If <ph name="SUGGEST_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD">suggest_url</ph> contains <ph name="SEARCH_TERM_MARKER">'{searchTerms}'</ph>, then Chrome will obtain search suggestions by a GET request to the URL replacing <ph name="SEARCH_TERM_MARKER">'{searchTerms}'</ph> with the user's search query. Otherwise, a POST request will be made and the user's query will be passed in the POST params under key <ph name="SEARCH_SUGGEST_POST_PARAMS_QUERY_KEY">'query'</ph>.
+  The <ph name="SUGGEST_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD">suggest_url</ph> field specifies the URL that provides search suggestions. A POST request will be made and the user's query will be passed in the POST params under key <ph name="SEARCH_SUGGEST_POST_PARAMS_QUERY_KEY">'query'</ph>.
 
   The <ph name="ICON_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD">icon_url</ph> field specifies the URL to an image that will be used on the search suggestions. A default icon will be used when this field is not set. It's recommended to use a favicon (example <ph name="ICON_URL_EXAMPLE">https://www.google.com/favicon.ico</ph>). Supported image file formats: JPEG, PNG, and ICO.
 

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/MutationEventsEnabled.yaml

@@ -4,7 +4,7 @@ default: false
 desc: |-
   This policy provides a temporary opt-back-in to a deprecated and removed set of platform events called Mutation Events.
   When this policy is Enabled, mutation events will continue to be fired, even if they've been disabled by default for normal web users. When this policy is Disabled or unset, these events may not be fired.
-  This policy is a temporary workaround, and will be removed in M135.
+  This policy is a temporary workaround, and will no longer work in M137.
 example_value: true
 features:
   dynamic_refresh: true
@@ -21,9 +21,9 @@ owners:
 schema:
   type: boolean
 supported_on:
-- chrome.*:124-
-- chrome_os:124-
-- android:124-
-- webview_android:124-
+- chrome.*:124-136
+- chrome_os:124-136
+- android:124-136
+- webview_android:124-136
 tags: []
 type: main

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/NTPFooterManagementNoticeEnabled.yaml

@@ -0,0 +1,26 @@
+caption:  Control the visibility of the management notice on the New Tab Page for managed browsers
+default: true
+desc: |-
+  This policy controls the visibility of the management notice within the footer of the New Tab Page (NTP). By default, the NTP footer displays information when the browser is managed by an organization (indicated by a building icon and "Managed by [domain name]"). This can be customized using the <ph name="ENTERPRISE_CUSTOM_LABEL_FOR_BROWSER">EnterpriseCustomLabelForBrowser</ph> and <ph name="ENTERPRISE_LOGO_URL_FOR_BROWSER">EnterpriseLogoUrlForBrowser</ph> policies.
+
+  If this policy is left unset or set to true, managed browsers will display a “Managed by…” notice with an icon.
+
+  If this policy is set to false, the management notice will be hidden.
+example_value: true
+features:
+  dynamic_refresh: true
+  per_profile: false
+future_on:
+- chrome.*
+items:
+- caption: Enable management notice on NTP Footer
+  value: true
+- caption: Disable management notice on NTP Footer
+  value: false
+owners:
+- file://components/policy/OWNERS
+- esalma@google.com
+schema:
+  type: boolean
+tags: []
+type: main

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/NTPFooterThemeAttributionEnabled.yaml

@@ -0,0 +1,26 @@
+caption:  Control the visibility of the extension theme attribution on the New Tab Page for managed browsers
+default: true
+desc: |-
+  This policy controls the visibility of extension theme attribution within the footer of the New Tab Page (NTP) when the NTP is controlled by an extension. By default, the NTP footer displays information about the extension controlling the NTP.
+
+  If this policy is left unset or set to true, browsers with an extension controlled NTP will show the extension name and a link to it.
+
+  If this policy is set to false, the theme atribution will be hidden.
+example_value: true
+features:
+  dynamic_refresh: true
+  per_profile: true
+future_on:
+- chrome.*
+items:
+- caption: Enable extension theme attribution on NTP Footer
+  value: true
+- caption: Disable extension theme attribution on NTP Footer
+  value: false
+owners:
+- file://components/policy/OWNERS
+- esalma@google.com
+schema:
+  type: boolean
+tags: []
+type: main

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/OnBulkDataEntryEnterpriseConnector.yaml

@@ -67,7 +67,7 @@ features:
 future_on:
 - fuchsia
 owners:
-- dpr-eng@google.com
+- cbe-cep-eng@google.com
 - domfc@chromium.org
 schema:
   items:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/OnFileAttachedEnterpriseConnector.yaml

@@ -70,7 +70,7 @@ features:
 future_on:
 - fuchsia
 owners:
-- dpr-eng@google.com
+- cbe-cep-eng@google.com
 - domfc@chromium.org
 schema:
   items:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/OnFileDownloadedEnterpriseConnector.yaml

@@ -70,7 +70,7 @@ features:
 future_on:
 - fuchsia
 owners:
-- dpr-eng@google.com
+- cbe-cep-eng@google.com
 - drubery@chromium.org
 - domfc@chromium.org
 schema:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/OnFileTransferEnterpriseConnector.yaml

@@ -67,7 +67,7 @@ features:
   dynamic_refresh: true
   per_profile: false
 owners:
-- dpr-eng@google.com
+- cbe-cep-eng@google.com
 - sseckler@google.com
 - domfc@chromium.org
 schema:

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/OnSecurityEventEnterpriseConnector.yaml

@@ -25,7 +25,7 @@ features:
 future_on:
 - fuchsia
 owners:
-- dpr-eng@google.com
+- cbe-cep-eng@google.com
 - domfc@chromium.org
 schema:
   items:
@@ -51,11 +51,10 @@ schema:
         type: string
     type: object
   type: array
-future_on:
-- ios
 supported_on:
 - chrome.*:84-
 - chrome_os:84-
 - android:136-
+- ios:137-
 tags: []
 type: dict

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/ProvisionalNotificationsAllowed.yaml

@@ -0,0 +1,40 @@
+caption: Allows the app to use provisional notification authorization on iOS
+
+desc: |-
+  If the policy is set to Enabled or left unset, the app may use iOS's
+  "Provisional" notification authorization to present notifications in the iOS
+  Notification Center.
+
+  If the policy is set to Disabled, the app will not use provisional
+  notifications.
+
+owners:
+- scottyoder@google.com
+- file://components/policy/OWNERS
+
+supported_on:
+- ios:137-
+
+deprecated: false
+
+features:
+  dynamic_refresh: true
+  per_profile: true
+
+type: main
+
+schema:
+  type: boolean
+
+items:
+- caption: Allow the app to use provisional notification authorization
+  value: true
+- caption: Do not allow the app to use provisional notification authorization
+  value: false
+
+default: true
+
+example_value: true
+
+tags: []
+

tools/under-control/src/components/policy/resources/templates/policy_definitions/Miscellaneous/RelaunchFastIfOutdated.yaml

@@ -1,17 +1,17 @@
-caption: Notify users of superseded browser versions
+caption: Relaunch fast if outdated
 desc: |-
   Specifies the minimum release age beyond which relaunch notifications are more aggressive. The age is calculated from the time the currently-running version was last served to clients.
 
-  If a new version is pending, a browser relaunch or device restart is needed, and the current version has been superseded for more than the number of days specified by this setting, the <ph name="RELAUNCH_NOTIFICATION_PERIOD_POLICY_NAME">RelaunchNotificationPeriod</ph> policy is overridden to 2 hours. If the <ph name="RELAUNCH_NOTIFICATION_POLICY_NAME">RelaunchNotification</ph> policy is set to 1 ('Required'), users will be forced to relaunch or restart at the end of the period.
+  If a browser relaunch or device restart is needed to finalize a pending update and the current version has been outdated for more than the number of days specified by this setting, the <ph name="RELAUNCH_NOTIFICATION_PERIOD_POLICY_NAME">RelaunchNotificationPeriod</ph> policy is overridden to 2 hours. If the <ph name="RELAUNCH_NOTIFICATION_POLICY_NAME">RelaunchNotification</ph> policy is set to 1 ('Required'), users will be forced to relaunch or restart at the end of the period.
 
   If not set, or if the release age cannot be determined, the <ph name="RELAUNCH_NOTIFICATION_PERIOD_POLICY_NAME">RelaunchNotificationPeriod</ph> policy will be used for all updates.
 example_value: 7
 features:
   dynamic_refresh: true
   per_profile: false
-future_on:
-- chrome.*
-- chrome_os
+supported_on:
+- chrome.*:137-
+- chrome_os:137-
 label: Time period (days)
 owners:
 - nicolaso@chromium.org