From a679a6763b80caf6bf9abce73851930ac8e49470 Mon Sep 17 00:00:00 2001 From: uazo <29201891+uazo@users.noreply.github.com> Date: Wed, 15 Oct 2025 03:12:53 +0000 Subject: [PATCH] [AUTO][FILECONTROL] - version 141.0.7390.111 --- tools/under-control/src/RELEASE | 2 +- .../src/chrome/browser/prefs/browser_prefs.cc | 10 ++++++++++ .../renderer/chrome_content_renderer_client.cc | 8 +++++--- .../platform/runtime_enabled_features.json5 | 13 ++----------- .../global-interface-listing-expected.txt | 1 - 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/tools/under-control/src/RELEASE b/tools/under-control/src/RELEASE index 8e93cd91..393c2f28 100644 --- a/tools/under-control/src/RELEASE +++ b/tools/under-control/src/RELEASE @@ -1 +1 @@ -141.0.7390.55 +141.0.7390.111 diff --git a/tools/under-control/src/chrome/browser/prefs/browser_prefs.cc b/tools/under-control/src/chrome/browser/prefs/browser_prefs.cc index 581384fc..1bb09be7 100755 --- a/tools/under-control/src/chrome/browser/prefs/browser_prefs.cc +++ b/tools/under-control/src/chrome/browser/prefs/browser_prefs.cc @@ -1143,6 +1143,10 @@ constexpr char kDesksLacrosProfileIdList[] = "ash.desks.desks_lacros_profile_id_list"; #endif // BUILDFLAG(IS_CHROMEOS) +// Deprecated 09/2025. +constexpr char kLensOverlayEduActionChipShownCount[] = + "lens.edu_action_chip.shown_count"; + // Register local state used only for migration (clearing or moving to a new // key). void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) { @@ -1648,6 +1652,9 @@ void RegisterProfilePrefsForMigration( // Deprecated 08/2025. registry->RegisterListPref(kDesksLacrosProfileIdList); #endif // BUILDFLAG(IS_CHROMEOS) + + // Deprecated 09/2025. + registry->RegisterIntegerPref(kLensOverlayEduActionChipShownCount, 0); } } // namespace @@ -2993,6 +3000,9 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs, profile_prefs->ClearPref(kDesksLacrosProfileIdList); #endif // BUILDFLAG(IS_CHROMEOS) + // Added 09/2025. + profile_prefs->ClearPref(kLensOverlayEduActionChipShownCount); + // Please don't delete the following line. It is used by PRESUBMIT.py. // END_MIGRATE_OBSOLETE_PROFILE_PREFS diff --git a/tools/under-control/src/chrome/renderer/chrome_content_renderer_client.cc b/tools/under-control/src/chrome/renderer/chrome_content_renderer_client.cc index a69564cd..a2e75788 100755 --- a/tools/under-control/src/chrome/renderer/chrome_content_renderer_client.cc +++ b/tools/under-control/src/chrome/renderer/chrome_content_renderer_client.cc @@ -1630,9 +1630,11 @@ void ChromeContentRendererClient::AppendContentSecurityPolicy( DCHECK(csp); GURL gurl(url); - const extensions::Extension* extension = - extensions::RendererExtensionRegistry::Get()->GetExtensionOrAppByURL( - gurl); + // Use a scoped_refptr to keep the extension alive, since this code can be + // executed on a worker thread. See https://crbug.com/443038597. + scoped_refptr extension = + extensions::RendererExtensionRegistry::Get() + ->GetRefCountedExtensionOrAppByURL(gurl); if (!extension) return; diff --git a/tools/under-control/src/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/tools/under-control/src/third_party/blink/renderer/platform/runtime_enabled_features.json5 index 25e2cf6b..0091f253 100755 --- a/tools/under-control/src/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/tools/under-control/src/third_party/blink/renderer/platform/runtime_enabled_features.json5 @@ -1088,16 +1088,6 @@ name: "ConsiderSubOrSuperScriptAncestorAlignForCaretSelection", status: "stable" }, - { - // See https://crbug.com/426067493 for details. - name: "ConsiderUpstreamPositionForFindingNextLine", - status: "stable", - }, - { - // See https://crbug.com/40679713 for details. - name: "ConsiderUpstreamPositionForFindingPreviousLine", - status: "stable", - }, { name: "ContactsManager", status: {"Android": "stable", "default": "test"}, @@ -5822,7 +5812,8 @@ }, { name: "WidthAndHeightAsPresentationAttributesOnNestedSvg", - status: "stable", + // Disabled due to web compat issues, see https://crbug.com/449170647. + status: "experimental", }, { name: "WidthAndHeightStylePropertiesOnUseAndSymbol", diff --git a/tools/under-control/src/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt b/tools/under-control/src/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt index b8e7e106..30624e8c 100755 --- a/tools/under-control/src/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt +++ b/tools/under-control/src/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt @@ -7519,7 +7519,6 @@ interface Request getter referrer getter referrerPolicy getter signal - getter targetAddressSpace getter url method arrayBuffer method blob