diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6bf0f29..34cfcc36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 83.0.4103.119
+* restored non-CFI builds for x86
+
# 83.0.4103.101
* enable HEVC and Dolby Vision
diff --git a/build/GN_ARGS b/build/GN_ARGS
index 70b44c9f..f306b30a 100644
--- a/build/GN_ARGS
+++ b/build/GN_ARGS
@@ -24,7 +24,7 @@ enable_resource_whitelist_generation=false
enable_vr=false
fieldtrial_testing_like_official_build=true
icu_use_data_file=true
-is_cfi=true
+is_cfi=false
is_component_build=false
is_debug=false
is_official_build=true
diff --git a/build/RELEASE b/build/RELEASE
index a3768c6c..5254fd50 100644
--- a/build/RELEASE
+++ b/build/RELEASE
@@ -1 +1 @@
-83.0.4103.101
+83.0.4103.119
diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch
index c419f549..756ff081 100644
--- a/build/patches/Automated-domain-substitution.patch
+++ b/build/patches/Automated-domain-substitution.patch
@@ -22493,7 +22493,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -2794,7 +2794,7 @@
+@@ -2793,7 +2793,7 @@
If this policy is left not set, Safe Browsing will operate in Standard Protection mode but users can change this setting.
@@ -22502,7 +22502,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'MetricsReportingEnabled',
-@@ -2952,7 +2952,7 @@
+@@ -2951,7 +2951,7 @@
},
{
'name': 'AutofillCreditCardEnabled',
@@ -22511,7 +22511,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': [
-@@ -3135,7 +3135,7 @@
+@@ -3134,7 +3134,7 @@
},
{
'name': 'SyncTypesListDisabled',
@@ -22520,7 +22520,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -3193,14 +3193,14 @@
+@@ -3192,14 +3192,14 @@
If you set this policy, $1Google Chrome will use the provided directory to store the roaming copy of the profiles if the RoamingProfileSupportEnabled policy has been enabled. If the RoamingProfileSupportEnabled policy is disabled or left unset the value stored in this policy is not used.
@@ -22537,7 +22537,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:27-', 'android:38-'],
-@@ -3260,7 +3260,7 @@
+@@ -3259,7 +3259,7 @@
If you set this policy, $1Google Chrome will use the provided directory regardless whether the user has specified the '--user-data-dir' flag or not. To avoid data loss or other unexpected errors this policy should not be set to a volume's root directory or to a directory used for other purposes, because $1Google Chrome manages its contents.
@@ -22546,7 +22546,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is left not set the default profile path will be used and the user will be able to override it with the '--user-data-dir' command line flag.''',
'label': '''Set user data directory''',
-@@ -3283,7 +3283,7 @@
+@@ -3282,7 +3282,7 @@
If you set this policy, $1Google Chrome will use the provided directory regardless whether the user has specified the '--disk-cache-dir' flag or not. To avoid data loss or other unexpected errors this policy should not be set to a volume's root directory or to a directory used for other purposes, because $1Google Chrome manages its contents.
@@ -22555,7 +22555,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is left not set the default cache directory will be used and the user will be able to override it with the '--disk-cache-dir' command line flag.''',
'label': '''Set disk cache directory''',
-@@ -3336,7 +3336,7 @@
+@@ -3335,7 +3335,7 @@
},
{
'name': 'DownloadRestrictions',
@@ -22564,7 +22564,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -3395,7 +3395,7 @@
+@@ -3394,7 +3394,7 @@
Note that these restrictions apply to downloads triggered from web page content, as well as the 'download link...' context menu option. These restrictions do not apply to the save / download of the currently displayed page, nor does it apply to saving as PDF from the printing options.
@@ -22573,7 +22573,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'label': '''Download restrictions''',
},
{
-@@ -3417,7 +3417,7 @@
+@@ -3416,7 +3416,7 @@
If you set this policy, $1Google Chrome will use the provided directory regardless whether the user has specified one or enabled the flag to be prompted for download location every time.
@@ -22582,7 +22582,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is left not set the default download directory will be used and the user will be able to change it.''',
'label': '''Set download directory''',
-@@ -3425,7 +3425,7 @@
+@@ -3424,7 +3424,7 @@
},
{
'name': 'SafeBrowsingForTrustedSourcesEnabled',
@@ -22591,7 +22591,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.win:61-'],
-@@ -3470,7 +3470,7 @@
+@@ -3469,7 +3469,7 @@
},
{
'name': 'CaptivePortalAuthenticationIgnoresProxy',
@@ -22600,7 +22600,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:41-'],
-@@ -3561,7 +3561,7 @@
+@@ -3560,7 +3560,7 @@
If you choose to use a .pac proxy script, you must specify the URL to the script in 'URL to a proxy .pac file'.
For detailed examples, visit:
@@ -22609,7 +22609,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If you enable this setting, $1Google Chrome and ARC-apps ignore all proxy-related options specified from the command line.
-@@ -3634,7 +3634,7 @@
+@@ -3633,7 +3633,7 @@
If you choose manual proxy settings, you can specify further options in 'Address or URL of proxy server', 'URL to a proxy .pac file' and 'Comma-separated list of proxy bypass rules'. Only the HTTP proxy server with the highest priority is available for ARC-apps.
For detailed examples, visit:
@@ -22618,7 +22618,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If you enable this setting, $1Google Chrome ignores all proxy-related options specified from the command line.
-@@ -3666,7 +3666,7 @@
+@@ -3665,7 +3665,7 @@
You should leave this policy not set if you have selected any other mode for setting proxy policies.
For more options and detailed examples, visit:
@@ -22627,7 +22627,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'arc_support': 'You cannot force Android apps to use a proxy. A subset of proxy settings is made available to Android apps, which they may voluntarily choose to honor. See the ProxyMode policy for more details.',
},
{
-@@ -3694,7 +3694,7 @@
+@@ -3693,7 +3693,7 @@
You should leave this policy not set if you have selected any other mode for setting proxy policies.
For detailed examples, visit:
@@ -22636,7 +22636,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'arc_support': 'You cannot force Android apps to use a proxy. A subset of proxy settings is made available to Android apps, which they may voluntarily choose to honor. See the ProxyMode policy for more details.',
},
{
-@@ -3722,7 +3722,7 @@
+@@ -3721,7 +3721,7 @@
You should leave this policy not set if you have selected any other mode for setting proxy policies.
For more detailed examples, visit:
@@ -22645,7 +22645,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'label': '''Comma-separated list of proxy bypass rules''',
'arc_support': 'You cannot force Android apps to use a proxy. A subset of proxy settings is made available to Android apps, which they may voluntarily choose to honor. See the ProxyMode policy for more details.',
},
-@@ -3940,7 +3940,7 @@
+@@ -3939,7 +3939,7 @@
'id': 305,
'caption': '''Account type for HTTP Negotiate authentication''',
'tags': [],
@@ -22654,7 +22654,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If no setting is provided, HTTP Negotiate authentication is disabled on Android.''',
},
-@@ -4043,7 +4043,7 @@
+@@ -4042,7 +4042,7 @@
'dynamic_refresh': True,
'per_profile': True,
},
@@ -22663,7 +22663,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 34,
'caption': '''Configure the list of force-installed apps and extensions''',
'tags': ['full-admin-access'],
-@@ -4063,9 +4063,9 @@
+@@ -4062,9 +4062,9 @@
Note that the source code of any extension may be altered by users via Developer Tools (potentially rendering the extension dysfunctional). If this is a concern, the DeveloperToolsDisabled policy should be set.
@@ -22675,7 +22675,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is left not set, no apps or extensions are installed automatically and the user can uninstall any app or extension in $1Google Chrome.
-@@ -4095,14 +4095,14 @@
+@@ -4094,14 +4094,14 @@
Starting in $1Google Chrome 21, it is more difficult to install extensions, apps, and user scripts from outside the Chrome Web Store. Previously, users could click on a link to a *.crx file, and $1Google Chrome would offer to install the file after a few warnings. After $1Google Chrome 21, such files must be downloaded and dragged onto the $1Google Chrome settings page. This setting allows specific URLs to have the old, easier installation flow.
@@ -22692,7 +22692,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'deprecated': True,
'schema': { 'type': 'boolean' },
-@@ -4255,7 +4255,7 @@
+@@ -4254,7 +4254,7 @@
},
},
},
@@ -22701,7 +22701,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'supported_on': ['chrome.*:62-', 'chrome_os:62-'],
'features': {
'dynamic_refresh': True,
-@@ -4308,7 +4308,7 @@
+@@ -4307,7 +4307,7 @@
This policy controls multiple settings, including settings controlled by any existing extension-related policies. This policy will override any legacy policies if both are set.
@@ -22710,7 +22710,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
For Windows instances that are not joined to a Microsoft® Active Directory® domain, forced installation is limited to apps and extensions listed in the Chrome Web Store.
''',
-@@ -4354,7 +4354,7 @@
+@@ -4353,7 +4353,7 @@
Disabling this setting or leaving it unset allows external extensions to be installed.
@@ -22719,7 +22719,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
''',
},
{
-@@ -4513,7 +4513,7 @@
+@@ -4512,7 +4512,7 @@
'dynamic_refresh': True,
'per_profile': True,
},
@@ -22728,7 +22728,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 38,
'caption': '''URLs to open on startup''',
'tags': [],
-@@ -5272,7 +5272,7 @@
+@@ -5271,7 +5271,7 @@
},
{
'name': 'DefaultWebUsbGuardSetting',
@@ -22737,7 +22737,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -5307,7 +5307,7 @@
+@@ -5306,7 +5306,7 @@
},
{
'name': 'WebUsbAllowDevicesForUrls',
@@ -22746,7 +22746,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'array',
-@@ -5339,7 +5339,7 @@
+@@ -5338,7 +5338,7 @@
},
'example_value': [{
'devices': [{'vendor_id': 1234, 'product_id': 5678}],
@@ -22755,7 +22755,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
}],
'id': 486,
'caption': '''Automatically grant permission to these sites to connect to USB devices with the given vendor and product IDs.''',
-@@ -5354,7 +5354,7 @@
+@@ -5353,7 +5353,7 @@
},
{
'name': 'DeviceLoginScreenWebUsbAllowDevicesForUrls',
@@ -22764,7 +22764,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'array',
-@@ -5387,7 +5387,7 @@
+@@ -5386,7 +5386,7 @@
},
'example_value': [{
'devices': [{'vendor_id': 1234, 'product_id': 5678}],
@@ -22773,7 +22773,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
}],
'id': 603,
'caption': '''Automatically grant permission to these sites to connect to USB devices with the given vendor and product IDs on the login screen.''',
-@@ -5400,7 +5400,7 @@
+@@ -5399,7 +5399,7 @@
},
{
'name': 'WebUsbAskForUrls',
@@ -22782,7 +22782,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -5421,11 +5421,11 @@
+@@ -5420,11 +5420,11 @@
URL patterns in this policy should not clash with ones configured via WebUsbBlockedForUrls. It is unspecified which of the two policies takes precedence if a URL matches with both.
@@ -22796,7 +22796,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -5446,7 +5446,7 @@
+@@ -5445,7 +5445,7 @@
URL patterns in this policy should not clash with ones configured via WebUsbAskForUrls. It is unspecified which of the two policies takes precedence if a URL matches with both.
@@ -22805,7 +22805,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'AutoSelectCertificateForUrls',
-@@ -5541,7 +5541,7 @@
+@@ -5540,7 +5540,7 @@
If this policy is left not set, no auto-selection will be done for any site.
@@ -22814,7 +22814,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'CookiesAllowedForUrls',
-@@ -5570,7 +5570,7 @@
+@@ -5569,7 +5569,7 @@
See also policies 'CookiesBlockedForUrls' and 'CookiesSessionOnlyForUrls'. Note that there must be no conflicting URL patterns between these three policies - it is unspecified which policy takes precedence.
@@ -22823,7 +22823,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'CookiesBlockedForUrls',
-@@ -5599,7 +5599,7 @@
+@@ -5598,7 +5598,7 @@
See also policies 'CookiesAllowedForUrls' and 'CookiesSessionOnlyForUrls'. Note that there must be no conflicting URL patterns between these three policies - it is unspecified which policy takes precedence.
@@ -22832,7 +22832,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'CookiesSessionOnlyForUrls',
-@@ -5632,7 +5632,7 @@
+@@ -5631,7 +5631,7 @@
If the "RestoreOnStartup" policy is set to restore URLs from previous sessions this policy will not be respected and cookies will be stored permanently for those sites.
@@ -22841,7 +22841,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'ImagesAllowedForUrls',
-@@ -5657,7 +5657,7 @@
+@@ -5656,7 +5656,7 @@
Note that previously this policy was erroneously enabled on Android, but this functionality has never been fully supported on Android.
@@ -22850,7 +22850,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'ImagesBlockedForUrls',
-@@ -5682,7 +5682,7 @@
+@@ -5681,7 +5681,7 @@
Note that previously this policy was erroneously enabled on Android, but this functionality has never been fully supported on Android.
@@ -22859,7 +22859,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'JavaScriptAllowedForUrls',
-@@ -5705,7 +5705,7 @@
+@@ -5704,7 +5704,7 @@
If this policy is left not set the global default value will be used for all sites either from the 'DefaultJavaScriptSetting' policy if it is set, or the user's personal configuration otherwise.
@@ -22868,7 +22868,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'JavaScriptBlockedForUrls',
-@@ -5728,7 +5728,7 @@
+@@ -5727,7 +5727,7 @@
If this policy is left not set the global default value will be used for all sites either from the 'DefaultJavaScriptSetting' policy if it is set, or the user's personal configuration otherwise.
@@ -22877,7 +22877,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'KeygenAllowedForUrls',
-@@ -5751,7 +5751,7 @@
+@@ -5750,7 +5750,7 @@
If this policy is left not set the global default value will be used for all sites either from the 'DefaultKeygenSetting' policy if it is set, or the user's personal configuration otherwise.
@@ -22886,7 +22886,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'KeygenBlockedForUrls',
-@@ -5774,11 +5774,11 @@
+@@ -5773,11 +5773,11 @@
If this policy is left not set the global default value will be used for all sites either from the 'DefaultKeygenSetting' policy if it is set, or the user's personal configuration otherwise.
@@ -22900,7 +22900,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -5809,13 +5809,13 @@
+@@ -5808,13 +5808,13 @@
'id': 623,
'caption': '''Default legacy SameSite cookie behavior setting''',
'tags': [],
@@ -22916,7 +22916,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -5834,7 +5834,7 @@
+@@ -5833,7 +5833,7 @@
'id': 624,
'caption': '''Revert to legacy SameSite behavior for cookies on these sites''',
'tags': [],
@@ -22925,7 +22925,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
For cookies on domains not covered by the patterns specified here, or for all cookies if this policy is not set, the global default value will be used either from the LegacySameSiteCookieBehaviorEnabled policy, if it is set, or the user's personal configuration otherwise.
-@@ -5861,7 +5861,7 @@
+@@ -5860,7 +5860,7 @@
If this policy is left not set the global default value will be used for all sites either from the 'DefaultPluginsSetting' policy if it is set, or the user's personal configuration otherwise.
@@ -22934,7 +22934,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'PluginsBlockedForUrls',
-@@ -5884,7 +5884,7 @@
+@@ -5883,7 +5883,7 @@
If this policy is left not set the global default value will be used for all sites either from the 'DefaultPluginsSetting' policy if it is set, or the user's personal configuration otherwise.
@@ -22943,7 +22943,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'PopupsAllowedForUrls',
-@@ -5911,7 +5911,7 @@
+@@ -5910,7 +5910,7 @@
If this policy is left not set the global default value will be used for all sites either from the 'DefaultPopupsSetting' policy if it is set, or the user's personal configuration otherwise.
@@ -22952,7 +22952,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'RegisteredProtocolHandlers',
-@@ -5945,7 +5945,7 @@
+@@ -5944,7 +5944,7 @@
'can_be_recommended': True,
'can_be_mandatory' : False,
},
@@ -22961,7 +22961,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 268,
'caption': '''Register protocol handlers''',
'tags': [],
-@@ -5979,7 +5979,7 @@
+@@ -5978,7 +5978,7 @@
If this policy is left not set the global default value will be used for all sites either from the 'DefaultPopupsSetting' policy if it is set, or the user's personal configuration otherwise.
@@ -22970,7 +22970,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'NotificationsAllowedForUrls',
-@@ -6002,7 +6002,7 @@
+@@ -6001,7 +6001,7 @@
If this policy is left not set the global default value will be used for all sites either from the 'DefaultNotificationsSetting' policy if it is set, or the user's personal configuration otherwise.
@@ -22979,7 +22979,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'NotificationsBlockedForUrls',
-@@ -6025,7 +6025,7 @@
+@@ -6024,7 +6024,7 @@
If this policy is left not set the global default value will be used for all sites either from the 'DefaultNotificationsSetting' policy if it is set, or the user's personal configuration otherwise.
@@ -22988,7 +22988,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'NativeMessagingBlacklist',
-@@ -6105,7 +6105,7 @@
+@@ -6104,7 +6104,7 @@
},
{
'name': 'Disable3DAPIs',
@@ -22997,7 +22997,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:9-', 'chrome_os:11-'],
-@@ -6147,7 +6147,7 @@
+@@ -6146,7 +6146,7 @@
},
{
'name': 'MaxInvalidationFetchDelay',
@@ -23006,7 +23006,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int',
'schema': { 'type': 'integer' },
'supported_on': ['chrome.*:30-', 'chrome_os:30-'],
-@@ -6167,7 +6167,7 @@
+@@ -6166,7 +6166,7 @@
},
{
'name': 'ChromeFrameRendererSettings',
@@ -23015,7 +23015,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -6216,7 +6216,7 @@
+@@ -6215,7 +6215,7 @@
If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy.
@@ -23024,7 +23024,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'RenderInHostList',
-@@ -6238,7 +6238,7 @@
+@@ -6237,7 +6237,7 @@
If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy.
@@ -23033,7 +23033,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'AdditionalLaunchParameters',
-@@ -6280,7 +6280,7 @@
+@@ -6279,7 +6279,7 @@
},
{
'name': 'ChromeFrameContentTypes',
@@ -23042,7 +23042,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -6300,7 +6300,7 @@
+@@ -6299,7 +6299,7 @@
},
{
'name': 'ChromeOsLockOnIdleSuspend',
@@ -23051,7 +23051,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:9-'],
-@@ -6325,7 +6325,7 @@
+@@ -6324,7 +6324,7 @@
},
{
'name': 'ChromeOsMultiProfileUserBehavior',
@@ -23060,7 +23060,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string-enum',
'schema': {
'type': 'string',
-@@ -6379,7 +6379,7 @@
+@@ -6378,7 +6378,7 @@
},
{
'name': 'SecondaryGoogleAccountSigninAllowed',
@@ -23069,7 +23069,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:65-'],
-@@ -6404,7 +6404,7 @@
+@@ -6403,7 +6403,7 @@
},
{
'name': 'ForceLogoutUnauthenticatedUserEnabled',
@@ -23078,7 +23078,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:81-'],
-@@ -6452,7 +6452,7 @@
+@@ -6451,7 +6451,7 @@
},
{
'name': 'AppRecommendationZeroStateEnabled',
@@ -23087,7 +23087,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:75-'],
-@@ -6647,7 +6647,7 @@
+@@ -6646,7 +6646,7 @@
},
{
'name': 'SecurityKeyPermitAttestation',
@@ -23096,7 +23096,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'tags': ['website-sharing'],
'type': 'list',
'schema': {
-@@ -6668,7 +6668,7 @@
+@@ -6667,7 +6667,7 @@
},
{
'name': 'GCFUserDataDir',
@@ -23105,7 +23105,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome_frame:12-32'],
-@@ -6683,7 +6683,7 @@
+@@ -6682,7 +6682,7 @@
If you set this policy, $3Google Chrome Frame will use the provided directory.
@@ -23114,7 +23114,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this setting is left not set the default profile directory will be used.''',
'label': '''Set user data directory''',
-@@ -6908,7 +6908,7 @@
+@@ -6907,7 +6907,7 @@
'tags': ['filtering'],
'desc': '''This policy prevents the user from loading web pages from blacklisted URLs. The blacklist provides a list of URL patterns that specify which URLs will be blacklisted.
@@ -23123,7 +23123,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
Exceptions can be defined in the URL whitelist policy. These policies are limited to 1000 entries; subsequent entries will be ignored.
-@@ -6957,7 +6957,7 @@
+@@ -6956,7 +6956,7 @@
},
{
'name': 'PolicyAtomicGroupsEnabled',
@@ -23132,7 +23132,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:78-', 'chrome_os:78-'],
-@@ -6977,7 +6977,7 @@
+@@ -6976,7 +6976,7 @@
},
{
'name': 'PolicyListMultipleSourceMergeList',
@@ -23141,7 +23141,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -7003,7 +7003,7 @@
+@@ -7002,7 +7002,7 @@
},
{
'name': 'PolicyDictionaryMultipleSourceMergeList',
@@ -23150,7 +23150,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string-enum-list',
'schema': {
'type': 'array',
-@@ -7074,7 +7074,7 @@
+@@ -7073,7 +7073,7 @@
'owners': ['file://components/policy/resources/OWNERS'],
'type': 'string',
'schema': { 'type': 'string' },
@@ -23159,7 +23159,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'supported_on': ['chrome_os:16-'],
'features': {
'dynamic_refresh': True,
-@@ -7092,7 +7092,7 @@
+@@ -7091,7 +7091,7 @@
'owners': ['file://components/policy/resources/OWNERS'],
'type': 'string',
'schema': { 'type': 'string' },
@@ -23168,7 +23168,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'supported_on': ['chrome_os:16-'],
'device_only': True,
'features': {
-@@ -7384,7 +7384,7 @@
+@@ -7383,7 +7383,7 @@
},
{
'name': 'PrintHeaderFooter',
@@ -23177,7 +23177,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:70-', 'chrome.*:70-'],
-@@ -7508,7 +7508,7 @@
+@@ -7507,7 +7507,7 @@
},
{
'name': 'EnableSha1ForLocalAnchors',
@@ -23186,7 +23186,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:54-71', 'chrome_os:54-71', 'android:54-71'],
-@@ -7783,7 +7783,7 @@
+@@ -7782,7 +7782,7 @@
},
{
'name': 'ReportDeviceUsers',
@@ -23195,7 +23195,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:32-'],
-@@ -7803,7 +7803,7 @@
+@@ -7802,7 +7802,7 @@
},
{
'name': 'ReportDeviceHardwareStatus',
@@ -23204,7 +23204,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:42-'],
-@@ -7824,7 +7824,7 @@
+@@ -7823,7 +7823,7 @@
},
{
'name': 'ReportDeviceSessionStatus',
@@ -23213,7 +23213,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:42-'],
-@@ -7893,7 +7893,7 @@
+@@ -7892,7 +7892,7 @@
},
{
'name': 'ReportDeviceOsUpdateStatus',
@@ -23222,7 +23222,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -7915,7 +7915,7 @@
+@@ -7914,7 +7914,7 @@
},
{
'name': 'ReportDevicePowerStatus',
@@ -23231,7 +23231,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:73-'],
-@@ -7936,7 +7936,7 @@
+@@ -7935,7 +7935,7 @@
},
{
'name': 'ReportDeviceStorageStatus',
@@ -23240,7 +23240,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:73-'],
-@@ -7957,7 +7957,7 @@
+@@ -7956,7 +7956,7 @@
},
{
'name': 'ReportDeviceBoardStatus',
@@ -23249,7 +23249,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:73-'],
-@@ -8084,7 +8084,7 @@
+@@ -8083,7 +8083,7 @@
},
{
'name': 'ReportArcStatusEnabled',
@@ -23258,7 +23258,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:55-'],
-@@ -8107,7 +8107,7 @@
+@@ -8106,7 +8106,7 @@
},
{
'name': 'ReportCrostiniUsageEnabled',
@@ -23267,7 +23267,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:70-'],
-@@ -8174,7 +8174,7 @@
+@@ -8173,7 +8173,7 @@
},
{
'name': 'LogUploadEnabled',
@@ -23276,7 +23276,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:46-'],
-@@ -8208,11 +8208,11 @@
+@@ -8207,11 +8207,11 @@
'features': {
'dynamic_refresh': True,
},
@@ -23290,7 +23290,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is not configured, there are no restrictions on which users are allowed to sign in. Note that creating new users still requires the DeviceAllowNewUsers policy to be configured appropriately.''',
'arc_support': 'This policy controls who may start a $2Chromium OS session. It does not prevent users from signing in to additional Google accounts within Android. If you want to prevent this, configure the Android-specific accountTypesWithManagementDisabled policy as part of ArcPolicy.',
-@@ -8397,7 +8397,7 @@
+@@ -8396,7 +8396,7 @@
'features': {
'dynamic_refresh': True,
},
@@ -23299,7 +23299,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 137,
'caption': '''Load specified urls on demo login''',
'tags': [],
-@@ -8496,7 +8496,7 @@
+@@ -8495,7 +8495,7 @@
'features': {
'dynamic_refresh': True,
},
@@ -23308,7 +23308,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 135,
'caption': '''List of AppPack extensions''',
'tags': [],
-@@ -8528,7 +8528,7 @@
+@@ -8527,7 +8527,7 @@
},
{
'name': 'DeviceAutoUpdateP2PEnabled',
@@ -23317,7 +23317,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:31-'],
-@@ -8782,7 +8782,7 @@
+@@ -8781,7 +8781,7 @@
},
{
'name': 'DeviceLocalAccountPromptForNetworkWhenOffline',
@@ -23326,7 +23326,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:33-'],
-@@ -8803,7 +8803,7 @@
+@@ -8802,7 +8802,7 @@
},
{
'name': 'DeviceLocalAccountManagedSessionEnabled',
@@ -23335,7 +23335,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:70-'],
-@@ -8815,7 +8815,7 @@
+@@ -8814,7 +8814,7 @@
'id': 463,
'caption': '''Allow managed session on device''',
'tags': [],
@@ -23344,7 +23344,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is set to true or left unset, managed guest session will take on "Managed Session" behaviour which lifts many of the restrictions that are in place for regular "Public Sessions".
-@@ -8938,13 +8938,13 @@
+@@ -8937,13 +8937,13 @@
'dynamic_refresh': True,
'per_profile': True,
},
@@ -23360,7 +23360,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is configured, the set of applications is fixed and can't be changed by the user.
-@@ -8991,11 +8991,11 @@
+@@ -8990,11 +8990,11 @@
If this setting is disabled or not configured then users can choose to proceed to the flagged site after being shown the warning.
@@ -23374,7 +23374,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
# TODO(https://crbug.com/813107): Remove this policy in M85.
-@@ -9014,7 +9014,7 @@
+@@ -9013,7 +9013,7 @@
Setting this policy to false stops users from choosing to send some system information and page content to Google servers. If this setting is true or not configured, then users will be allowed to send some system information and page content to Safe Browsing to help detect dangerous apps and sites.
@@ -23383,7 +23383,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'SpellCheckServiceEnabled',
-@@ -9059,7 +9059,7 @@
+@@ -9058,7 +9058,7 @@
},
{
'name': 'ExternalStorageReadOnly',
@@ -23392,7 +23392,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 343,
'type': 'main',
'schema': { 'type': 'boolean' },
-@@ -9125,7 +9125,7 @@
+@@ -9124,7 +9124,7 @@
},
{
'name': 'AudioCaptureAllowedUrls',
@@ -23401,7 +23401,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -9144,7 +9144,7 @@
+@@ -9143,7 +9143,7 @@
origin of the requesting URL. If a match is found, access to audio
capture devices will be granted without prompt.
@@ -23410,7 +23410,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
NOTE: Until version 45, this policy was only supported in Kiosk mode.''',
},
-@@ -9173,7 +9173,7 @@
+@@ -9172,7 +9172,7 @@
},
{
'name': 'VideoCaptureAllowedUrls',
@@ -23419,7 +23419,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -9192,7 +9192,7 @@
+@@ -9191,7 +9191,7 @@
origin of the requesting URL. If a match is found, access to video
capture devices will be granted without prompt.
@@ -23428,7 +23428,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
NOTE: Until version 45, this policy was only supported in Kiosk mode.''',
},
-@@ -9240,7 +9240,7 @@
+@@ -9239,7 +9239,7 @@
},
{
'name': 'SystemUse24HourClock',
@@ -23437,7 +23437,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:30-'],
-@@ -9262,7 +9262,7 @@
+@@ -9261,7 +9261,7 @@
},
{
'name': 'TouchVirtualKeyboardEnabled',
@@ -23446,7 +23446,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:37-' ],
-@@ -9304,7 +9304,7 @@
+@@ -9303,7 +9303,7 @@
},
{
'name': 'BuiltInDnsClientEnabled',
@@ -23455,7 +23455,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:25-'],
-@@ -9328,7 +9328,7 @@
+@@ -9327,7 +9327,7 @@
},
{
'name': 'DnsOverHttpsMode',
@@ -23464,7 +23464,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string-enum',
'schema': {
'type': 'string',
-@@ -9379,7 +9379,7 @@
+@@ -9378,7 +9378,7 @@
},
{
'name': 'DnsOverHttpsTemplates',
@@ -23473,7 +23473,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome_os:80-', 'chrome.*:80-'],
-@@ -9501,7 +9501,7 @@
+@@ -9500,7 +9500,7 @@
},
{
'name': 'SystemFeaturesDisableList',
@@ -23482,7 +23482,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string-enum-list',
'schema': {
'type': 'array',
-@@ -10501,7 +10501,7 @@
+@@ -10500,7 +10500,7 @@
},
{
'name': 'DeviceAllowRedeemChromeOsRegistrationOffers',
@@ -23491,7 +23491,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:26-'],
-@@ -10668,7 +10668,7 @@
+@@ -10667,7 +10667,7 @@
},
{
'name': 'DeviceLoginScreenAccessibilityShortcutsEnabled',
@@ -23500,7 +23500,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:81-'],
-@@ -10693,7 +10693,7 @@
+@@ -10692,7 +10692,7 @@
},
{
'name': 'AccessibilityShortcutsEnabled',
@@ -23509,7 +23509,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:81-'],
-@@ -10743,7 +10743,7 @@
+@@ -10742,7 +10742,7 @@
},
{
'name': 'StickyKeysEnabled',
@@ -23518,7 +23518,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:76-'],
-@@ -10768,7 +10768,7 @@
+@@ -10767,7 +10767,7 @@
},
{
'name': 'SelectToSpeakEnabled',
@@ -23527,7 +23527,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:77-'],
-@@ -10793,7 +10793,7 @@
+@@ -10792,7 +10792,7 @@
},
{
'name': 'DictationEnabled',
@@ -23536,7 +23536,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:78-'],
-@@ -10818,7 +10818,7 @@
+@@ -10817,7 +10817,7 @@
},
{
'name': 'KeyboardFocusHighlightEnabled',
@@ -23545,7 +23545,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:78-'],
-@@ -10845,7 +10845,7 @@
+@@ -10844,7 +10844,7 @@
},
{
'name': 'CursorHighlightEnabled',
@@ -23554,7 +23554,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:78-'],
-@@ -10872,7 +10872,7 @@
+@@ -10871,7 +10871,7 @@
},
{
'name': 'CaretHighlightEnabled',
@@ -23563,7 +23563,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:78-'],
-@@ -10899,7 +10899,7 @@
+@@ -10898,7 +10898,7 @@
},
{
'name': 'MonoAudioEnabled',
@@ -23572,7 +23572,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:78-'],
-@@ -10926,7 +10926,7 @@
+@@ -10925,7 +10925,7 @@
},
{
'name': 'AutoclickEnabled',
@@ -23581,7 +23581,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:78-'],
-@@ -11041,7 +11041,7 @@
+@@ -11040,7 +11040,7 @@
},
{
'name': 'DeviceLoginScreenLargeCursorEnabled',
@@ -23590,7 +23590,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:78-'],
-@@ -11092,7 +11092,7 @@
+@@ -11091,7 +11091,7 @@
},
{
'name': 'DeviceLoginScreenSpokenFeedbackEnabled',
@@ -23599,7 +23599,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -11143,7 +11143,7 @@
+@@ -11142,7 +11142,7 @@
},
{
'name': 'DeviceLoginScreenHighContrastEnabled',
@@ -23608,7 +23608,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -11194,7 +11194,7 @@
+@@ -11193,7 +11193,7 @@
},
{
'name': 'DeviceLoginScreenVirtualKeyboardEnabled',
@@ -23617,7 +23617,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -11219,7 +11219,7 @@
+@@ -11218,7 +11218,7 @@
},
{
'name': 'PrimaryMouseButtonSwitch',
@@ -23626,7 +23626,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:81-'],
-@@ -11244,7 +11244,7 @@
+@@ -11243,7 +11243,7 @@
},
{
'name': 'DeviceLoginScreenPrimaryMouseButtonSwitch',
@@ -23635,7 +23635,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:81-'],
-@@ -11269,7 +11269,7 @@
+@@ -11268,7 +11268,7 @@
},
{
'name': 'SharedClipboardEnabled',
@@ -23644,7 +23644,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:79-', 'chrome_os:79-', 'android:79-'],
-@@ -11339,7 +11339,7 @@
+@@ -11338,7 +11338,7 @@
},
{
'name': 'DeviceLoginScreenScreenMagnifierType',
@@ -23653,7 +23653,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -11386,7 +11386,7 @@
+@@ -11385,7 +11385,7 @@
},
{
'name': 'DeviceLoginScreenDictationEnabled',
@@ -23662,7 +23662,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -11411,7 +11411,7 @@
+@@ -11410,7 +11410,7 @@
},
{
'name': 'DeviceLoginScreenSelectToSpeakEnabled',
@@ -23671,7 +23671,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -11436,7 +11436,7 @@
+@@ -11435,7 +11435,7 @@
},
{
'name': 'DeviceLoginScreenCursorHighlightEnabled',
@@ -23680,7 +23680,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -11461,7 +11461,7 @@
+@@ -11460,7 +11460,7 @@
},
{
'name': 'DeviceLoginScreenCaretHighlightEnabled',
@@ -23689,7 +23689,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -11486,7 +11486,7 @@
+@@ -11485,7 +11485,7 @@
},
{
'name': 'DeviceLoginScreenMonoAudioEnabled',
@@ -23698,7 +23698,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -11513,7 +11513,7 @@
+@@ -11512,7 +11512,7 @@
},
{
'name': 'DeviceLoginScreenAutoclickEnabled',
@@ -23707,7 +23707,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -11540,7 +11540,7 @@
+@@ -11539,7 +11539,7 @@
},
{
'name': 'DeviceLoginScreenStickyKeysEnabled',
@@ -23716,7 +23716,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -11565,7 +11565,7 @@
+@@ -11564,7 +11564,7 @@
},
{
'name': 'DeviceLoginScreenKeyboardFocusHighlightEnabled',
@@ -23725,7 +23725,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -11729,7 +11729,7 @@
+@@ -11728,7 +11728,7 @@
},
{
'name': 'ChromeVariations',
@@ -23734,7 +23734,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -11773,7 +11773,7 @@
+@@ -11772,7 +11772,7 @@
},
{
'name': 'DeviceChromeVariations',
@@ -23743,7 +23743,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -12104,20 +12104,20 @@
+@@ -12103,20 +12103,20 @@
"toplevel_name": "My managed bookmarks folder"
}, {
"name": "Google",
@@ -23768,7 +23768,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
}
]
}
-@@ -12127,7 +12127,7 @@
+@@ -12126,7 +12126,7 @@
'tags': [],
'desc': '''Configures a list of managed bookmarks.
@@ -23777,7 +23777,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
These bookmarks are placed in a folder that can't be modified by the user (but the user can choose to hide it from the bookmark bar). By default the folder name is "Managed bookmarks" but it can be customized by adding to the list of bookmarks a dictionary containing the key "toplevel_name" with the desired folder name as the value.
-@@ -12135,7 +12135,7 @@
+@@ -12134,7 +12134,7 @@
},
{
'name': 'DataCompressionProxyEnabled',
@@ -23786,7 +23786,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['android:31-'],
-@@ -12349,7 +12349,7 @@
+@@ -12348,7 +12348,7 @@
},
{
'name': 'BrowserGuestModeEnabled',
@@ -23795,7 +23795,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:38-'],
-@@ -12367,7 +12367,7 @@
+@@ -12366,7 +12366,7 @@
},
{
'name': 'BrowserGuestModeEnforced',
@@ -23804,7 +23804,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:77-'],
-@@ -12385,7 +12385,7 @@
+@@ -12384,7 +12384,7 @@
},
{
'name': 'BrowserAddPersonEnabled',
@@ -23813,7 +23813,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:39-'],
-@@ -12403,7 +12403,7 @@
+@@ -12402,7 +12402,7 @@
},
{
'name': 'ForceBrowserSignin',
@@ -23822,7 +23822,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'deprecated': True,
'schema': { 'type': 'boolean' },
-@@ -12463,7 +12463,7 @@
+@@ -12462,7 +12462,7 @@
If the policy is set to "Enable browser sign-in," then the user is allowed to sign in to the browser and is automatically signed in to the browser when signed in to Google web services like Gmail. Being signed in to the browser means the user's account information will be kept by the browser. However, it does not mean that Chrome sync will be turned on per default; the user must separately opt-in to use this feature. Enabling this policy will prevent the user from turning off the setting that allows browser sign-in. To control the availability of Chrome sync, use the "SyncDisabled" policy.
@@ -23831,7 +23831,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is not set then the user can decide if they want to enable the browser sign in option and use it as they see fit.''',
},
-@@ -12625,7 +12625,7 @@
+@@ -12624,7 +12624,7 @@
This policy allows certificates for the hostnames in the specified URLs to not be disclosed via Certificate Transparency. This allows certificates that would otherwise be untrusted, because they were not properly publicly disclosed, to continue to be used, but makes it harder to detect misissued certificates for those hosts.
@@ -23840,7 +23840,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is not set, any certificate that is required to be disclosed via Certificate Transparency will be treated as untrusted if it is not disclosed according to the Certificate Transparency policy.''',
},
-@@ -12748,7 +12748,7 @@
+@@ -12747,7 +12747,7 @@
},
{
'name': 'ContextualSearchEnabled',
@@ -23849,7 +23849,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': [
-@@ -12843,7 +12843,7 @@
+@@ -12842,7 +12842,7 @@
},
{
'name': 'SSLErrorOverrideAllowed',
@@ -23858,7 +23858,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:44-', 'chrome_os:44-', 'android:44-'],
-@@ -12920,7 +12920,7 @@
+@@ -12919,7 +12919,7 @@
},
{
'name': 'WelcomePageOnOSUpgradeEnabled',
@@ -23867,7 +23867,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'supported_on': ['chrome.win:45-62'],
'type': 'main',
'schema': { 'type': 'boolean' },
-@@ -12938,7 +12938,7 @@
+@@ -12937,7 +12937,7 @@
},
{
'name': 'HardwareAccelerationModeEnabled',
@@ -23876,7 +23876,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:46-'],
-@@ -12956,7 +12956,7 @@
+@@ -12955,7 +12955,7 @@
},
{
'name': 'UnifiedDesktopEnabledByDefault',
@@ -23885,7 +23885,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:47-'],
-@@ -12979,7 +12979,7 @@
+@@ -12978,7 +12978,7 @@
},
{
'name': 'DisplayRotationDefault',
@@ -23894,7 +23894,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -13032,7 +13032,7 @@
+@@ -13031,7 +13031,7 @@
},
{
'name': 'ArcEnabled',
@@ -23903,7 +23903,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:50-'],
-@@ -13118,7 +13118,7 @@
+@@ -13117,7 +13117,7 @@
},
{
'name': 'AllowKioskAppControlChromeVersion',
@@ -23912,7 +23912,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:51-'],
-@@ -13144,7 +13144,7 @@
+@@ -13143,7 +13143,7 @@
},
{
'name': 'LoginAuthenticationBehavior',
@@ -23921,7 +23921,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -13180,7 +13180,7 @@
+@@ -13179,7 +13179,7 @@
},
{
'name': 'UsbDetachableWhitelist',
@@ -23930,7 +23930,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -13217,7 +13217,7 @@
+@@ -13216,7 +13216,7 @@
},
{
'name': 'DeviceAllowBluetooth',
@@ -23939,7 +23939,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:52-'],
-@@ -13239,7 +13239,7 @@
+@@ -13238,7 +13238,7 @@
},
{
'name': 'SuppressUnsupportedOSWarning',
@@ -23948,7 +23948,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'caption': '''Suppress the unsupported OS warning''',
'desc': '''Suppresses the warning that appears when $1Google Chrome is running on a computer or operating system that is no longer supported.
-@@ -13257,7 +13257,7 @@
+@@ -13256,7 +13256,7 @@
},
{
'name': 'DeviceQuirksDownloadEnabled',
@@ -23957,7 +23957,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:51-'],
-@@ -13280,7 +13280,7 @@
+@@ -13279,7 +13279,7 @@
},
{
'name': 'SystemTimezoneAutomaticDetection',
@@ -23966,7 +23966,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -13358,7 +13358,7 @@
+@@ -13357,7 +13357,7 @@
},
{
'name': 'NetworkThrottlingEnabled',
@@ -23975,7 +23975,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'device_only': True,
'caption': '''Enable throttling network bandwidth''',
'desc': '''Allows enabling or disabling network throttling.
-@@ -13398,7 +13398,7 @@
+@@ -13397,7 +13397,7 @@
},
{
'name': 'DeviceWiFiFastTransitionEnabled',
@@ -23984,7 +23984,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'device_only': True,
'caption': '''Enable 802.11r Fast Transition''',
'desc': '''Allows enabling or disabling Fast Transition.
-@@ -13421,7 +13421,7 @@
+@@ -13420,7 +13420,7 @@
},
{
'name': 'DeviceWiFiAllowed',
@@ -23993,7 +23993,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'device_only': True,
'caption': '''Enable WiFi''',
'desc': '''
-@@ -13440,7 +13440,7 @@
+@@ -13439,7 +13439,7 @@
},
{
'name': 'DeviceDockMacAddressSource',
@@ -24002,7 +24002,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'caption': '''Device MAC address source when docked''',
'desc': '''
Configures which MAC (media access control) address will be used when a dock is connected to the device.
-@@ -13488,7 +13488,7 @@
+@@ -13487,7 +13487,7 @@
},
{
'name': 'LoginVideoCaptureAllowedUrls',
@@ -24011,7 +24011,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -13512,7 +13512,7 @@
+@@ -13511,7 +13511,7 @@
},
{
'name': 'DeviceLoginScreenExtensions',
@@ -24020,7 +24020,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -13523,7 +13523,7 @@
+@@ -13522,7 +13522,7 @@
'features': {
'dynamic_refresh': True,
},
@@ -24029,7 +24029,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 336,
'caption': '''Configure the list of installed apps and extensions on the login screen''',
'tags': ['full-admin-access'],
-@@ -13536,9 +13536,9 @@
+@@ -13535,9 +13535,9 @@
If an app or extension that previously had been force-installed is removed from this list, it is automatically uninstalled by $1Google Chrome.
@@ -24041,7 +24041,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'AllowScreenLock',
-@@ -13558,7 +13558,7 @@
+@@ -13557,7 +13557,7 @@
},
{
'name': 'ArcCertificatesSyncMode',
@@ -24050,7 +24050,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -13591,7 +13591,7 @@
+@@ -13590,7 +13590,7 @@
},
{
'name': 'AllowedDomainsForApps',
@@ -24059,7 +24059,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:51-', 'chrome_os:51-', 'android:51-'],
-@@ -13600,7 +13600,7 @@
+@@ -13599,7 +13599,7 @@
'dynamic_refresh': True,
'per_profile': True,
},
@@ -24068,7 +24068,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 331,
'caption': '''Define domains allowed to access G Suite''',
'tags': ['filtering'],
-@@ -13608,7 +13608,7 @@
+@@ -13607,7 +13607,7 @@
If you define this setting, the user will only be able to access Google
Apps using accounts from the specified domains (note that to allow
@@ -24077,7 +24077,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
(without quotes) to the list of domains).
This setting will prevent the user from logging in, and adding a Secondary
-@@ -13619,14 +13619,14 @@
+@@ -13618,14 +13618,14 @@
access G Suite with any account.
This policy causes the X-GoogApps-Allowed-Domains header to be appended to
@@ -24095,7 +24095,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': [ 'chrome.*:52-74', 'chrome_os:52-74' ],
-@@ -13755,7 +13755,7 @@
+@@ -13754,7 +13754,7 @@
},
{
'name': 'NTPContentSuggestionsEnabled',
@@ -24104,7 +24104,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['android:54-'],
-@@ -13775,7 +13775,7 @@
+@@ -13774,7 +13774,7 @@
},
{
'name': 'NTPCustomBackgroundEnabled',
@@ -24113,7 +24113,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:80-', 'chrome_os:80-'],
-@@ -13795,7 +13795,7 @@
+@@ -13794,7 +13794,7 @@
},
{
'name': 'WebRtcUdpPortRange',
@@ -24122,7 +24122,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:54-', 'chrome_os:54-', 'android:54-'],
-@@ -13813,7 +13813,7 @@
+@@ -13812,7 +13812,7 @@
},
{
'name': 'WebRtcLocalIpsAllowedUrls',
@@ -24131,7 +24131,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -13868,7 +13868,7 @@
+@@ -13867,7 +13867,7 @@
If set to False, updates to components are disabled. However, some components are exempt from this policy: updates to any component that does not contain executable code, or does not significantly alter the behavior of the browser, or is critical for its security will not be disabled.
Examples of such components include the certificate revocation lists and Safe Browsing data.
@@ -24140,7 +24140,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'NativePrinters',
-@@ -13896,7 +13896,7 @@
+@@ -13895,7 +13895,7 @@
'properties': {
'effective_model': {
'type': 'string',
@@ -24149,7 +24149,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
'autoconf': {
'type': 'boolean',
-@@ -14076,7 +14076,7 @@
+@@ -14075,7 +14075,7 @@
},
{
'name': 'DeviceNativePrinters',
@@ -24158,7 +24158,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 386,
'device_only': True,
'type': 'external',
-@@ -14118,7 +14118,7 @@
+@@ -14117,7 +14117,7 @@
},
{
'name': 'DeviceNativePrintersAccessMode',
@@ -24167,7 +24167,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 387,
'device_only': True,
'supported_on': ['chrome_os:73-'],
-@@ -14160,7 +14160,7 @@
+@@ -14159,7 +14159,7 @@
},
{
'name': 'DeviceNativePrintersBlacklist',
@@ -24176,7 +24176,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'supported_on': ['chrome_os:73-'],
'device_only': True,
'id': 388,
-@@ -14184,7 +14184,7 @@
+@@ -14183,7 +14183,7 @@
},
{
'name': 'DeviceNativePrintersWhitelist',
@@ -24185,7 +24185,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'supported_on': ['chrome_os:73-'],
'device_only': True,
'id': 389,
-@@ -14259,7 +14259,7 @@
+@@ -14258,7 +14258,7 @@
},
{
'name': 'MinimumRequiredChromeVersion',
@@ -24194,7 +24194,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'supported_on': ['chrome_os:64-81'],
'device_only': True,
'type': 'string',
-@@ -14285,7 +14285,7 @@
+@@ -14284,7 +14284,7 @@
},
{
'name': 'MinimumChromeVersionEnforced',
@@ -24203,7 +24203,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'supported_on': ['chrome_os:82-'],
'device_only': True,
'type': 'dict',
-@@ -14490,7 +14490,7 @@
+@@ -14489,7 +14489,7 @@
},
{
'name': 'DeviceWallpaperImage',
@@ -24212,7 +24212,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'external',
'schema': {
'type': 'object',
-@@ -14565,7 +14565,7 @@
+@@ -14564,7 +14564,7 @@
},
{
'name': 'DeviceLoginScreenSystemInfoEnforced',
@@ -24221,7 +24221,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -14588,7 +14588,7 @@
+@@ -14587,7 +14587,7 @@
},
{
'name': 'SmsMessagesAllowed',
@@ -24230,7 +24230,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:70-'],
-@@ -14609,7 +14609,7 @@
+@@ -14608,7 +14608,7 @@
},
{
'name': 'SmartLockSigninAllowed',
@@ -24239,7 +24239,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:71-'],
-@@ -14630,7 +14630,7 @@
+@@ -14629,7 +14629,7 @@
},
{
'name': 'InstantTetheringAllowed',
@@ -24248,7 +24248,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:60-'],
-@@ -14651,7 +14651,7 @@
+@@ -14650,7 +14650,7 @@
},
{
'name': 'BrowserNetworkTimeQueriesEnabled',
@@ -24257,7 +24257,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:60-'],
-@@ -14667,7 +14667,7 @@
+@@ -14666,7 +14666,7 @@
},
{
'name': 'DeviceSecondFactorAuthentication',
@@ -24266,7 +24266,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -14733,7 +14733,7 @@
+@@ -14732,7 +14732,7 @@
},
{
'name': 'DeviceEcryptfsMigrationStrategy',
@@ -24275,7 +24275,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -14872,7 +14872,7 @@
+@@ -14871,7 +14871,7 @@
},
{
'name': 'NoteTakingAppsLockScreenWhitelist',
@@ -24284,7 +24284,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -15025,7 +15025,7 @@
+@@ -15024,7 +15024,7 @@
},
{
'name': 'CloudPolicyOverridesPlatformPolicy',
@@ -24293,7 +24293,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean'},
'supported_on': ['chrome.*:75-'],
-@@ -15046,7 +15046,7 @@
+@@ -15045,7 +15045,7 @@
},
{
'name': 'PromptForDownloadLocation',
@@ -24302,7 +24302,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean'},
'supported_on': ['chrome.*:64-', 'chrome_os:64-'],
-@@ -15066,7 +15066,7 @@
+@@ -15065,7 +15065,7 @@
},
{
'name': 'UnaffiliatedArcAllowed',
@@ -24311,7 +24311,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:64-'],
-@@ -15086,7 +15086,7 @@
+@@ -15085,7 +15085,7 @@
},
{
'name': 'IsolateOrigins',
@@ -24320,7 +24320,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:63-', 'chrome_os:63-'],
-@@ -15112,7 +15112,7 @@
+@@ -15111,7 +15111,7 @@
},
{
'name': 'SitePerProcess',
@@ -24329,7 +24329,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:63-', 'chrome_os:63-'],
-@@ -15177,7 +15177,7 @@
+@@ -15176,7 +15176,7 @@
},
{
'name': 'IsolateOriginsAndroid',
@@ -24338,7 +24338,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['android:68-'],
-@@ -15206,7 +15206,7 @@
+@@ -15205,7 +15205,7 @@
},
{
'name': 'SitePerProcessAndroid',
@@ -24347,7 +24347,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['android:68-'],
-@@ -15261,7 +15261,7 @@
+@@ -15260,7 +15260,7 @@
},
{
'name': 'UnsafelyTreatInsecureOriginAsSecure',
@@ -24356,7 +24356,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -15308,7 +15308,7 @@
+@@ -15307,7 +15307,7 @@
},
{
'name': 'DefaultDownloadDirectory',
@@ -24365,7 +24365,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:64-', 'chrome_os:64-'],
-@@ -15328,11 +15328,11 @@
+@@ -15327,11 +15327,11 @@
If you do not set this policy, $1Google Chrome will use its usual default directory (platform-specific).
@@ -24379,7 +24379,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome_os:65-'],
-@@ -15355,7 +15355,7 @@
+@@ -15354,7 +15354,7 @@
},
{
'name': 'AbusiveExperienceInterventionEnforce',
@@ -24388,7 +24388,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:65-', 'chrome_os:65-'],
-@@ -15376,7 +15376,7 @@
+@@ -15375,7 +15375,7 @@
},
{
'name': 'SpellcheckLanguage',
@@ -24397,7 +24397,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -15407,7 +15407,7 @@
+@@ -15406,7 +15406,7 @@
},
{
'name': 'SpellcheckLanguageBlacklist',
@@ -24406,7 +24406,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -15438,7 +15438,7 @@
+@@ -15437,7 +15437,7 @@
},
{
'name': 'ThirdPartyBlockingEnabled',
@@ -24415,7 +24415,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.win:65-'],
-@@ -15456,7 +15456,7 @@
+@@ -15455,7 +15455,7 @@
},
{
'name': 'SpellcheckEnabled',
@@ -24424,7 +24424,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:65-', 'chrome_os:65-'],
-@@ -15478,7 +15478,7 @@
+@@ -15477,7 +15477,7 @@
},
{
'name': 'AdsSettingForIntrusiveAdsSites',
@@ -24433,7 +24433,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -15514,7 +15514,7 @@
+@@ -15513,7 +15513,7 @@
},
{
'name': 'RestrictAccountsToPatterns',
@@ -24442,7 +24442,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -15525,7 +15525,7 @@
+@@ -15524,7 +15524,7 @@
'dynamic_refresh': True,
'per_profile': False,
},
@@ -24451,7 +24451,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 410,
'caption': '''Restrict accounts that are visible in $1Google Chrome''',
'tags': [],
-@@ -15539,7 +15539,7 @@
+@@ -15538,7 +15538,7 @@
},
{
'name': 'PasswordProtectionWarningTrigger',
@@ -24460,7 +24460,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -15583,7 +15583,7 @@
+@@ -15582,7 +15582,7 @@
{
'id': 419,
'name': 'RelaunchNotification',
@@ -24469,7 +24469,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'tags': [],
'features': {
'dynamic_refresh': True,
-@@ -15618,7 +15618,7 @@
+@@ -15617,7 +15617,7 @@
{
'id': 420,
'name': 'RelaunchNotificationPeriod',
@@ -24478,7 +24478,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'tags': [],
'features': {
'dynamic_refresh': True,
-@@ -15657,7 +15657,7 @@
+@@ -15656,7 +15656,7 @@
},
{
'name': 'VirtualMachinesAllowed',
@@ -24487,7 +24487,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:66-'],
-@@ -15681,7 +15681,7 @@
+@@ -15680,7 +15680,7 @@
},
{
'name': 'CrostiniAllowed',
@@ -24496,7 +24496,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:70-'],
-@@ -15702,7 +15702,7 @@
+@@ -15701,7 +15701,7 @@
},
{
'name': 'DeviceUnaffiliatedCrostiniAllowed',
@@ -24505,7 +24505,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:70-'],
-@@ -15722,7 +15722,7 @@
+@@ -15721,7 +15721,7 @@
},
{
'name': 'CrostiniExportImportUIAllowed',
@@ -24514,7 +24514,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:74-'],
-@@ -15738,7 +15738,7 @@
+@@ -15737,7 +15737,7 @@
},
{
'name': 'CrostiniRootAccessAllowed',
@@ -24523,7 +24523,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:77-'],
-@@ -15758,7 +15758,7 @@
+@@ -15757,7 +15757,7 @@
},
{
'name': 'CrostiniAnsiblePlaybook',
@@ -24532,7 +24532,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'external',
'schema': {
'type': 'object',
-@@ -15799,7 +15799,7 @@
+@@ -15798,7 +15798,7 @@
},
{
'name': 'SafeBrowsingWhitelistDomains',
@@ -24541,7 +24541,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -15825,7 +15825,7 @@
+@@ -15824,7 +15824,7 @@
},
{
'name': 'PasswordProtectionLoginURLs',
@@ -24550,7 +24550,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -15841,15 +15841,15 @@
+@@ -15840,15 +15840,15 @@
'caption': '''Configure the list of enterprise login URLs where password protection service should capture fingerprint of password.''',
'tags': [],
'desc': '''Configure the list of enterprise login URLs (HTTP and HTTPS schemes only). Fingerprint of password will be captured on these URLs and used for password reuse detection.
@@ -24569,7 +24569,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:69-', 'chrome_os:69-'],
-@@ -15862,15 +15862,15 @@
+@@ -15861,15 +15861,15 @@
'caption': '''Configure the change password URL.''',
'tags': [],
'desc': '''Configure the change password URL (HTTP and HTTPS schemes only). Password protection service will send users to this URL to change their password after seeing a warning in the browser.
@@ -24588,7 +24588,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:66-', 'chrome_os:66-'],
-@@ -15894,11 +15894,11 @@
+@@ -15893,11 +15893,11 @@
If this policy is left unset, the user will be able to change the setting and decide whether to send reports or not.
@@ -24602,7 +24602,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:66-80'],
-@@ -15917,7 +15917,7 @@
+@@ -15916,7 +15916,7 @@
},
{
'name': 'CloudManagementEnrollmentToken',
@@ -24611,7 +24611,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:72-'],
-@@ -15936,7 +15936,7 @@
+@@ -15935,7 +15935,7 @@
},
{
'name': 'CloudManagementEnrollmentMandatory',
@@ -24620,7 +24620,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:72-'],
-@@ -15957,7 +15957,7 @@
+@@ -15956,7 +15956,7 @@
},
{
'name': 'AutoplayAllowed',
@@ -24629,7 +24629,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.win:66-', 'chrome.linux:66-', 'chrome.mac:66-', 'chrome_os:66-'],
-@@ -15980,7 +15980,7 @@
+@@ -15979,7 +15979,7 @@
},
{
'name': 'AutoplayWhitelist',
@@ -24638,7 +24638,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -16005,11 +16005,11 @@
+@@ -16004,11 +16004,11 @@
Note that if $1Google Chrome is running and this policy changes, it will be applied only to new opened tabs. Therefore some tabs might still observe the previous behavior.
@@ -24652,7 +24652,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:67-67', 'chrome_os:67-67'],
-@@ -16024,13 +16024,13 @@
+@@ -16023,13 +16023,13 @@
'tags': [],
'desc': '''Deprecated in M68. Use DefaultPopupsSetting instead.
@@ -24668,7 +24668,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:67-'],
-@@ -16090,7 +16090,7 @@
+@@ -16089,7 +16089,7 @@
},
{
'name': 'ChromeCleanupEnabled',
@@ -24677,7 +24677,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.win:68-'],
-@@ -16110,7 +16110,7 @@
+@@ -16109,7 +16109,7 @@
},
{
'name': 'ChromeCleanupReportingEnabled',
@@ -24686,7 +24686,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.win:68-'],
-@@ -16132,7 +16132,7 @@
+@@ -16131,7 +16131,7 @@
},
{
'name': 'AllowedLanguages',
@@ -24695,7 +24695,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -16154,7 +16154,7 @@
+@@ -16153,7 +16153,7 @@
},
{
'name': 'AllowedInputMethods',
@@ -24704,7 +24704,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -16196,7 +16196,7 @@
+@@ -16195,7 +16195,7 @@
},
{
'name': 'UsageTimeLimit',
@@ -24713,7 +24713,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'object',
-@@ -16459,7 +16459,7 @@
+@@ -16458,7 +16458,7 @@
},
{
'name': 'EnableSyncConsent',
@@ -24722,7 +24722,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean'},
'supported_on': ['chrome_os:66-'],
-@@ -16583,7 +16583,7 @@
+@@ -16582,7 +16582,7 @@
{
'id': 454,
'name': 'PromotionalTabsEnabled',
@@ -24731,7 +24731,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'tags': [],
'features': {
'dynamic_refresh': True,
-@@ -16604,7 +16604,7 @@
+@@ -16603,7 +16603,7 @@
},
{
'name': 'SafeSitesFilterBehavior',
@@ -24740,7 +24740,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -16641,7 +16641,7 @@
+@@ -16640,7 +16640,7 @@
},
{
'name': 'OverrideSecurityRestrictionsOnInsecureOrigin',
@@ -24749,7 +24749,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -16727,7 +16727,7 @@
+@@ -16726,7 +16726,7 @@
},
{
'name': 'TabFreezingEnabled',
@@ -24758,7 +24758,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:79-', 'chrome_os:79-'],
-@@ -16741,7 +16741,7 @@
+@@ -16740,7 +16740,7 @@
'tags': [],
'desc': '''Controls whether $1Google Chrome can freeze tabs that have been in the background for at least 5 minutes.
@@ -24767,7 +24767,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If the policy is set to false, no tabs will be frozen.''',
},
-@@ -16772,7 +16772,7 @@
+@@ -16771,7 +16771,7 @@
{
'id': 462,
'name': 'NetworkFileSharesAllowed',
@@ -24776,7 +24776,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean', },
'tags': [],
-@@ -16791,7 +16791,7 @@
+@@ -16790,7 +16790,7 @@
},
{
'name': 'WebRtcEventLogCollectionAllowed',
@@ -24785,7 +24785,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:70-', 'chrome_os:70-'],
-@@ -16812,7 +16812,7 @@
+@@ -16811,7 +16811,7 @@
},
{
'name': 'PowerSmartDimEnabled',
@@ -24794,7 +24794,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:70-'],
-@@ -16831,7 +16831,7 @@
+@@ -16830,7 +16830,7 @@
},
{
'name': 'CoalesceH2ConnectionsWithClientCertificatesForHosts',
@@ -24803,7 +24803,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -16856,7 +16856,7 @@
+@@ -16855,7 +16855,7 @@
{
'id': 467,
'name': 'NetBiosShareDiscoveryEnabled',
@@ -24812,7 +24812,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean', },
'tags': [],
-@@ -16901,11 +16901,11 @@
+@@ -16900,11 +16900,11 @@
'per_profile': True,
},
'example_value': [{
@@ -24826,7 +24826,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'default_launch_container': 'tab'
}],
'id': 468,
-@@ -16919,7 +16919,7 @@
+@@ -16918,7 +16918,7 @@
{
'id': 470,
'name': 'ReportVersionData',
@@ -24835,7 +24835,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean' },
'tags': ['admin-sharing'],
-@@ -16941,7 +16941,7 @@
+@@ -16940,7 +16940,7 @@
{
'id': 471,
'name': 'ReportPolicyData',
@@ -24844,7 +24844,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean' },
'tags': ['admin-sharing'],
-@@ -16963,7 +16963,7 @@
+@@ -16962,7 +16962,7 @@
{
'id': 472,
'name': 'ReportMachineIDData',
@@ -24853,7 +24853,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean' },
'tags': ['admin-sharing'],
-@@ -16985,7 +16985,7 @@
+@@ -16984,7 +16984,7 @@
{
'id': 473,
'name': 'ReportUserIDData',
@@ -24862,7 +24862,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean' },
'tags': ['admin-sharing'],
-@@ -17007,7 +17007,7 @@
+@@ -17006,7 +17006,7 @@
{
'id': 499,
'name': 'ReportExtensionsAndPluginsData',
@@ -24871,7 +24871,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean' },
'tags': ['admin-sharing'],
-@@ -17029,7 +17029,7 @@
+@@ -17028,7 +17028,7 @@
{
'id': 500,
'name': 'ReportSafeBrowsingData',
@@ -24880,7 +24880,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean' },
'tags': ['admin-sharing'],
-@@ -17051,7 +17051,7 @@
+@@ -17050,7 +17050,7 @@
{
'id': 608,
'name': 'CloudExtensionRequestEnabled',
@@ -24889,7 +24889,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean' },
'tags': ['admin-sharing', 'google-sharing'],
-@@ -17076,7 +17076,7 @@
+@@ -17075,7 +17075,7 @@
{
'id': 493,
'name': 'CloudReportingEnabled',
@@ -24898,7 +24898,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean' },
'tags': ['admin-sharing', 'google-sharing'],
-@@ -17099,7 +17099,7 @@
+@@ -17098,7 +17098,7 @@
},
{
'name': 'EnterpriseHardwarePlatformAPIEnabled',
@@ -24907,7 +24907,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:71-', 'chrome_os:71-', 'android:71-'],
-@@ -17117,7 +17117,7 @@
+@@ -17116,7 +17116,7 @@
},
{
'name': 'VpnConfigAllowed',
@@ -24916,7 +24916,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:71-'],
-@@ -17142,7 +17142,7 @@
+@@ -17141,7 +17141,7 @@
{
'id': 489,
'name': 'NTLMShareAuthenticationEnabled',
@@ -24925,7 +24925,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean', },
'tags': [],
-@@ -17163,7 +17163,7 @@
+@@ -17162,7 +17162,7 @@
},
{
'name': 'NetworkFileSharesPreconfiguredShares',
@@ -24934,7 +24934,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'array',
-@@ -17241,7 +17241,7 @@
+@@ -17240,7 +17240,7 @@
{
'id': 494,
'name': 'AlternativeBrowserPath',
@@ -24943,7 +24943,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': {'type': 'string'},
'features': {
-@@ -17267,7 +17267,7 @@
+@@ -17266,7 +17266,7 @@
{
'id': 495,
'name': 'AlternativeBrowserParameters',
@@ -24952,7 +24952,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -17302,7 +17302,7 @@
+@@ -17301,7 +17301,7 @@
{
'id': 530,
'name': 'BrowserSwitcherChromePath',
@@ -24961,7 +24961,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': {'type': 'string'},
'features': {
-@@ -17326,7 +17326,7 @@
+@@ -17325,7 +17325,7 @@
{
'id': 531,
'name': 'BrowserSwitcherChromeParameters',
@@ -24970,7 +24970,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -17359,7 +17359,7 @@
+@@ -17358,7 +17358,7 @@
{
'id': 496,
'name': 'BrowserSwitcherUrlList',
@@ -24979,7 +24979,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -17392,7 +17392,7 @@
+@@ -17391,7 +17391,7 @@
{
'id': 497,
'name': 'BrowserSwitcherUrlGreylist',
@@ -24988,7 +24988,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -17423,7 +17423,7 @@
+@@ -17422,7 +17422,7 @@
{
'id': 498,
'name': 'BrowserSwitcherUseIeSitelist',
@@ -24997,7 +24997,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'example_value': True,
-@@ -17440,12 +17440,12 @@
+@@ -17439,12 +17439,12 @@
When this policy is set to true, $1Google Chrome reads Internet Explorer's SiteList to obtain the site list's URL. $1Google Chrome then downloads the site list from that URL, and applies the rules as if they had been configured with the BrowserSwitcherUrlList policy.
@@ -25012,7 +25012,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'example_value': 'http://example.com/sitelist.xml',
-@@ -17462,12 +17462,12 @@
+@@ -17461,12 +17461,12 @@
When this policy is set to a valid URL, $1Google Chrome downloads the site list from that URL, and applies the rules as if they had been configured with the BrowserSwitcherUrlList policy.
@@ -25027,7 +25027,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'example_value': 'http://example.com/greylist.xml',
-@@ -17486,12 +17486,12 @@
+@@ -17485,12 +17485,12 @@
When this policy is set to a valid URL, $1Google Chrome downloads the site list from that URL, and applies the rules as if they had been configured with the BrowserSwitcherUrlGreylist policy.
@@ -25042,7 +25042,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int',
'schema': { 'type': 'integer' },
'example_value': 10000,
-@@ -17511,7 +17511,7 @@
+@@ -17510,7 +17510,7 @@
{
'id': 517,
'name': 'BrowserSwitcherEnabled',
@@ -25051,7 +25051,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'example_value': True,
-@@ -17533,7 +17533,7 @@
+@@ -17532,7 +17532,7 @@
{
'id': 519,
'name': 'BrowserSwitcherKeepLastChromeTab',
@@ -25060,7 +25060,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'example_value': False,
-@@ -17552,7 +17552,7 @@
+@@ -17551,7 +17551,7 @@
},
{
'name': 'DeviceDisplayResolution',
@@ -25069,7 +25069,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'object',
-@@ -17609,7 +17609,7 @@
+@@ -17608,7 +17608,7 @@
},
{
'name': 'PluginVmAllowed',
@@ -25078,7 +25078,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:72-'],
-@@ -17627,7 +17627,7 @@
+@@ -17626,7 +17626,7 @@
},
{
'name': 'PluginVmLicenseKey',
@@ -25087,7 +25087,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': {
'sensitiveValue': True,
-@@ -17646,7 +17646,7 @@
+@@ -17645,7 +17645,7 @@
},
{
'name': 'PluginVmImage',
@@ -25096,7 +25096,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'object',
-@@ -17871,7 +17871,7 @@
+@@ -17870,7 +17870,7 @@
},
{
'name': 'VoiceInteractionContextEnabled',
@@ -25105,7 +25105,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:74-'],
-@@ -17890,7 +17890,7 @@
+@@ -17889,7 +17889,7 @@
},
{
'name': 'VoiceInteractionHotwordEnabled',
@@ -25114,7 +25114,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:74-'],
-@@ -17911,7 +17911,7 @@
+@@ -17910,7 +17910,7 @@
},
{
'name': 'DeviceWilcoDtcAllowed',
@@ -25123,7 +25123,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:74-'],
-@@ -17931,7 +17931,7 @@
+@@ -17930,7 +17930,7 @@
},
{
'name': 'AllowPopupsDuringPageUnload',
@@ -25132,7 +25132,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:74-', 'chrome_os:74-', 'android:74-'],
-@@ -17952,11 +17952,11 @@
+@@ -17951,11 +17951,11 @@
This policy will be removed in Chrome 88.
@@ -25146,7 +25146,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'external',
'schema': {
'type': 'object',
-@@ -17989,7 +17989,7 @@
+@@ -17988,7 +17988,7 @@
},
{
'name': 'DevicePowerPeakShiftEnabled',
@@ -25155,7 +25155,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:75-'],
-@@ -18016,7 +18016,7 @@
+@@ -18015,7 +18015,7 @@
},
{
'name': 'DevicePowerPeakShiftBatteryThreshold',
@@ -25164,7 +25164,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int',
'schema': {
'type': 'integer',
-@@ -18041,7 +18041,7 @@
+@@ -18040,7 +18040,7 @@
},
{
'name': 'DevicePowerPeakShiftDayConfig',
@@ -25173,7 +25173,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'object',
-@@ -18113,7 +18113,7 @@
+@@ -18112,7 +18112,7 @@
},
{
'name': 'DeviceBootOnAcEnabled',
@@ -25182,7 +25182,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:75-'],
-@@ -18140,7 +18140,7 @@
+@@ -18139,7 +18139,7 @@
},
{
'name': 'DeviceUsbPowerShareEnabled',
@@ -25191,7 +25191,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:75-'],
-@@ -18187,7 +18187,7 @@
+@@ -18186,7 +18186,7 @@
},
{
'name': 'DeviceQuickFixBuildToken',
@@ -25200,7 +25200,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': {
'type': 'string',
-@@ -18210,7 +18210,7 @@
+@@ -18209,7 +18209,7 @@
},
{
'name': 'SamlInSessionPasswordChangeEnabled',
@@ -25209,7 +25209,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:76-'],
-@@ -18232,7 +18232,7 @@
+@@ -18231,7 +18231,7 @@
},
{
'name': 'UserFeedbackAllowed',
@@ -25218,7 +25218,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {
'type': 'boolean',
-@@ -18253,7 +18253,7 @@
+@@ -18252,7 +18252,7 @@
},
{
'name': 'SamlPasswordExpirationAdvanceWarningDays',
@@ -25227,7 +25227,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int',
'schema': {
'type': 'integer',
-@@ -18280,7 +18280,7 @@
+@@ -18279,7 +18279,7 @@
},
{
'name': 'DeviceAdvancedBatteryChargeModeEnabled',
@@ -25236,7 +25236,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:75-'],
-@@ -18307,7 +18307,7 @@
+@@ -18306,7 +18306,7 @@
},
{
'name': 'DeviceAdvancedBatteryChargeModeDayConfig',
@@ -25245,7 +25245,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'object',
-@@ -18372,7 +18372,7 @@
+@@ -18371,7 +18371,7 @@
},
{
'name': 'DeviceBatteryChargeMode',
@@ -25254,7 +25254,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -18429,7 +18429,7 @@
+@@ -18428,7 +18428,7 @@
},
{
'name': 'DeviceBatteryChargeCustomStartCharging',
@@ -25263,7 +25263,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int',
'schema': {
'type': 'integer',
-@@ -18458,7 +18458,7 @@
+@@ -18457,7 +18457,7 @@
},
{
'name': 'DeviceBatteryChargeCustomStopCharging',
@@ -25272,7 +25272,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int',
'schema': {
'type': 'integer',
-@@ -18487,7 +18487,7 @@
+@@ -18486,7 +18486,7 @@
},
{
'name': 'DeviceScheduledUpdateCheck',
@@ -25281,7 +25281,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'device_only': True,
'type': 'dict',
'schema': {
-@@ -18677,7 +18677,7 @@
+@@ -18676,7 +18676,7 @@
},
{
'name': 'CommandLineFlagSecurityWarningsEnabled',
@@ -25290,7 +25290,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:76-'],
-@@ -18697,7 +18697,7 @@
+@@ -18696,7 +18696,7 @@
},
{
'name': 'StartupBrowserWindowLaunchSuppressed',
@@ -25299,7 +25299,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:76-'],
-@@ -18785,7 +18785,7 @@
+@@ -18784,7 +18784,7 @@
},
{
'name': 'VmManagementCliAllowed',
@@ -25308,7 +25308,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:77-'],
-@@ -18872,7 +18872,7 @@
+@@ -18871,7 +18871,7 @@
'id': 583,
'name': 'SendFilesForMalwareCheck',
'type': 'int-enum',
@@ -25317,7 +25317,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'schema': {
'type': 'integer',
'enum': [0, 2, 3, 4],
-@@ -18920,7 +18920,7 @@
+@@ -18919,7 +18919,7 @@
},
{
'name': 'UnsafeEventsReportingEnabled',
@@ -25326,7 +25326,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {
'type': 'boolean',
-@@ -18942,7 +18942,7 @@
+@@ -18941,7 +18941,7 @@
},
{
'name': 'BlockLargeFileTransfer',
@@ -25335,7 +25335,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -18993,7 +18993,7 @@
+@@ -18992,7 +18992,7 @@
},
{
'name': 'DelayDeliveryUntilVerdict',
@@ -25344,7 +25344,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -19044,7 +19044,7 @@
+@@ -19043,7 +19043,7 @@
},
{
'name': 'AllowPasswordProtectedFiles',
@@ -25353,7 +25353,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -19095,7 +19095,7 @@
+@@ -19094,7 +19094,7 @@
},
{
'name': 'BlockUnsupportedFiletypes',
@@ -25362,7 +25362,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -19146,7 +19146,7 @@
+@@ -19145,7 +19145,7 @@
},
{
'name': 'CheckContentCompliance',
@@ -25371,7 +25371,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -19197,7 +19197,7 @@
+@@ -19196,7 +19196,7 @@
},
{
'name': 'URLsToCheckComplianceOfDownloadedContent',
@@ -25380,7 +25380,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -19217,12 +19217,12 @@
+@@ -19216,12 +19216,12 @@
If this policy is not set or set to an empty list of url patterns, no downloaded content is checked for sensitive data protection rule violations.
@@ -25395,7 +25395,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -19242,12 +19242,12 @@
+@@ -19241,12 +19241,12 @@
If this policy is not set or set to an empty list of url patterns, all content is checked for sensitive data protection rule violations.
@@ -25410,7 +25410,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.win:78-'],
-@@ -19261,12 +19261,12 @@
+@@ -19260,12 +19260,12 @@
'tags': ['system-security'],
'desc': '''If this policy is enabled or left unset, then Renderer Code Integrity is enabled. This should only be disabled if compatibility issues are encountered with third party software that must run inside Chrome's renderer processes.
@@ -25425,7 +25425,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -19286,13 +19286,13 @@
+@@ -19285,13 +19285,13 @@
If this policy is not set or set to an empty list of url patterns, no uploaded content is checked for malware.
@@ -25441,7 +25441,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -19312,12 +19312,12 @@
+@@ -19311,12 +19311,12 @@
If this policy is not set or set to an empty list of url patterns, all downloaded content is checked for malware.
@@ -25456,7 +25456,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -19339,7 +19339,7 @@
+@@ -19338,7 +19338,7 @@
},
{
'name': 'AllowSyncXHRInPageDismissal',
@@ -25465,7 +25465,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:78-', 'chrome_os:78-', 'android:78-'],
-@@ -19360,11 +19360,11 @@
+@@ -19359,11 +19359,11 @@
This policy will be removed in Chrome 88.
@@ -25479,7 +25479,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int',
'schema': {
'type': 'integer',
-@@ -19436,7 +19436,7 @@
+@@ -19435,7 +19435,7 @@
},
{
'name': 'CorsMitigationList',
@@ -25488,7 +25488,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -19454,19 +19454,19 @@
+@@ -19453,19 +19453,19 @@
'tags': [],
'desc': '''Enable CORS check mitigations in the new CORS implementation, allowing Extensions to keep compatible behavior, and allowing $1Google Chrome to send specified headers without CORS checks.
@@ -25511,7 +25511,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:79-', 'chrome_os:79-'],
-@@ -19487,7 +19487,7 @@
+@@ -19486,7 +19486,7 @@
This policy will be removed after a couple of milestones.
@@ -25520,7 +25520,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
Note that this policy will be removed in $1Google Chrome version 82.'''
},
-@@ -19518,7 +19518,7 @@
+@@ -19517,7 +19517,7 @@
},
{
'name': 'ExternalProtocolDialogShowAlwaysOpenCheckbox',
@@ -25529,7 +25529,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {
'type': 'boolean',
-@@ -19540,7 +19540,7 @@
+@@ -19539,7 +19539,7 @@
},
{
'name': 'DefaultInsecureContentSetting',
@@ -25538,7 +25538,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -19575,7 +19575,7 @@
+@@ -19574,7 +19574,7 @@
},
{
'name': 'InsecureContentAllowedForUrls',
@@ -25547,7 +25547,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -19594,11 +19594,11 @@
+@@ -19593,11 +19593,11 @@
If this policy is left not set blockable mixed content will be blocked and optionally blockable mixed content will be upgraded, and users will be allowed to set exceptions to allow it for specific sites.
@@ -25561,7 +25561,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -19617,11 +19617,11 @@
+@@ -19616,11 +19616,11 @@
If this policy is left not set blockable mixed content will be blocked and optionally blockable mixed content will be upgraded, but users will be allowed to set exceptions to allow it for specific sites.
@@ -25575,7 +25575,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'device_only': True,
'type': 'list',
'schema': {
-@@ -19645,11 +19645,11 @@
+@@ -19644,11 +19644,11 @@
URLs must have HTTPS scheme, e.g. "https://example.com".
@@ -25589,7 +25589,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type' : 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:80-'],
-@@ -19667,7 +19667,7 @@
+@@ -19666,7 +19666,7 @@
},
{
'name': 'PerAppTimeLimits',
@@ -25598,7 +25598,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'object',
-@@ -19794,7 +19794,7 @@
+@@ -19793,7 +19793,7 @@
},
{
'name': 'WebComponentsV0Enabled',
@@ -25607,7 +25607,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'example_value': True,
-@@ -19816,7 +19816,7 @@
+@@ -19815,7 +19815,7 @@
},
{
'name': 'UseLegacyFormControls',
@@ -25616,7 +25616,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'example_value': True,
-@@ -19838,7 +19838,7 @@
+@@ -19837,7 +19837,7 @@
},
{
'name': 'ClickToCallEnabled',
@@ -25625,7 +25625,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:79-', 'chrome_os:79-'],
-@@ -19850,7 +19850,7 @@
+@@ -19849,7 +19849,7 @@
'id': 645,
'caption': '''Enable the Click to Call Feature''',
'tags': [],
@@ -25634,7 +25634,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is set to enabled, the capability of sending phone numbers to Android devices will be enabled for the Chrome user.
-@@ -19862,7 +19862,7 @@
+@@ -19861,7 +19861,7 @@
},
{
'name': 'UserDataSnapshotRetentionLimit',
@@ -25643,7 +25643,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int',
'schema': { 'type': 'integer', 'minimum': 0 },
'supported_on': ['chrome.*:82-'],
-@@ -19947,7 +19947,7 @@
+@@ -19946,7 +19946,7 @@
},
{
'name': 'AmbientAuthenticationInPrivateModesEnabled',
@@ -25652,7 +25652,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -20022,7 +20022,7 @@
+@@ -20021,7 +20021,7 @@
},
{
'name': 'StricterMixedContentTreatmentEnabled',
@@ -25661,7 +25661,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:80-', 'chrome_os:80-'],
-@@ -20042,7 +20042,7 @@
+@@ -20041,7 +20041,7 @@
},
{
'name': 'PerAppTimeLimitsWhitelist',
@@ -25670,7 +25670,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 658,
'features': {
'dynamic_refresh': True,
-@@ -20085,8 +20085,8 @@
+@@ -20084,8 +20084,8 @@
'url_list': [
"chrome://*",
"file://*",
@@ -25681,7 +25681,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
],
'app_list': [
{
-@@ -20129,7 +20129,7 @@
+@@ -20128,7 +20128,7 @@
},
{
'name': 'ScreenCaptureAllowed',
@@ -25690,7 +25690,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:81-', 'chrome_os:81-'],
-@@ -20169,7 +20169,7 @@
+@@ -20168,7 +20168,7 @@
},
{
'name': 'SystemProxySettings',
@@ -25699,7 +25699,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'supported_on': ['chrome_os:81-'],
'future': True,
'device_only': True,
-@@ -20209,7 +20209,7 @@
+@@ -20208,7 +20208,7 @@
},
{
'name': 'DeviceLoginScreenPrivacyScreenEnabled',
@@ -25708,7 +25708,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'device_only': True,
'type': 'main',
'schema': { 'type': 'boolean' },
-@@ -20236,7 +20236,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema
+@@ -20235,7 +20235,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema
},
{
'name': 'PrivacyScreenEnabled',
@@ -25717,7 +25717,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:82-'],
-@@ -20394,7 +20394,7 @@ If set to False, $1Google Chrome will not
+@@ -20393,7 +20393,7 @@ If set to False, $1Google Chrome will not
},
{
'name': 'ScrollToTextFragmentEnabled',
@@ -25726,7 +25726,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:82-', 'chrome_os:82-', 'android:82-'],
-@@ -20502,7 +20502,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -20501,7 +20501,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
},
'doc_banner': {
'desc': '''A banner shown at the top of the policy documentation''',
@@ -25735,7 +25735,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
'doc_intro': {
'desc': '''Introduction text for the generated policy documentation''',
-@@ -20510,13 +20510,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -20509,13 +20509,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR
These policies are strictly intended to be used to configure instances of $1Google Chrome internal to your organization. Use of these policies outside of your organization (for example, in a publicly distributed program) is considered malware and will likely be labeled as malware by Google and anti-virus vendors.
@@ -25751,7 +25751,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
'doc_policy_in_atomic_group': {
'desc': '''Label notifying that a policy is part of an atomic policy group''',
-@@ -20572,11 +20572,11 @@ The recommended way to configure policy on Windows is via GPO, although provisio
+@@ -20571,11 +20571,11 @@ The recommended way to configure policy on Windows is via GPO, although provisio
},
'doc_complex_policies_on_windows': {
'desc': '''Text pointing the user to a help article for complex policies on Windows''',
@@ -25765,7 +25765,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
'doc_legacy_single_line_label': {
'desc': '''A label for the legacy single-line textbox for a policy also has a more user-friendly multi-line textbox. See http://crbug/829328''',
-@@ -20596,7 +20596,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
+@@ -20595,7 +20595,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
},
'doc_schema_description_link': {
'desc': '''Text pointing the user to the expanded documentation page for this policy, containing the information about schema and formatting.''',
@@ -25774,7 +25774,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
'deprecated_policy_group_caption': {
'desc': '''Localized name for the deprecated policies folder, for Microsoft's Group Policy Editor.''',
-@@ -20608,7 +20608,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
+@@ -20607,7 +20607,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
},
'deprecated_policy_desc': {
'desc': '''Description shared by all deprecated policies, in Microsoft Windows' Group Policy Editor.''',
@@ -27936,7 +27936,7 @@ diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
-@@ -8077,8 +8077,8 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage(
+@@ -8084,8 +8084,8 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage(
"cross-site requests if they are set with `SameSite=None` and "
"`Secure`. You can review cookies in developer tools under "
"Application>Storage>Cookies and see more details at "
@@ -27947,7 +27947,7 @@ diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/brow
} else if (status.HasWarningReason(
net::CanonicalCookie::CookieInclusionStatus::WarningReason::
WARN_SAMESITE_NONE_INSECURE)) {
-@@ -8099,7 +8099,7 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage(
+@@ -8106,7 +8106,7 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage(
"`SameSite=None` if they are also marked `Secure`. You "
"can review cookies in developer tools under "
"Application>Storage>Cookies and see more details at "
@@ -27956,7 +27956,7 @@ diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/brow
} else if (status.HasWarningReason(
net::CanonicalCookie::CookieInclusionStatus::WarningReason::
WARN_SAMESITE_UNSPECIFIED_LAX_ALLOW_UNSAFE)) {
-@@ -8116,7 +8116,7 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage(
+@@ -8123,7 +8123,7 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage(
"if they were set with `SameSite=Lax` and will only allow them to be "
"sent with top-level cross-site requests if the HTTP method is safe. "
"See more details at "