From fed65654db55330650ded4b685711cc77efc46a7 Mon Sep 17 00:00:00 2001 From: Brian Clifton Date: Wed, 11 Sep 2019 15:04:12 -0700 Subject: [PATCH] Merge pull request #3400 from brave/77.0.3865.75 Update patches from Chromium 77.0.3865.65 to Chromium 77.0.3865.75 --- patches/chrome-VERSION.patch | 4 +-- patches/chrome-test-BUILD.gn.patch | 2 +- ...network-restricted_cookie_manager.cc.patch | 32 +++++++++---------- ...ls-metrics-histograms-histograms.xml.patch | 4 +-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index c9e2426a4ed..6f45a2fa812 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,11 +1,11 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 1bf2ef06b4e294e85eaaa401ced8a8372864b02d..8df7b02ee477d8ad4e9c1bffad95ece4fee1556e 100644 +index 2dfda257f731482cbfffa0e2344a2fc04bf729dc..5cfa75ab96b9fda8362e7347b051f356ea5f1a2c 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=77 MINOR=0 -BUILD=3865 --PATCH=65 +-PATCH=75 +BUILD=70 +PATCH=97 diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 6a719efa6f1..759c35ccaec 100644 --- 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 39a8fc308408903773abeb3d0ca48952512ab720..153754ed2ed27731f75a8457cf8ed7211f1d8faf 100644 +index 954efb536692c127edb61ec2966309fb571c2747..e1482a0a0847d9fe273f3e97b16c802c420dcefe 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -709,6 +709,7 @@ if (!is_android) { diff --git a/patches/services-network-restricted_cookie_manager.cc.patch b/patches/services-network-restricted_cookie_manager.cc.patch index 456ad5f1936..8f4c541506c 100644 --- a/patches/services-network-restricted_cookie_manager.cc.patch +++ b/patches/services-network-restricted_cookie_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc -index 0cf25a1761c1c1cd877a320eb9fd0192c4577822..f1825513f128876d504c05ba392b9def29c53549 100644 +index e50e0498f301035382f5545ad15838724dddfa5d..4b89ceb30651b47cb2e36624182e4ba10e175a8b 100644 --- a/services/network/restricted_cookie_manager.cc +++ b/services/network/restricted_cookie_manager.cc -@@ -78,11 +78,13 @@ class RestrictedCookieManager::Listener : public base::LinkNode { +@@ -79,11 +79,13 @@ class RestrictedCookieManager::Listener : public base::LinkNode { const RestrictedCookieManager* restricted_cookie_manager, const GURL& url, const GURL& site_for_cookies, @@ -16,7 +16,7 @@ index 0cf25a1761c1c1cd877a320eb9fd0192c4577822..f1825513f128876d504c05ba392b9def options_(options), mojo_listener_(std::move(mojo_listener)) { // TODO(pwnall): add a constructor w/options to net::CookieChangeDispatcher. -@@ -119,7 +121,7 @@ class RestrictedCookieManager::Listener : public base::LinkNode { +@@ -120,7 +122,7 @@ class RestrictedCookieManager::Listener : public base::LinkNode { // being deleted at a later time, which can happen due to eviction or due to // the user explicitly deleting all cookies. if (!restricted_cookie_manager_->cookie_settings()->IsCookieAccessAllowed( @@ -25,7 +25,7 @@ index 0cf25a1761c1c1cd877a320eb9fd0192c4577822..f1825513f128876d504c05ba392b9def return; mojo_listener_->OnCookieChange(cookie, ToCookieChangeCause(cause)); -@@ -135,9 +137,13 @@ class RestrictedCookieManager::Listener : public base::LinkNode { +@@ -136,9 +138,13 @@ class RestrictedCookieManager::Listener : public base::LinkNode { // The URL whose cookies this listener is interested in. const GURL url_; @@ -40,7 +40,7 @@ index 0cf25a1761c1c1cd877a320eb9fd0192c4577822..f1825513f128876d504c05ba392b9def // CanonicalCookie::IncludeForRequestURL options for this listener's interest. const net::CookieOptions options_; -@@ -183,6 +189,7 @@ RestrictedCookieManager::~RestrictedCookieManager() { +@@ -184,6 +190,7 @@ RestrictedCookieManager::~RestrictedCookieManager() { void RestrictedCookieManager::GetAllForUrl( const GURL& url, const GURL& site_for_cookies, @@ -48,7 +48,7 @@ index 0cf25a1761c1c1cd877a320eb9fd0192c4577822..f1825513f128876d504c05ba392b9def mojom::CookieManagerGetOptionsPtr options, GetAllForUrlCallback callback) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -204,12 +211,14 @@ void RestrictedCookieManager::GetAllForUrl( +@@ -205,12 +212,14 @@ void RestrictedCookieManager::GetAllForUrl( url, net_options, base::BindOnce(&RestrictedCookieManager::CookieListToGetAllForUrlCallback, weak_ptr_factory_.GetWeakPtr(), url, site_for_cookies, @@ -64,7 +64,7 @@ index 0cf25a1761c1c1cd877a320eb9fd0192c4577822..f1825513f128876d504c05ba392b9def const net::CookieOptions& net_options, mojom::CookieManagerGetOptionsPtr options, GetAllForUrlCallback callback, -@@ -217,8 +226,8 @@ void RestrictedCookieManager::CookieListToGetAllForUrlCallback( +@@ -218,8 +227,8 @@ void RestrictedCookieManager::CookieListToGetAllForUrlCallback( const net::CookieStatusList& excluded_cookies) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -75,7 +75,7 @@ index 0cf25a1761c1c1cd877a320eb9fd0192c4577822..f1825513f128876d504c05ba392b9def std::vector result; std::vector result_with_status; -@@ -294,6 +303,7 @@ void RestrictedCookieManager::SetCanonicalCookie( +@@ -295,6 +304,7 @@ void RestrictedCookieManager::SetCanonicalCookie( const net::CanonicalCookie& cookie, const GURL& url, const GURL& site_for_cookies, @@ -83,7 +83,7 @@ index 0cf25a1761c1c1cd877a320eb9fd0192c4577822..f1825513f128876d504c05ba392b9def SetCanonicalCookieCallback callback) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); if (!ValidateAccessToCookiesAt(url)) { -@@ -302,8 +312,8 @@ void RestrictedCookieManager::SetCanonicalCookie( +@@ -303,8 +313,8 @@ void RestrictedCookieManager::SetCanonicalCookie( } // TODO(morlovich): Try to validate site_for_cookies as well. @@ -94,7 +94,7 @@ index 0cf25a1761c1c1cd877a320eb9fd0192c4577822..f1825513f128876d504c05ba392b9def if (blocked) { if (network_context_client_) { -@@ -376,6 +386,7 @@ void RestrictedCookieManager::SetCanonicalCookieResult( +@@ -377,6 +387,7 @@ void RestrictedCookieManager::SetCanonicalCookieResult( void RestrictedCookieManager::AddChangeListener( const GURL& url, const GURL& site_for_cookies, @@ -102,7 +102,7 @@ index 0cf25a1761c1c1cd877a320eb9fd0192c4577822..f1825513f128876d504c05ba392b9def mojom::CookieChangeListenerPtr mojo_listener, AddChangeListenerCallback callback) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -386,9 +397,9 @@ void RestrictedCookieManager::AddChangeListener( +@@ -387,9 +398,9 @@ void RestrictedCookieManager::AddChangeListener( net::CookieOptions net_options = MakeOptionsForGet(role_, url, site_for_cookies); @@ -115,7 +115,7 @@ index 0cf25a1761c1c1cd877a320eb9fd0192c4577822..f1825513f128876d504c05ba392b9def listener->mojo_listener().set_connection_error_handler( base::BindOnce(&RestrictedCookieManager::RemoveChangeListener, -@@ -406,6 +417,7 @@ void RestrictedCookieManager::AddChangeListener( +@@ -407,6 +418,7 @@ void RestrictedCookieManager::AddChangeListener( void RestrictedCookieManager::SetCookieFromString( const GURL& url, const GURL& site_for_cookies, @@ -123,7 +123,7 @@ index 0cf25a1761c1c1cd877a320eb9fd0192c4577822..f1825513f128876d504c05ba392b9def const std::string& cookie, SetCookieFromStringCallback callback) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -421,7 +433,7 @@ void RestrictedCookieManager::SetCookieFromString( +@@ -422,7 +434,7 @@ void RestrictedCookieManager::SetCookieFromString( // Further checks (origin_, settings), as well as logging done by // SetCanonicalCookie() SetCanonicalCookie( @@ -132,7 +132,7 @@ index 0cf25a1761c1c1cd877a320eb9fd0192c4577822..f1825513f128876d504c05ba392b9def base::BindOnce([](SetCookieFromStringCallback user_callback, bool success) { std::move(user_callback).Run(); }, std::move(callback))); -@@ -430,6 +442,7 @@ void RestrictedCookieManager::SetCookieFromString( +@@ -431,6 +443,7 @@ void RestrictedCookieManager::SetCookieFromString( void RestrictedCookieManager::GetCookiesString( const GURL& url, const GURL& site_for_cookies, @@ -140,7 +140,7 @@ index 0cf25a1761c1c1cd877a320eb9fd0192c4577822..f1825513f128876d504c05ba392b9def GetCookiesStringCallback callback) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); // Checks done by GetAllForUrl. -@@ -438,7 +451,8 @@ void RestrictedCookieManager::GetCookiesString( +@@ -439,7 +452,8 @@ void RestrictedCookieManager::GetCookiesString( auto match_options = mojom::CookieManagerGetOptions::New(); match_options->name = ""; match_options->match_type = mojom::CookieMatchType::STARTS_WITH; @@ -150,7 +150,7 @@ index 0cf25a1761c1c1cd877a320eb9fd0192c4577822..f1825513f128876d504c05ba392b9def base::BindOnce( [](GetCookiesStringCallback user_callback, const std::vector& cookies) { -@@ -451,14 +465,15 @@ void RestrictedCookieManager::GetCookiesString( +@@ -452,14 +466,15 @@ void RestrictedCookieManager::GetCookiesString( void RestrictedCookieManager::CookiesEnabledFor( const GURL& url, const GURL& site_for_cookies, diff --git a/patches/tools-metrics-histograms-histograms.xml.patch b/patches/tools-metrics-histograms-histograms.xml.patch index 71c613f213b..25c3e6cdac0 100644 --- a/patches/tools-metrics-histograms-histograms.xml.patch +++ b/patches/tools-metrics-histograms-histograms.xml.patch @@ -1,8 +1,8 @@ diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml -index ef939e13ce3d705d001cafb5de167d555770d37c..0616b8765f7b418452e7441168a47efe880d4e69 100644 +index 9a5e6f5dfbf3a5b78108c2251f07ccbf0fe9b7e1..8902b60170f589ecc77079b95da7aedd427b9aa0 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml -@@ -165573,6 +165573,7 @@ regressions. --> +@@ -165590,6 +165590,7 @@ regressions. -->