From 3d2903275e9a8e7db1d5dbac304931e56db0ae9e Mon Sep 17 00:00:00 2001 From: Brian Clifton Date: Tue, 16 Feb 2021 23:34:05 -0700 Subject: [PATCH] Merge pull request #7976 from brave/88.0.4324.182_1.21.x_77 Upgrade from Chromium 88.0.4324.152 to Chromium 88.0.4324.182 --- components/autofill_assistant_strings.grdp | 3 ++ patches/chrome-BUILD.gn.patch | 24 +++++++------- patches/chrome-VERSION.patch | 4 +-- ...rome-android-chrome_java_sources.gni.patch | 4 +-- ...ome-android-java-AndroidManifest.xml.patch | 6 ++-- ...ions-NotificationPlatformBridge.java.patch | 2 +- ...cations-NotificationServiceImpl.java.patch | 4 +-- patches/chrome-browser-BUILD.gn.patch | 2 +- ...flags-android-chrome_feature_list.cc.patch | 4 +-- ...me-browser-ui-tabs-tab_strip_model.h.patch | 2 +- patches/chrome-installer-linux-BUILD.gn.patch | 32 ++++++++++--------- patches/chrome-test-BUILD.gn.patch | 2 +- patches/google_apis-google_api_keys.cc.patch | 2 +- ...rams_xml-histogram_suffixes_list.xml.patch | 4 +-- 14 files changed, 50 insertions(+), 45 deletions(-) diff --git a/components/autofill_assistant_strings.grdp b/components/autofill_assistant_strings.grdp index 5831ade6423a..fb19253a497f 100644 --- a/components/autofill_assistant_strings.grdp +++ b/components/autofill_assistant_strings.grdp @@ -26,5 +26,8 @@ Brave Assistant in Brave stopping + + Send feedback + diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index d951e3143d74..ae2ac22b13de 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index f721f1aff4781fa5936010dfb5b0c97587e81c05..d0ca7e97fc2c50897d1b04a11090dbb3821c5763 100644 +index 8c9d11a99d6a36781346948edb3b887e3955675a..42366c59a9c595f9614b3ee01e0aeb750864b141 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -150,6 +150,10 @@ if (!is_android && !is_mac) { +@@ -151,6 +151,10 @@ if (!is_android && !is_mac) { "common/crash_keys.cc", "common/crash_keys.h", ] @@ -13,7 +13,7 @@ index f721f1aff4781fa5936010dfb5b0c97587e81c05..d0ca7e97fc2c50897d1b04a11090dbb3 deps += [ ":chrome_dll", -@@ -418,11 +422,12 @@ if (is_win) { +@@ -419,11 +423,12 @@ if (is_win) { args += [ "--keystone=0" ] } } @@ -27,7 +27,7 @@ index f721f1aff4781fa5936010dfb5b0c97587e81c05..d0ca7e97fc2c50897d1b04a11090dbb3 extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -440,6 +445,7 @@ if (is_win) { +@@ -441,6 +446,7 @@ if (is_win) { "//chrome/common:buildflags", "//chrome/common:version_header", ] @@ -35,7 +35,7 @@ index f721f1aff4781fa5936010dfb5b0c97587e81c05..d0ca7e97fc2c50897d1b04a11090dbb3 if (enable_stripping) { # At link time, preserve the global symbols specified in the .exports -@@ -508,7 +514,7 @@ if (is_win) { +@@ -509,7 +515,7 @@ if (is_win) { args = [ "-b", @@ -44,7 +44,7 @@ index f721f1aff4781fa5936010dfb5b0c97587e81c05..d0ca7e97fc2c50897d1b04a11090dbb3 "-v", rebase_path(chrome_version_file, root_build_dir), "-g", -@@ -577,6 +583,7 @@ if (is_win) { +@@ -578,6 +584,7 @@ if (is_win) { # this dependency directly copies the file into the framework's # resources directory. public_deps += [ ":chrome_framework_widevine_signature" ] @@ -52,7 +52,7 @@ index f721f1aff4781fa5936010dfb5b0c97587e81c05..d0ca7e97fc2c50897d1b04a11090dbb3 } } -@@ -609,9 +616,11 @@ if (is_win) { +@@ -610,9 +617,11 @@ if (is_win) { "--scm=0", ] } @@ -64,7 +64,7 @@ index f721f1aff4781fa5936010dfb5b0c97587e81c05..d0ca7e97fc2c50897d1b04a11090dbb3 if (is_chrome_branded) { # These entitlements are bound to the official Google Chrome signing # certificate and will not necessarily work in any other build. -@@ -632,7 +641,7 @@ if (is_win) { +@@ -633,7 +642,7 @@ if (is_win) { output_name = chrome_helper_name + invoker.helper_name_suffix @@ -73,7 +73,7 @@ index f721f1aff4781fa5936010dfb5b0c97587e81c05..d0ca7e97fc2c50897d1b04a11090dbb3 extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -1033,6 +1042,10 @@ if (is_win) { +@@ -1034,6 +1043,10 @@ if (is_win) { if (is_chrome_branded) { deps += [ ":default_apps" ] } @@ -84,7 +84,7 @@ index f721f1aff4781fa5936010dfb5b0c97587e81c05..d0ca7e97fc2c50897d1b04a11090dbb3 ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$chrome_framework_name.framework/Versions/$chrome_version_full/$chrome_framework_name" ] -@@ -1190,6 +1203,7 @@ if (is_win) { +@@ -1191,6 +1204,7 @@ if (is_win) { group("browser_dependencies") { public_deps = [ @@ -92,7 +92,7 @@ index f721f1aff4781fa5936010dfb5b0c97587e81c05..d0ca7e97fc2c50897d1b04a11090dbb3 "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/app:shutdown_signal_handlers", -@@ -1290,12 +1304,13 @@ group("child_dependencies") { +@@ -1291,12 +1305,13 @@ group("child_dependencies") { # this is OK because all of content is linked into one library. "//content/browser", ] @@ -107,7 +107,7 @@ index f721f1aff4781fa5936010dfb5b0c97587e81c05..d0ca7e97fc2c50897d1b04a11090dbb3 output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1349,6 +1364,7 @@ group("resources") { +@@ -1350,6 +1365,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 7ec5977b3ad1..f42233402e91 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index f668d9a8e653edf0eb115165a4388fcf6eb88942..9693e39c550e1bfba9a50d36e5abb1fe99230cd3 100644 +index 2fa16103fedf2a1d7ec0b7c981e02bd671784311..f274d8d0b6b7024e4b2803d8671676a674ff58db 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=88 -MINOR=0 -BUILD=4324 --PATCH=152 +-PATCH=182 +MINOR=1 +BUILD=20 +PATCH=104 diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index fa22f7f83ead..da2d7851a7d9 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index 9a17ae7e538ca73ecb8c397a9a912725e7a2ce72..8be6929def3812c03261d02445a7e2772c78e369 100644 +index 85282f8818d446352e70a4122d983f4212e2d8eb..3bf35238b8424f961d0fd818eddb8c3c37d7c6aa 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1695,3 +1695,4 @@ chrome_java_sources = [ +@@ -1696,3 +1696,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorActivity.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", ] diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index 1cadc90f1a5a..b8f4a2605d58 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index c90fe55521d7bcd1ae214a71ad4556b1ad839075..bfaef9baff168f8558f10ef60c9107c369c9e889 100644 +index a50e9e3876ab5e75809ba6c577b1fd8fccf053f9..7339329c0fde2921595828b4caba184c6d88875c 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -38,7 +38,9 @@ by a child template that "extends" this file. @@ -54,7 +54,7 @@ index c90fe55521d7bcd1ae214a71ad4556b1ad839075..bfaef9baff168f8558f10ef60c9107c3 android:icon="@drawable/ic_launcher" android:roundIcon="@drawable/ic_launcher_round" android:label="{% block application_label %}@string/app_name{% endblock %}" -@@ -1176,6 +1187,7 @@ by a child template that "extends" this file. +@@ -1166,6 +1177,7 @@ by a child template that "extends" this file. {% endif %} @@ -62,7 +62,7 @@ index c90fe55521d7bcd1ae214a71ad4556b1ad839075..bfaef9baff168f8558f10ef60c9107c3 {% block extra_application_definitions %} {% endblock %} {% endmacro %} -@@ -1258,6 +1270,7 @@ by a child template that "extends" this file. +@@ -1248,6 +1260,7 @@ by a child template that "extends" this file. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch index a41c0a52c7e2..542255fb5939 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java -index ede170ca236090a9b8a54f7ba3204a1e901662a0..e8241afbd5a709cbd037225a232b882110db9e97 100644 +index eb810ab150ae815d926d34c84e02d852ec3f8118..1881ce3502cd9849503c26bb2126ec02a8e8e2e9 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java @@ -81,7 +81,7 @@ public class NotificationPlatformBridge { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationServiceImpl.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationServiceImpl.java.patch index 9d00201fa8d0..2bc41c020968 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationServiceImpl.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationServiceImpl.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationServiceImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationServiceImpl.java -index ecbbe843ea298e784d9dc06b8bcbee7c0e0f0b63..6453659ca927d0abe6e00770a4728e74f2c38556 100644 +index 58f28a1e8f3c30bae90144b14d4614c1fd5f2364..4570f9a020202ab951a300f8d1a812c08b182a33 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationServiceImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationServiceImpl.java -@@ -105,7 +105,7 @@ public class NotificationServiceImpl extends NotificationService.Impl { +@@ -110,7 +110,7 @@ public class NotificationServiceImpl extends NotificationService.Impl { // Now that the browser process is initialized, we pass forward the call to the // NotificationPlatformBridge which will take care of delivering the appropriate events. diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 22769469915c..54cda0b0a07a 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 2ae270b5a60f5ec40fd54a29505c2a262a12d3e6..b4e90d31e045b849a196bd662700b2c22231c3ea 100644 +index 2ce41b55b4052bf79ffffa270bf3e7830edec9e8..b5c4f565b05541c780dc6c97d4ed55a6d987808c 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -2432,6 +2432,7 @@ static_library("browser") { diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch index 767e3b65cf32..c72a50686517 100644 --- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch +++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc -index 8265ccff901627704ca60f79d443bf7983f05095..5d41e852f642e229ff3a381247fa083e380c31cf 100644 +index 05b47e4a088a9cd1f4de615b519cd6c622747d61..61ed783ea0e840dafc8472fea43e533c2cf10faf 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -295,6 +295,7 @@ const base::Feature* kFeaturesExposedToJava[] = { +@@ -298,6 +298,7 @@ const base::Feature* kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { diff --git a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch index b4204f70879d..c1ff1be4d713 100644 --- a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch +++ b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h -index 6a03d63486a63d08dc6790b1179326a111f1c1cd..98b13e4ab537df7685f96520d7b9de855f3b610a 100644 +index 6228f7459956fd0fa1693cd2f9143560039778fd..02d9dea05d4bbb8ee0241427840676b8c01ae1ae 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h @@ -579,6 +579,7 @@ class TabStripModel : public TabGroupController { diff --git a/patches/chrome-installer-linux-BUILD.gn.patch b/patches/chrome-installer-linux-BUILD.gn.patch index fd0d7a426db2..2dc4479acda0 100644 --- a/patches/chrome-installer-linux-BUILD.gn.patch +++ b/patches/chrome-installer-linux-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn -index 4fceedf2791bcf979eba86b0cff0a1980ff0cacf..1f2bf8b55eb19cee6ba8cbe7883eef8a41cc480c 100644 +index aa9e8fc3b23d6c55c86b90422dfaf44290d8f365..a9d5339464a04448d76d563526797c1063bfe572 100644 --- a/chrome/installer/linux/BUILD.gn +++ b/chrome/installer/linux/BUILD.gn -@@ -72,6 +72,8 @@ if (enable_swiftshader) { +@@ -73,6 +73,8 @@ if (enable_swiftshader) { ] } @@ -11,20 +11,22 @@ index 4fceedf2791bcf979eba86b0cff0a1980ff0cacf..1f2bf8b55eb19cee6ba8cbe7883eef8a packaging_files_binaries = packaging_files_executables + packaging_files_shlibs copy("swiftshader_libs") { -@@ -167,10 +169,11 @@ action("merge_rpm_dependencies") { +@@ -168,10 +170,11 @@ action("merge_rpm_dependencies") { } - action("strip_chrome_binary") { -- prog_name = "$root_out_dir/chrome" -+ prog_name = "$root_out_dir/brave" - debug_file = prog_name + ".debug" - stripped_file = prog_name + ".stripped" + strip_binary("strip_chrome_binary") { +- binary_input = "$root_out_dir/chrome" +- symbol_output = "$root_out_dir/chrome.debug" +- stripped_binary_output = "$root_out_dir/chrome.stripped" ++ binary_input = "$root_out_dir/brave" ++ symbol_output = "$root_out_dir/brave.debug" ++ stripped_binary_output = "$root_out_dir/brave.stripped" deps = [ "//chrome" ] + deps += strip_chrome_binary_deps - script = "//build/gn_run_binary.py" - sources = [ - "//buildtools/third_party/eu-strip/bin/eu-strip", -@@ -237,6 +240,7 @@ copy("common_packaging_files") { + } + + # This target builds all "normal" Linux installers. You must set +@@ -220,6 +223,7 @@ copy("common_packaging_files") { } sources += [ "//buildtools/third_party/eu-strip/bin/eu-strip" ] @@ -32,7 +34,7 @@ index 4fceedf2791bcf979eba86b0cff0a1980ff0cacf..1f2bf8b55eb19cee6ba8cbe7883eef8a outputs = [ "$root_out_dir/installer/common/{{source_file_part}}" ] } -@@ -333,6 +337,7 @@ group("installer_deps") { +@@ -316,6 +320,7 @@ group("installer_deps") { "//sandbox/linux:chrome_sandbox", "//third_party/crashpad/crashpad/handler:crashpad_handler", ] @@ -40,7 +42,7 @@ index 4fceedf2791bcf979eba86b0cff0a1980ff0cacf..1f2bf8b55eb19cee6ba8cbe7883eef8a if (enable_nacl) { public_deps += [ "//components/nacl/loader:nacl_helper", -@@ -367,6 +372,9 @@ group("installer_deps") { +@@ -350,6 +355,9 @@ group("installer_deps") { template("linux_package") { assert(defined(invoker.channel)) channel = invoker.channel @@ -50,7 +52,7 @@ index 4fceedf2791bcf979eba86b0cff0a1980ff0cacf..1f2bf8b55eb19cee6ba8cbe7883eef8a if (is_chrome_branded) { package = "google-chrome" -@@ -530,3 +538,6 @@ linux_package("beta") { +@@ -513,3 +521,6 @@ linux_package("beta") { linux_package("unstable") { channel = "unstable" } diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 5163feeebf5b..91a184e56f53 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 0096bead803507ffb0856548bae26431daf24d9d..d064fdfc39745dbb8aa2ac6e45d9f38778b4884c 100644 +index 4579f62b5796a5d6ce1ffa50cf3082c13f906fe0..f294bc5d26685ebbead1217bf07ad1ee4c392002 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -868,6 +868,7 @@ if (!is_android) { diff --git a/patches/google_apis-google_api_keys.cc.patch b/patches/google_apis-google_api_keys.cc.patch index cbdc0df306ca..fdea0b1ac2f0 100644 --- a/patches/google_apis-google_api_keys.cc.patch +++ b/patches/google_apis-google_api_keys.cc.patch @@ -1,5 +1,5 @@ diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc -index 41ee2db055d3126ed798b127288bfc05d90caf4a..d221f4e160bad9b75565affa4915eb6e45dd0a3d 100644 +index 74c9782ca347f9c256cf0e4236d4a7c0ebb698f2..2f0ffee4d7d31c7b118b6dd38e753c52f0294578 100644 --- a/google_apis/google_api_keys.cc +++ b/google_apis/google_api_keys.cc @@ -220,6 +220,7 @@ class APIKeyCache { diff --git a/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch index 2680b48b9e33..1188e918f097 100644 --- a/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch +++ b/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch @@ -1,8 +1,8 @@ diff --git a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -index fbe52bd9e55a57720275ac1eb6c1baffad3211ca..ea2e0a20577a914612f06f48c4523de25b623f0e 100644 +index 9836a6c6ad6937580cee23573a36c3ce73c59ee2..35bb5ba0c56b6821bf400bab4182e2247da8af38 100644 --- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -@@ -13748,6 +13748,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. +@@ -13758,6 +13758,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.