Merge branch '3718-master-upstream' into 'master'

From de95a1ee3de2406ef205e22958c0a84d5a7d13c2 Mon Sep 17 00:00:00 2001

From 3a7fc69b11de0d8d390c7eadac64b59332874cc1 Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Fri, 30 Mar 2018 10:09:03 +0200

Subject: Multiple fingerprinting mitigations

 String BaseRenderingContext2D::lang() const {

diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn

index ad5d60eae0f2e..395ade1d8c34f 100644

index f854f8a38c9f3..b3e6577dc6f6b 100644

--- a/third_party/blink/renderer/platform/BUILD.gn

+++ b/third_party/blink/renderer/platform/BUILD.gn

@@ -1756,7 +1756,9 @@ component("platform") {

   allow_circular_includes_from = [

     "//third_party/blink/renderer/platform/blob",

@@ -1839,6 +1841,7 @@ component("platform") {

@@ -1840,6 +1842,7 @@ component("platform") {

     "//third_party/blink/public/strings",

     "//third_party/blink/renderer/platform/wtf",

     "//third_party/ced",

From 4a4ed8196ad340f2a82cf067a9259ba0ffe575a0 Mon Sep 17 00:00:00 2001

From 3b75a87c77adec9fc58489c081731697d17482d8 Mon Sep 17 00:00:00 2001

From: mars <gzhqyz@gmail.com>

Date: Sun, 2 Aug 2020 00:37:49 +0800

Subject: Update i18n zh_CN support

 6 files changed, 133 insertions(+), 6 deletions(-)

diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb

index 11dd17e3cf5ec..42a6e9aceb03a 100644

index d892d223b7e93..e3eec85ff1fac 100644

--- a/chrome/app/resources/generated_resources_zh-CN.xtb

+++ b/chrome/app/resources/generated_resources_zh-CN.xtb

@@ -11942,4 +11942,6 @@

@@ -11943,4 +11943,6 @@

 <translation id="99731366405731005">您需要开启 <ph name="LINK1_BEGIN" />Chrome 同步<ph name="LINK1_END" />才能使用 Wi-Fi 同步功能。<ph name="LINK2_BEGIN" />了解详情<ph name="LINK2_END" /></translation>

 <translation id="998347228911661591">同步标签页分组</translation>

 <translation id="998747458861718449">检查(&amp;N)</translation>

+<translation id="9090881409075599658">关于 Bromite</translation>

+</translationbundle>

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb

index 108374ef1bfc7..7b74b5e1f983c 100644

index c4f237691c7c4..d675585c143be 100644

--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb

+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb

@@ -1842,4 +1842,74 @@

+<translation id="5494920125229734069">全选</translation>

+</translationbundle>

diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb

index cdfdc651c531d..5bafaa36b3e0b 100644

index f200cf8c010b5..c39bcf45ce6bf 100644

--- a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb

+++ b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb

@@ -720,4 +720,28 @@

+<translation id="8431607486333903291">WebRTC</translation>

+</translationbundle>

diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb

index cf5074dca3a98..fc1ef0ed0d436 100644

index 81c24dd344eec..76817f7afd8ae 100644

--- a/components/strings/components_strings_zh-CN.xtb

+++ b/components/strings/components_strings_zh-CN.xtb

@@ -4993,4 +4993,33 @@

From cab4e7b387f8d66f40972da34e9ff3611d469e07 Mon Sep 17 00:00:00 2001

From 52fa05bc35b73297656272248f3a0760921a3372 Mon Sep 17 00:00:00 2001

From: Daniel Micay <danielmicay@gmail.com>

Date: Thu, 27 May 2021 07:30:02 -0400

Subject: add trichrome browser apk targets

   # As compared to chrome_public_test_apk, this target contains only unit tests

   # that require on device capabilities. These tests are smaller, more tightly

diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni

index 432f8b64f6e3a..fe6280754f722 100644

index 909756bb4b565..fbf251248b0de 100644

--- a/chrome/android/chrome_public_apk_tmpl.gni

+++ b/chrome/android/chrome_public_apk_tmpl.gni

@@ -497,6 +497,8 @@ template("chrome_common_apk_or_module_tmpl") {

chrome/browser/font_prewarmer_tab_helper_browsertest.cc

chrome/browser/glic/e2e_test/glic_e2e_test.cc

chrome/browser/glic/fre/glic_fre_controller.cc

chrome/browser/glic/fre/glic_fre_controller_interactive_uitest.cc

chrome/browser/glic/fre/glic_fre_controller_unittest.cc

chrome/browser/glic/fre/glic_fre_page_handler.cc

chrome/browser/glic/glic_metrics_unittest.cc

chrome/browser/glic/host/glic_cookie_synchronizer_unittest.cc

chrome/browser/glic/host/glic_page_handler.cc

chrome/browser/glic/host/glic_ui.cc

chrome/browser/glic/host/glic_ui_interactive_uitest.cc

chrome/browser/glic/host/guest_util_unittest.cc

chrome/browser/glic/media/glic_media_integration.cc

chrome/browser/glic/media/glic_media_integration_unittest.cc

chrome/browser/resources/gaia_auth_host/authenticator.js

chrome/browser/resources/gaia_auth_host/saml_handler.js

chrome/browser/resources/gaia_auth_host/saml_password_attributes.js

chrome/browser/resources/glic/fre/fre_app_controller.ts

chrome/browser/resources/glic/url_pattern.d.ts

chrome/browser/resources/glic/webview.ts

chrome/browser/resources/hangout_services/manifest_v2.json

chromium_version="141.0.7390.43"

chromium_version="141.0.7390.70"

cromite_branch="v141.0.7390.55-b2824377c30847f42e00c6ace66d91fa516b5f51"

ungoogled_chromium_branch="141.0.7390.54-1"

ungoogled_chromium_branch="141.0.7390.65-1"