Merge pull request #4320 from brave/bsc-79.0.3945.117-1.2.x

Upgrade patches from Chromium 79.0.3945.88 to Chromium 79.0.3945.117 (uplift to 1.2)
brave · Jan 8, 2020 · 3aefbdf · 3aefbdf
2 parents e63c753 + 7572f6f
commit 3aefbdf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/patches/android_webview-browser-cookie_manager.cc.patch b/patches/android_webview-browser-cookie_manager.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/android_webview/browser/cookie_manager.cc b/android_webview/browser/cookie_manager.cc
-index c2030c1693cd1cd457709dff43e03cd2dc5c29bf..c412c8a0946f32e6e66e486212c2e1d4b5fff0aa 100644
+index 0ad2b9f6eddbbd3fc7bd50fbfbb14fe917d68864..89a803426db728b93bde3f59933364ae04de8ae6 100644
 --- a/android_webview/browser/cookie_manager.cc
 +++ b/android_webview/browser/cookie_manager.cc
-@@ -426,7 +426,7 @@ void CookieManager::SetCookieHelper(const GURL& host,
+@@ -435,7 +435,7 @@ void CookieManager::SetCookieHelper(const GURL& host,
 
    net::CanonicalCookie::CookieInclusionStatus status;
    std::unique_ptr<net::CanonicalCookie> cc(

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 2c275bcc2bdbd1f5800bba649064b9fc95859af3..37fe68b6b987b375ec31b51ecc71ba9faf0e3277 100644
+index 801f6a7b54285681a96a3a8590945d302697c6ca..a1b21ec827e1762b458de783a998b949e5337d3d 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=79
 -MINOR=0
 -BUILD=3945
--PATCH=88
+-PATCH=117
 +MINOR=1
 +BUILD=2
 +PATCH=41
diff --git 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 5348e244d9eadaeba5cca5bd7a2ea0359864cb28..5cbe0da0892e9629cd76cad6aadec1b7dcdb9ed9 100644
+index 28f9a5eab90529bd9268f681b26eef2612cf5902..0a02dfe039024a2bcf2d174c531bc001174f1cc4 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
 @@ -747,6 +747,7 @@ if (!is_android) {