Merge pull request #9764 from brave/92.0.4515.159_master_115

Upgrade patches from Chromium 92.0.4515.131 to Chromium 92.0.4515.159
brave · Aug 17, 2021 · e022f92 · e022f92
2 parents 8ea45e8 + dc46ea6
commit e022f92
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 21 deletions.
diff --git a/patches/.vpython3.patch b/patches/.vpython3.patch
diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index a2c048a55144eb055c5fff12dda98a9d493809e8..621e0e1e679e6f8bd6b1410e4a0c963a033b2a41 100644
+index 0abfdef51aabc3bb1865d9bab7eec94dcfcf88dd..949699578d3cdd332edd475bed298ce51c19aaa2 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=92
 -MINOR=0
 -BUILD=4515
--PATCH=131
+-PATCH=159
 +MINOR=1
 +BUILD=30
 +PATCH=26
diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index cb59b01762087108c2e14e7380d109fa418e9b25..18f7c99e12974952739270ccb564402790f90daa 100644
+index e047cf3275ccf0990c4a66d92f36edb20326a5f6..3bcc7eaab826fd36a8da43974ea9b2513d11470f 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
 @@ -309,14 +309,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {

diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
-index 8dce7c99c4876f81179ff50b72ff4cd7d4071560..2f8c50247e191856d84ab10b31074c7f9fa2e869 100644
+index 9c57a64442999adcb2b36ec55855232c0f1e0d94..78001fe842bdb8eaf9c66b00249a36e0b67a039e 100644
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
 @@ -326,6 +326,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

diff --git a/patches/chrome-installer-mac-BUILD.gn.patch b/patches/chrome-installer-mac-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/mac/BUILD.gn b/chrome/installer/mac/BUILD.gn
-index 9bdc5998805853db894a381d722e19c8474d86c8..c92ac7bbc6aa256b54b47ac11926c3a088b7c4f5 100644
+index a2d2713e1961ecfa321b7d6b34d4f32dc619e3c7..d3170a9a4d8bf79e41e7fc466f516f0852a7c6ea 100644
 --- a/chrome/installer/mac/BUILD.gn
 +++ b/chrome/installer/mac/BUILD.gn
 @@ -18,7 +18,8 @@ group("mac") {

diff --git a/patches/chrome-installer-mac-signing-pipeline.py.patch b/patches/chrome-installer-mac-signing-pipeline.py.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/mac/signing/pipeline.py b/chrome/installer/mac/signing/pipeline.py
-index 1aa7a576329e6785d21505f94a943f2f636deec8..252915059abf94572ad8526fecff08f09ba5416e 100644
+index b1adeb9793ca0159db08da49c42f83328eb3f621..4134188ee74a64a4de60345f030dacde2d515f1b 100644
 --- a/chrome/installer/mac/signing/pipeline.py
 +++ b/chrome/installer/mac/signing/pipeline.py
-@@ -665,5 +665,8 @@ def sign_all(orig_paths,
+@@ -664,5 +664,8 @@ def sign_all(orig_paths,
                          uuids_to_package_path.keys(), config):
                      package_path = uuids_to_package_path[result]
                      notarize.staple(package_path)

diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc
-index 800f537d9e4480a15d73e854709f0d503c3a3c6a..87f41225c5cd8de80546ff0a1922a767eb166021 100644
+index f8d4e6c52972db1dee3adf2e123516deeb0735a3..ceaeb207df0351e884233f5fc57763760ae07e3c 100644
 --- a/components/permissions/permission_uma_util.cc
 +++ b/components/permissions/permission_uma_util.cc
 @@ -107,6 +107,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) {