From 05093a3c1a6ab764e62b94b5f437c59548058fce Mon Sep 17 00:00:00 2001 From: brave-builds Date: Fri, 23 Jun 2023 17:14:32 +0000 Subject: [PATCH] Uplift of #18987 (squashed) to release --- .../brave_navigator_languages_farbling_browsertest.cc | 5 +++++ browser/net/brave_reduce_language_network_delegate_helper.cc | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/browser/farbling/brave_navigator_languages_farbling_browsertest.cc b/browser/farbling/brave_navigator_languages_farbling_browsertest.cc index 5bf9dd5bda1e..1f4712e4c853 100644 --- a/browser/farbling/brave_navigator_languages_farbling_browsertest.cc +++ b/browser/farbling/brave_navigator_languages_farbling_browsertest.cc @@ -258,6 +258,7 @@ IN_PROC_BROWSER_TEST_F(BraveNavigatorLanguagesFarblingBrowserTest, std::string domain_d = "d.test"; std::string domain_x = "www.ulta.com"; std::string domain_y = "aeroplan.rewardops.com"; + std::string domain_z = "login.live.com"; GURL url_b = https_server_.GetURL( domain_b, "/reduce-language/page-with-subresources.html"); GURL url_d = https_server_.GetURL( @@ -266,6 +267,8 @@ IN_PROC_BROWSER_TEST_F(BraveNavigatorLanguagesFarblingBrowserTest, domain_x, "/reduce-language/page-with-subresources.html"); GURL url_y = https_server_.GetURL( domain_y, "/reduce-language/page-with-subresources.html"); + GURL url_z = https_server_.GetURL( + domain_z, "/reduce-language/page-with-subresources.html"); SetAcceptLanguages("la,es,en"); // Farbling level: off @@ -328,4 +331,6 @@ IN_PROC_BROWSER_TEST_F(BraveNavigatorLanguagesFarblingBrowserTest, ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url_x)); BlockFingerprinting(domain_y); ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url_y)); + BlockFingerprinting(domain_z); + ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url_z)); } diff --git a/browser/net/brave_reduce_language_network_delegate_helper.cc b/browser/net/brave_reduce_language_network_delegate_helper.cc index f09dc9c1f1df..5a6b6a30ef1b 100644 --- a/browser/net/brave_reduce_language_network_delegate_helper.cc +++ b/browser/net/brave_reduce_language_network_delegate_helper.cc @@ -36,7 +36,9 @@ static constexpr auto kFarbleAcceptLanguageExceptions = {// https://github.com/brave/brave-browser/issues/25309 "ulta.com", "www.ulta.com", // https://github.com/brave/brave-browser/issues/26325 - "aeroplan.rewardops.com"}); + "aeroplan.rewardops.com", + // https://github.com/brave/brave-browser/issues/31196 + "login.live.com"}); } // namespace std::string FarbleAcceptLanguageHeader(