From cb2449ddba2cf12f1aa5ddbf8f772cbdd3715037 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Tue, 2 Sep 2025 18:52:33 -0400 Subject: [PATCH] Update patches from Chromium 140.0.7339.41 to Chromium 140.0.7339.80. --- ...der_view_context_menu_browsertest.cc.patch | 59 ++++++++++--------- ...r-resources-downloads-downloads.html.patch | 2 +- ...ser-resources-settings-settings.html.patch | 2 +- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu_browsertest.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu_browsertest.cc.patch index 14d1961f980..9c055e78356 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu_browsertest.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu_browsertest.cc.patch @@ -105,8 +105,27 @@ 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& 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 @@ -119,7 +138,11 @@ 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 { @@ -146,41 +169,19 @@ 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& 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 diff --git a/patches/chrome-browser-resources-downloads-downloads.html.patch b/patches/chrome-browser-resources-downloads-downloads.html.patch index a9bccdab70d..cdda3d4c2de 100644 --- a/patches/chrome-browser-resources-downloads-downloads.html.patch +++ b/patches/chrome-browser-resources-downloads-downloads.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/downloads/downloads.html b/chrome/browser/resources/downloads/downloads.html -index 35e377d76a4a47bb990832edf8dd1b3dd2c48301..2654b4ff65a59629a7f93001df08a659026ce730 100644 +index 35e377d76a4a47bb990832edf8dd1b3dd2c48301..2fc1da51ca8315c98967b28fa981517e2288ad15 100644 --- a/chrome/browser/resources/downloads/downloads.html +++ b/chrome/browser/resources/downloads/downloads.html @@ -6,6 +6,7 @@ diff --git a/patches/chrome-browser-resources-settings-settings.html.patch b/patches/chrome-browser-resources-settings-settings.html.patch index 172d06eb87d..fe574757b20 100644 --- a/patches/chrome-browser-resources-settings-settings.html.patch +++ b/patches/chrome-browser-resources-settings-settings.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings.html b/chrome/browser/resources/settings/settings.html -index 6af2c41d1842fca98a5b64f6ebddf17a595b15a0..4c0a2331b13254e311bf23a43d29555c4ecd1219 100644 +index 6af2c41d1842fca98a5b64f6ebddf17a595b15a0..5701f8ec5a72d1eb49d38a5aff66874521034562 100644 --- a/chrome/browser/resources/settings/settings.html +++ b/chrome/browser/resources/settings/settings.html @@ -5,6 +5,7 @@