Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update from Chromium 140.0.7339.80 to Chromium 140.0.7339.133. (#31122)

Browse Source 
<!-- Add brave-browser issue below that this PR will resolve -->
Resolves https://github.com/brave/brave-browser/issues/49123

<!-- CI-related labels that can be applied to this PR:
* CI/run-audit-deps (1) - check for known npm/cargo vulnerabilities
(audit_deps)
* CI/run-network-audit (1) - run network-audit
* CI/run-upstream-tests - run Chromium unit and browser tests on Linux
and Windows (otherwise only on Linux)
* CI/run-linux-arm64, CI/run-macos-x64, CI/run-windows-arm64,
CI/run-windows-x86 - run builds that would otherwise be skipped
* CI/skip - do not run CI builds (except noplatform)
* CI/skip-linux-x64, CI/skip-android, CI/skip-macos-arm64, CI/skip-ios,
CI/skip-windows-x64 - skip CI builds for specific platforms
* CI/skip-upstream-tests - do not run Chromium unit, or browser tests
(otherwise only on Linux)
* CI/skip-all-linters - do not run presubmit and lint checks
* CI/storybook-url (1) - deploy storybook and provide a unique URL for
each build

(1) applied automatically when some files are changed (see:
https://github.com/brave/brave-core/blob/master/.github/labeler.yml)
-->

<!--
## Checklist:

- Review design docs
[Browser design
principles](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/docs/chrome_browser_design_principles.md)
[Style
guide](https://chromium.googlesource.com/chromium/src/+/main/styleguide/c++/c++.md)
[Core principles](https://www.chromium.org/developers/core-principles/)
- Ensure there are
(tests)[https://www.chromium.org/developers/testing/]. Unit test as much
as possible (including edge cases), but also include browser tests
covering high level functionality.
- Ensure that there are comments explaining what classes/methods are/do.
The "why" is often more important than the "what" in comments. Also
update any relevant docs (moving docs from wiki to brave-core if
necessary).
- Request security or other review (third-party libraries, rust code,
etc...) if applicable [security/privacy review is
needed](https://github.com/brave/brave-browser/wiki/Security-reviews)
[other review](https://github.com/brave/reviews/issues/new/choose)
Also see [adding third-party
libraries](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/docs/adding_to_third_party.md)
for general guidelines on using third party code
- Maks sure there is a
[ticket](https://github.com/brave/brave-browser/issues) for your issue
- Use Github [auto-closing
keywords](https://docs.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue)
in the PR description above
- Write a good [PR/commit
description](https://google.github.io/eng-practices/review/developer/cl-descriptions.html)
- Squash any review feedback or "fixup" commits before merge, so that
history is a record of what happened in the repo, not your PR
- Add appropriate labels (`QA/Yes` or `QA/No`; `release-notes/include`
or `release-notes/exclude`; `OS/...`) to the associated issue
- Checked the PR locally:
* `npm run test -- brave_browser_tests`, `npm run test --
brave_unit_tests`
[wiki](https://github.com/brave/brave-browser/wiki/Tests)
* `npm run presubmit`
[wiki](https://github.com/brave/brave-browser/wiki/Presubmit-checks),
`npm run gn_check`, `npm run tslint`
- Run `git rebase master` (if needed)
-->
This commit is contained in:
Kamil Jozwiak
2025-09-10 01:14:01 -04:00
committed by GitHub
parent a2834e8947 95c7a0fb41
commit 859712f35c
15 changed files with 55 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browser/brave_prefs_browsertest.cc
+2 -1
View File
@@ -26,6 +26,7 @@
#include "chrome/test/base/platform_browser_test.h"
#include "components/embedder_support/pref_names.h"
#include "components/gcm_driver/gcm_buildflags.h"
#include "components/omnibox/browser/aim_eligibility_service.h"
#include "components/omnibox/browser/omnibox_prefs.h"
#include "components/policy/core/common/policy_pref_names.h"
#include "components/prefs/pref_service.h"
@@ -166,7 +167,7 @@ IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest, MediaRouterPrefTest) {
IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest, AIModePrefTest) {
EXPECT_EQ(-1, chrome_test_utils::GetProfile(this)->GetPrefs()->GetInteger(
::omnibox::kAIModeSettings));
EXPECT_FALSE(omnibox::IsAimAllowedByPolicy(
EXPECT_FALSE(AimEligibilityService::IsAimAllowedByPolicy(
chrome_test_utils::GetProfile(this)->GetPrefs()));
}
chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc
+2 -2
View File
@@ -504,9 +504,9 @@ bool ParseCertificatesFile(std::string_view certs_input,
Pinsets* pinsets,
base::Time* timestamp) {
constexpr std::string_view brave_certs = R"brave_certs(
# Last updated: Tue Sep 02 18:48:31 2025
# Last updated: Tue Sep 09 18:24:19 2025
PinsListTimestamp
1756853311
1757456659
# =====BEGIN BRAVE ROOTS ASC=====
#From https://www.amazontrust.com/repository/
package.json
+1 -1
View File
@@ -74,7 +74,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "140.0.7339.80",
"tag": "140.0.7339.133",
"repository": {
"url": "https://github.com/brave/chromium"
}
patches/build-config-locales.gni.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/build/config/locales.gni b/build/config/locales.gni
index 37632eb876b207e6aa303796e9c4ffe788a612ae..5e08f4227d960feb1cbd86a9ad924458e92576ba 100644
index 4d503e15232b2355ddcb364c7c6c02227a066841..ad5d6a7bf78242823cf17dedbd335f3357d55464 100644
--- a/build/config/locales.gni
+++ b/build/config/locales.gni
@@ -174,6 +174,7 @@ extended_locales = [
patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index a8fa2d068505293f3823dc9b08734e2d1e07cdf7..6f6f8b5b3fbb1003834086686b5ed3d3f1b0de30 100644
index 941d733587a1ac18c4d491b1957099c726aec785..dc2c02fcc57e59bd5c346866aa96b8f54011cdd7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -845,6 +845,7 @@ public class ChromeTabbedActivity extends ChromeActivity {
patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
index c5f6bf0cb79bb0ce671e0365617320b646566ef0..06df5d55db728da95e5ae6c86e007e069b263fc1 100644
index 8ec26732777ec9d929887c9efc3fd537e6003083..1e6fb090a6daf6585de45384a10191b2e743522f 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -2335,6 +2335,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
@@ -2339,6 +2339,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
if (!selection_navigation_url_.is_valid()) {
return;
}
@@ -10,7 +10,7 @@ index c5f6bf0cb79bb0ce671e0365617320b646566ef0..06df5d55db728da95e5ae6c86e007e06
std::u16string printable_selection_text = PrintableSelectionText();
EscapeAmpersands(&printable_selection_text);
@@ -4872,29 +4873,32 @@ void RenderViewContextMenu::OpenLinkInSplitView() {
@@ -4876,29 +4877,32 @@ void RenderViewContextMenu::OpenLinkInSplitView() {
if (tab != source_tab) {
// Navigate the tab that wasn't the source of the context menu to the
// URL
patches/chrome-browser-renderer_context_menu-render_view_context_menu_browsertest.cc.patch
+29 -30
View File
@@ -105,27 +105,8 @@ index 7ff496c5312fda7c76147d436f267504401bece4..ccb97686ec27821228c2a23ef28cd0df
- kCrossOriginChildFrameSource, {link.spec()}, nullptr));
- return base::ReplaceStringPlaceholders(kMainFrameSource, {encoded_payload},
- nullptr);
+ std::string encoded_payload =
+ base::Base64Encode(base::ReplaceStringPlaceholders(
+ kCrossOriginChildFrameSource, {link.spec()}, nullptr));
+ return base::ReplaceStringPlaceholders(kMainFrameSource, {encoded_payload},
+ nullptr);
+ }
+};
+
+INSTANTIATE_TEST_SUITE_P(All,
+ SubframeContextMenuBrowserTest,
+ testing::Bool(),
+ [](const testing::TestParamInfo<bool>& info) {
+ return info.param ? "LinkPreviewEnabled"
+ : "LinkPreviewDisabled";
+ });
+
+IN_PROC_BROWSER_TEST_P(SubframeContextMenuBrowserTest,
+ SubframeNewTabInitiator) {
+ RunSubframeInitiatorTestForCommand(IDC_CONTENT_CONTEXT_OPENLINKNEWTAB);
}
-}
-
-IN_PROC_BROWSER_TEST_P(ContextMenuBrowserTest, SubframeNewTabInitiator) {
- // If a frame on example.com opens a subframe with a different opaque origin,
- // the subframe origin should be passed through to a context menu on that
@@ -138,11 +119,7 @@ index 7ff496c5312fda7c76147d436f267504401bece4..ccb97686ec27821228c2a23ef28cd0df
- using HttpRequest = net::test_server::HttpRequest;
- using HttpResponse = net::test_server::HttpResponse;
- HttpRequest::HeaderMap logged_headers;
+IN_PROC_BROWSER_TEST_P(SubframeContextMenuBrowserTest,
+ SubframeNewSplitInitiator) {
+ RunSubframeInitiatorTestForCommand(IDC_CONTENT_CONTEXT_OPENLINKSPLITVIEW);
+}
-
- base::RunLoop danger_request_wait_loop;
- embedded_test_server()->RegisterRequestHandler(base::BindLambdaForTesting(
- [&](const HttpRequest& req) -> std::unique_ptr<HttpResponse> {
@@ -169,19 +146,41 @@ index 7ff496c5312fda7c76147d436f267504401bece4..ccb97686ec27821228c2a23ef28cd0df
- browser()->tab_strip_model()->GetActiveWebContents();
- GURL url(embedded_test_server()->GetURL("/main"));
- ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
-
+ std::string encoded_payload =
+ base::Base64Encode(base::ReplaceStringPlaceholders(
+ kCrossOriginChildFrameSource, {link.spec()}, nullptr));
+ return base::ReplaceStringPlaceholders(kMainFrameSource, {encoded_payload},
+ nullptr);
+ }
+};
- content::RenderFrameHost* main_frame = ConvertToRenderFrameHost(web_contents);
- content::RenderFrameHost* child_frame = ChildFrameAt(main_frame, 0);
-
+INSTANTIATE_TEST_SUITE_P(All,
+ SubframeContextMenuBrowserTest,
+ testing::Bool(),
+ [](const testing::TestParamInfo<bool>& info) {
+ return info.param ? "LinkPreviewEnabled"
+ : "LinkPreviewDisabled";
+ });
- EXPECT_FALSE(main_frame->GetLastCommittedOrigin().IsSameOriginWith(
- child_frame->GetLastCommittedOrigin()));
-
+IN_PROC_BROWSER_TEST_P(SubframeContextMenuBrowserTest,
+ SubframeNewTabInitiator) {
+ RunSubframeInitiatorTestForCommand(IDC_CONTENT_CONTEXT_OPENLINKNEWTAB);
+}
- ContextMenuWaiter menu_observer(IDC_CONTENT_CONTEXT_OPENLINKNEWTAB);
- content::SimulateMouseClickAt(web_contents, 0,
- blink::WebMouseEvent::Button::kRight,
- gfx::Point(15, 15));
- menu_observer.WaitForMenuOpenAndClose();
-
+IN_PROC_BROWSER_TEST_P(SubframeContextMenuBrowserTest,
+ SubframeNewSplitInitiator) {
+ RunSubframeInitiatorTestForCommand(IDC_CONTENT_CONTEXT_OPENLINKSPLITVIEW);
+}
- // Wait for the request to "/danger" to be issued by the context menu click
- // and handled by the EmbeddedTestServer, which logs the request headers as a
- // side effect. Since that request is issued by a click on a link in a
patches/chrome-test-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 6d3d642367280e4bc0d3a9e5ee68dca5a5c92f16..e51974ab0cc6993bcf9e5344e68c82861308ebc3 100644
index 572de58b1cb6b643cdcc73509685eb4f615bd39e..0753d22369209f05059c1c1bcc8a36a14dacf5b1 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -689,6 +689,7 @@ static_library("test_support") {
patches/components-omnibox-browser-autocomplete_controller.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
index 303d99eecd7c82266577135c6744291349098fa5..5282c5a9541653aff08f4863cd4dd66113957d75 100644
index 91cc462a37b5c6c32279d8f5aab1e3cdc7621370..8621f3364705ff16f4ba59be84705a1ca0609c23 100644
--- a/components/omnibox/browser/autocomplete_controller.cc
+++ b/components/omnibox/browser/autocomplete_controller.cc
@@ -1260,6 +1260,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) {
@@ -1262,6 +1262,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) {
if (provider_types & AutocompleteProvider::TYPE_SEARCH) {
search_provider_ = new SearchProvider(provider_client_.get(), this);
providers_.push_back(search_provider_.get());
@@ -10,7 +10,7 @@ index 303d99eecd7c82266577135c6744291349098fa5..5282c5a9541653aff08f4863cd4dd661
}
// Providers run in the order they're added. Add `HistoryURLProvider` after
// `SearchProvider` because:
@@ -1507,6 +1508,7 @@ void AutocompleteController::UpdateResult(UpdateType update_type,
@@ -1509,6 +1510,7 @@ void AutocompleteController::UpdateResult(UpdateType update_type,
StartStopTimer();
}
patches/components-omnibox-browser-featured_search_provider.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/omnibox/browser/featured_search_provider.cc b/components/omnibox/browser/featured_search_provider.cc
index 0e8fbc5f7e031c213c59a47a3c340ace6d7dd3d9..66fc35f0cfb4d92ebb64ee47e68ffc6dd3811bc5 100644
index 3f93bf5689e8b51f6e842373e530b81fa7a905ed..e0ab6d9dfd5c44a7ec5e71168b8ad0a2126f75ef 100644
--- a/components/omnibox/browser/featured_search_provider.cc
+++ b/components/omnibox/browser/featured_search_provider.cc
@@ -290,6 +290,7 @@ void FeaturedSearchProvider::AddFeaturedKeywordMatches(
patches/ios-chrome-browser-flags-about_flags.mm.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/about_flags.mm
index 6930f3002d38bb111934556dcec18e89510a5d74..3d0e49da959e9cd4fe12256390f2edb0965ee591 100644
index e54df18127ba3fcf463b83f54c973d7678215d5b..4634809eb2d4c44b6f0b46b3f434fb24cdfb6621 100644
--- a/ios/chrome/browser/flags/about_flags.mm
+++ b/ios/chrome/browser/flags/about_flags.mm
@@ -1453,6 +1453,7 @@ const FeatureEntry::FeatureVariation kOmniboxAimShortcutTypedStateVariations[] =
patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
index 7d88b0ae8b22a4b329c1e9e9c7e89ad7a49e0ee3..4fb1468cff9b0538d0fc938a5fe9fe4013010f09 100644
index e9fa11a2671a4aacc72e6f2fa0bfddf65bc56028..4918f492253bb4a53f7531f03cccf291b5306835 100644
--- a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
+++ b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
@@ -681,6 +681,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
@@ -687,6 +687,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
prefs::kNTPHomeCustomizationNewBadgeImpressionCount, 0);
registry->RegisterBooleanPref(prefs::kWidgetsForMultiProfile, false);
@@ -10,7 +10,7 @@ index 7d88b0ae8b22a4b329c1e9e9c7e89ad7a49e0ee3..4fb1468cff9b0538d0fc938a5fe9fe40
}
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -1124,6 +1125,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -1128,6 +1129,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
// Deprecated 08/2025.
registry->RegisterDictionaryPref(kInvalidationClientIDCache);
registry->RegisterDictionaryPref(kInvalidationTopicsToHandler);
patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index f4784c62cca71fe5f6334d53336db530d6f313b0..580854d4dc086d1b1f51242968bc67d2eee589bd 100644
index 485025e439a90fef0c333c75477011670f4cd6ae..e9db788f76d37a8222287a1142dfc61f1af48557 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -713,6 +713,11 @@
patches/tools-metrics-histograms-metadata-page-histograms.xml.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/tools/metrics/histograms/metadata/page/histograms.xml b/tools/metrics/histograms/metadata/page/histograms.xml
index 46db8d032700e4b85393fdaa713bd6ce10d926f2..07e6c0bc1af084255a8db68dd6a4ba9af7ba4537 100644
index 249e7e596e9c20c6233f6842ae68505dfaca0ba2..4ead1c1e95ddffd4ae116f2d15fb8b0f9ed0e326 100644
--- a/tools/metrics/histograms/metadata/page/histograms.xml
+++ b/tools/metrics/histograms/metadata/page/histograms.xml
@@ -270,6 +270,17 @@ chromium-metrics-reviews@google.com.
@@ -282,6 +282,17 @@ chromium-metrics-reviews@google.com.
<variant name=".TabSearch"/>
<variant name=".UserEducation"/>
<variant name=".UserNotesSidePanel"/>
test/filters/browser_tests.filter
+4
View File
@@ -1756,6 +1756,7 @@
-All/LensOverlayControllerBrowserPDFTest.ContextMenuOpensOverlay/*
-All/LensOverlayControllerBrowserPDFUpdatedContentFieldsTest.PartialPdfIncludedInRequest/*
-All/LensOverlayControllerEntrypointsBrowserTest.OverlayHidesEntrypoints/PageActionsMigration*
-LensComposeboxControllerBrowserTest.*
-LensOverlayControllerApcOnlyTest.*
-LensOverlayControllerBrowserTest.*
-LensOverlayControllerBrowserFullscreenDisabled.*
@@ -2380,6 +2381,9 @@
-All/PermissionElementOriginTrialBrowserTest.WithOriginTrialToken/BaseDefault_BlinkEnabled
-All/PermissionElementOriginTrialBrowserTest.WithoutOriginTrialToken/BaseDefault_BlinkEnabled
# These tests fail because we disable kAimEnabled.
-ChromeAimEligibilityServiceBrowserTest.ComprehensiveEligibilityTest*
# Tests below this point have not been diagnosed or had issues created yet.
-_/WebrtcLoggingPrivateApiStartEventLoggingTestPolicyEnabled.*
-AdsPageLoadMetricsObserverBrowserTest.*