From 83340486a9c91defcc6822a3f986ec05cdd60d6b Mon Sep 17 00:00:00 2001 From: Brian Clifton Date: Tue, 26 Mar 2019 22:07:04 -0700 Subject: [PATCH] Manual 3 way applying of patches; trying this after `npm run init` failure on CI --- patches/chrome-VERSION.patch | 2 +- patches/net-cookies-canonical_cookie.cc.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 342f68865c33..e83b9dd2a1ff 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,5 +1,5 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 3d9a560e26e43fb2da1332dff339c1039cfb1a3e..7b2d1041533f1aacdeefb8524a4c433f390091b0 100644 +index 3d9a560e26e43fb2da1332dff339c1039cfb1a3e..4050aa4ee4122124f154ceeff1e3ac8326576b22 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ diff --git a/patches/net-cookies-canonical_cookie.cc.patch b/patches/net-cookies-canonical_cookie.cc.patch index eea2427fd410..419a65a2fc8f 100644 --- a/patches/net-cookies-canonical_cookie.cc.patch +++ b/patches/net-cookies-canonical_cookie.cc.patch @@ -4,7 +4,7 @@ index 91611ac4171c19a031044ae6b1459acce246d427..c0636088e332f61c9ee8e6ed07f210fa +++ b/net/cookies/canonical_cookie.cc @@ -228,9 +228,10 @@ std::unique_ptr CanonicalCookie::Create( server_time = options.server_time(); - + DCHECK(!creation_time.is_null()); - Time cookie_expires = CanonicalCookie::CanonExpiration(parsed_cookie, - creation_time, @@ -13,6 +13,6 @@ index 91611ac4171c19a031044ae6b1459acce246d427..c0636088e332f61c9ee8e6ed07f210fa + creation_time, + server_time, + !options.exclude_httponly()); - + CookiePrefix prefix = GetCookiePrefix(parsed_cookie.Name()); bool is_cookie_valid = IsCookiePrefixValid(prefix, url, parsed_cookie);