From 53339974fad6bcd13f28d5cc79c498aa41863f12 Mon Sep 17 00:00:00 2001
From: Brian Clifton <brian@clifton.me>
Date: Mon, 24 Feb 2020 14:47:34 -0800
Subject: [PATCH] Merge pull request #4723 from brave/80.0.3987.122

Upgrade from Chromium 80.0.3987.116 to Chromium 80.0.3987.122.
---
 patches/chrome-VERSION.patch                              | 4 ++--
 ...owser-signin-account_consistency_mode_manager.cc.patch | 4 ++--
 patches/chrome-installer-mac-signing-pipeline.py.patch    | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
index cd81477b0759..f9eea789e3f6 100644
--- a/patches/chrome-VERSION.patch
+++ b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index a66ebf764b9ba917377d5b32e201b60d249cceae..793a3433c167cfea0e6c09f7c8d0b14c5f738fbf 100644
+index bba001eb234d24e47a73760216557149df222fa4..f9da606a58a17232a9a43ba39221410d7102d4b1 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=80
 -MINOR=0
 -BUILD=3987
--PATCH=116
+-PATCH=122
 +MINOR=1
 +BUILD=6
 +PATCH=49
diff --git a/patches/chrome-browser-signin-account_consistency_mode_manager.cc.patch b/patches/chrome-browser-signin-account_consistency_mode_manager.cc.patch
index f6c3fc04a1be..6297e1bc74a7 100644
--- a/patches/chrome-browser-signin-account_consistency_mode_manager.cc.patch
+++ b/patches/chrome-browser-signin-account_consistency_mode_manager.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc
-index 75bd8332ec588ccd048c9394e310323c051c75ed..46b5251c95555803dac72eead10e258e0b3d3468 100644
+index e1e53d483a34658df926be3f11d6dcb30a0d2bbb..b865d1075af36e7f4ec7ba8a3b38ef22e80b825d 100644
 --- a/chrome/browser/signin/account_consistency_mode_manager.cc
 +++ b/chrome/browser/signin/account_consistency_mode_manager.cc
-@@ -174,7 +174,9 @@ bool AccountConsistencyModeManager::ShouldBuildServiceForProfile(
+@@ -188,7 +188,9 @@ bool AccountConsistencyModeManager::ShouldBuildServiceForProfile(
  
  AccountConsistencyMethod
  AccountConsistencyModeManager::GetAccountConsistencyMethod() {
diff --git a/patches/chrome-installer-mac-signing-pipeline.py.patch b/patches/chrome-installer-mac-signing-pipeline.py.patch
index cb32affead74..6988d996a2dd 100644
--- 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 48e6eb85fc25e8de7c8fa2f6cc0e00d0428dcad2..7524313d08c50eaafe660e7ed8dfa13c1b5161cf 100644
+index be7ff657a7ed8371a2706736b20d95044456b335..6106c292c1854c4e961ec848daf34e293ca0ac47 100644
 --- a/chrome/installer/mac/signing/pipeline.py
 +++ b/chrome/installer/mac/signing/pipeline.py
-@@ -350,12 +350,6 @@ def _package_dmg(paths, dist, config):
+@@ -351,12 +351,6 @@ def _package_dmg(paths, dist, config):
          '--volname', config.app_product,
          '--icon', os.path.join(packaging_dir, icon_file),
          '--copy', '{}:/'.format(app_path),
@@ -15,7 +15,7 @@ index 48e6eb85fc25e8de7c8fa2f6cc0e00d0428dcad2..7524313d08c50eaafe660e7ed8dfa13c
          '--copy', '{}/{}:/.DS_Store'.format(packaging_dir, dsstore_file),
          '--symlink', '/Applications:/ ',
      ])
-@@ -379,7 +373,6 @@ def _package_installer_tools(paths, config):
+@@ -380,7 +374,6 @@ def _package_installer_tools(paths, config):
          'dirdiffer.sh',
          'dirpatcher.sh',
          'dmgdiffer.sh',
@@ -23,7 +23,7 @@ index 48e6eb85fc25e8de7c8fa2f6cc0e00d0428dcad2..7524313d08c50eaafe660e7ed8dfa13c
          'pkg-dmg',
      )
  
-@@ -526,5 +519,8 @@ def sign_all(orig_paths,
+@@ -527,5 +520,8 @@ def sign_all(orig_paths,
                          uuids_to_package_path.keys(), config):
                      package_path = uuids_to_package_path[result]
                      notarize.staple(package_path)