From 78a53be4adc1887a5aea75e468eb6f95694bd7a5 Mon Sep 17 00:00:00 2001
From: Brian Clifton <brian@clifton.me>
Date: Tue, 3 Mar 2020 17:22:48 -0700
Subject: [PATCH] Merge pull request #4817 from brave/80.0.3987.132

Upgrade from Chromium 80.0.3987.122 to Chromium 80.0.3987.132.
---
 patches/chrome-VERSION.patch                          | 4 ++--
 patches/chrome-android-java-AndroidManifest.xml.patch | 2 +-
 patches/chrome-browser-about_flags.cc.patch           | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
index 48fbf812688f..8ff599553a0a 100644
--- a/patches/chrome-VERSION.patch
+++ b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index bba001eb234d24e47a73760216557149df222fa4..f9da606a58a17232a9a43ba39221410d7102d4b1 100644
+index 02faec526acf56c05150c1a87b90e3b57ddefd87..02bf274a7772ce1b303a9ea9f5540931fa44ba51 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=80
 -MINOR=0
 -BUILD=3987
--PATCH=122
+-PATCH=132
 +MINOR=1
 +BUILD=4
 +PATCH=95
diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch
index 5929965127cf..4bdfa096d101 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 4a4ef4f6a6245b36b39f1f901bf13c6d8a8c42f8..4011af4a1c7232075ec94fe28716cf5e76b0d9d0 100644
+index 4a4ef4f6a6245b36b39f1f901bf13c6d8a8c42f8..ddff3cddb53176ed3785389c2f341154dc90784a 100644
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
 @@ -979,7 +979,7 @@ by a child template that "extends" this file.
diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch
index a778dd5546a3..49c17f5c5469 100644
--- 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 68b7b19de59a0114e070187944074366a216f232..6384ad689eb1753cbd3f5490f7355e12bd4cd5d3 100644
+index 1087b7020dd88d2dca81d14f47fc541c472366f5..41eb3d67d65c9a68e3e772dee029dfc611407dab 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
 @@ -284,14 +284,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
@@ -21,7 +21,7 @@ index 68b7b19de59a0114e070187944074366a216f232..6384ad689eb1753cbd3f5490f7355e12
  
  const FeatureEntry::Choice kPassiveListenersChoices[] = {
      {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-@@ -4833,6 +4833,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4838,6 +4838,7 @@ const FeatureEntry kFeatureEntries[] = {
      // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
      // Histograms" in tools/metrics/histograms/README.md (run the
      // AboutFlagsHistogramTest unit test to verify this process).