bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 80.0.3987.0 (#722274)

Browse Source
This commit is contained in:
Alexander Guettler
2020-02-10 12:10:17 -05:00
committed by Marshall Greenblatt
parent ed39922f85
commit 71768ea6c3
131 changed files with 1620 additions and 1394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
patch/patches/services_network_2622.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
index 2788029519d2..205d29075ff8 100644
index 3adf99a4527b..4c607c45d136 100644
--- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc
@@ -16,6 +16,7 @@
@@ -10,7 +10,7 @@ index 2788029519d2..205d29075ff8 100644
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/cookie_settings_factory.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ -484,9 +485,22 @@ ProfileNetworkContextService::CreateNetworkContextParams(
@@ -642,9 +643,22 @@ ProfileNetworkContextService::CreateNetworkContextParams(
network_context_params->cookie_manager_params =
CreateCookieManagerParams(profile_, *cookie_settings_);
@@ -33,7 +33,7 @@ index 2788029519d2..205d29075ff8 100644
PrefService* local_state = g_browser_process->local_state();
// Configure the HTTP cache path and size.
base::FilePath base_cache_path;
@@ -499,6 +513,7 @@ ProfileNetworkContextService::CreateNetworkContextParams(
@@ -657,6 +671,7 @@ ProfileNetworkContextService::CreateNetworkContextParams(
base_cache_path.Append(chrome::kCacheDirname);
network_context_params->http_cache_max_size =
local_state->GetInteger(prefs::kDiskCacheSize);
@@ -42,10 +42,10 @@ index 2788029519d2..205d29075ff8 100644
// Currently this just contains HttpServerProperties, but that will likely
// change.
diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h
index 756fa14db62a..4fb52050f8a5 100644
index 458c4acb0851..8f2a016a3054 100644
--- chrome/browser/profiles/profile.h
+++ chrome/browser/profiles/profile.h
@@ -378,6 +378,11 @@ class Profile : public content::BrowserContext {
@@ -380,6 +380,11 @@ class Profile : public content::BrowserContext {
virtual bool ShouldRestoreOldSessionCookies();
virtual bool ShouldPersistSessionCookies();
@@ -58,10 +58,10 @@ index 756fa14db62a..4fb52050f8a5 100644
// itself, if |relative_path| is empty).
virtual mojo::Remote<network::mojom::NetworkContext> CreateNetworkContext(
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
index adbda8bdf2c5..779e9e9764cb 100644
index 15068300b269..d5948416f730 100644
--- net/cookies/cookie_monster.cc
+++ net/cookies/cookie_monster.cc
@@ -504,6 +504,25 @@ void CookieMonster::SetCookieableSchemes(
@@ -476,6 +476,25 @@ void CookieMonster::SetCookieableSchemes(
MaybeRunCookieCallback(std::move(callback), true);
}
@@ -88,7 +88,7 @@ index adbda8bdf2c5..779e9e9764cb 100644
void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) {
DCHECK(thread_checker_.CalledOnValidThread());
diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h
index 66ad270bb07e..ca9d9e073edf 100644
index 431fab884a5f..eeed129b49f2 100644
--- net/cookies/cookie_monster.h
+++ net/cookies/cookie_monster.h
@@ -180,6 +180,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
@@ -101,7 +101,7 @@ index 66ad270bb07e..ca9d9e073edf 100644
// Enables writing session cookies into the cookie database. If this this
// method is called, it must be called before first use of the instance
diff --git net/cookies/cookie_store.h net/cookies/cookie_store.h
index ebec5df3a7ed..718cf4bc7362 100644
index 996ad7d14dfb..5c8e43c1d29c 100644
--- net/cookies/cookie_store.h
+++ net/cookies/cookie_store.h
@@ -148,6 +148,11 @@ class NET_EXPORT CookieStore {
@@ -117,10 +117,10 @@ index ebec5df3a7ed..718cf4bc7362 100644
virtual void DumpMemoryStats(base::trace_event::ProcessMemoryDump* pmd,
const std::string& parent_absolute_name) const;
diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
index 5a087228a2f1..1f46f8de2ee8 100644
index 5dbc9d2dfcfb..1c31d97825c2 100644
--- services/network/cookie_manager.cc
+++ services/network/cookie_manager.cc
@@ -219,14 +219,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
@@ -228,14 +228,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
void CookieManager::AllowFileSchemeCookies(
bool allow,
AllowFileSchemeCookiesCallback callback) {
@@ -139,10 +139,10 @@ index 5a087228a2f1..1f46f8de2ee8 100644
void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc
index 8489c08f3b5f..e2c22ea79382 100644
index b1740e9c8a2f..3509c005191c 100644
--- services/network/network_context.cc
+++ services/network/network_context.cc
@@ -1627,6 +1627,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
@@ -1745,6 +1745,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
}
scoped_refptr<SessionCleanupCookieStore> session_cleanup_cookie_store;
@@ -150,7 +150,7 @@ index 8489c08f3b5f..e2c22ea79382 100644
if (params_->cookie_path) {
scoped_refptr<base::SequencedTaskRunner> client_task_runner =
base::ThreadTaskRunnerHandle::Get();
@@ -1654,18 +1655,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
@@ -1772,18 +1773,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
session_cleanup_cookie_store =
base::MakeRefCounted<SessionCleanupCookieStore>(sqlite_store);
@@ -182,10 +182,10 @@ index 8489c08f3b5f..e2c22ea79382 100644
std::make_unique<net::StaticHttpUserAgentSettings>(
params_->accept_language, params_->user_agent);
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
index 086f4b96cdd9..1fe8d2ccae88 100644
index 662496d97241..6971cc3309af 100644
--- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom
@@ -225,6 +225,9 @@ struct NetworkContextParams {
@@ -242,6 +242,9 @@ struct NetworkContextParams {
// cookies. Otherwise it should be false.
bool persist_session_cookies = false;