Merge pull request #2094 from brave/test_nightly

Fixing nightly
brave · Mar 27, 2019 · 25f9807 · 25f9807
2 parents f6cfa13 + 8334048
commit 25f9807
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -4,7 +4,7 @@ index 91611ac4171c19a031044ae6b1459acce246d427..c0636088e332f61c9ee8e6ed07f210fa
 +++ b/net/cookies/canonical_cookie.cc
 @@ -228,9 +228,10 @@ std::unique_ptr<CanonicalCookie> 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);