mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 92.0.4515.0 (#885287)
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
|
||||
index b41fe282dea38..c5fc618d2fe89 100644
|
||||
index 99455d0c26355..d64e53232822a 100644
|
||||
--- chrome/browser/net/profile_network_context_service.cc
|
||||
+++ chrome/browser/net/profile_network_context_service.cc
|
||||
@@ -21,6 +21,7 @@
|
||||
@ -10,7 +10,7 @@ index b41fe282dea38..c5fc618d2fe89 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"
|
||||
@@ -684,7 +685,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
|
||||
@@ -670,7 +671,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
|
||||
|
||||
// Configure on-disk storage for non-OTR profiles. OTR profiles just use
|
||||
// default behavior (in memory storage, default sizes).
|
||||
@ -31,7 +31,7 @@ index b41fe282dea38..c5fc618d2fe89 100644
|
||||
PrefService* local_state = g_browser_process->local_state();
|
||||
// Configure the HTTP cache path and size.
|
||||
base::FilePath base_cache_path;
|
||||
@@ -697,7 +710,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
|
||||
@@ -683,7 +696,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
|
||||
base_cache_path.Append(chrome::kCacheDirname);
|
||||
network_context_params->http_cache_max_size =
|
||||
local_state->GetInteger(prefs::kDiskCacheSize);
|
||||
@ -42,10 +42,10 @@ index b41fe282dea38..c5fc618d2fe89 100644
|
||||
// change.
|
||||
network_context_params->http_server_properties_path =
|
||||
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
|
||||
index dd1ff2e34abc6..755c3ac5441f2 100644
|
||||
index 4183288fd5da1..2ecb3ed351bba 100644
|
||||
--- net/cookies/cookie_monster.cc
|
||||
+++ net/cookies/cookie_monster.cc
|
||||
@@ -495,6 +495,25 @@ void CookieMonster::SetCookieableSchemes(
|
||||
@@ -515,6 +515,25 @@ void CookieMonster::SetCookieableSchemes(
|
||||
MaybeRunCookieCallback(std::move(callback), true);
|
||||
}
|
||||
|
||||
@ -72,10 +72,10 @@ index dd1ff2e34abc6..755c3ac5441f2 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 00446acaabc1f..78235cfc1ed37 100644
|
||||
index ef391b3cb94f1..8962106d08688 100644
|
||||
--- net/cookies/cookie_monster.h
|
||||
+++ net/cookies/cookie_monster.h
|
||||
@@ -180,6 +180,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
||||
@@ -182,6 +182,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
||||
CookieChangeDispatcher& GetChangeDispatcher() override;
|
||||
void SetCookieableSchemes(const std::vector<std::string>& schemes,
|
||||
SetCookieableSchemesCallback callback) override;
|
||||
@ -85,10 +85,10 @@ index 00446acaabc1f..78235cfc1ed37 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 5ffbe648343da..3d9a0f2e828f6 100644
|
||||
index afa99e255bdf1..5e8201696c613 100644
|
||||
--- net/cookies/cookie_store.h
|
||||
+++ net/cookies/cookie_store.h
|
||||
@@ -149,6 +149,11 @@ class NET_EXPORT CookieStore {
|
||||
@@ -156,6 +156,11 @@ class NET_EXPORT CookieStore {
|
||||
// Transfer ownership of a CookieAccessDelegate.
|
||||
void SetCookieAccessDelegate(std::unique_ptr<CookieAccessDelegate> delegate);
|
||||
|
||||
@ -101,10 +101,10 @@ index 5ffbe648343da..3d9a0f2e828f6 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 f91ffe61dba5a..f3482e68cd114 100644
|
||||
index a397306372054..8a1bacea8d70c 100644
|
||||
--- services/network/cookie_manager.cc
|
||||
+++ services/network/cookie_manager.cc
|
||||
@@ -230,14 +230,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
|
||||
@@ -249,14 +249,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
|
||||
void CookieManager::AllowFileSchemeCookies(
|
||||
bool allow,
|
||||
AllowFileSchemeCookiesCallback callback) {
|
||||
@ -123,10 +123,10 @@ index f91ffe61dba5a..f3482e68cd114 100644
|
||||
|
||||
void CookieManager::SetForceKeepSessionState() {
|
||||
diff --git services/network/network_context.cc services/network/network_context.cc
|
||||
index 8f70586b27c92..4c59ca3c452ec 100644
|
||||
index e606e81f99451..89c29adfb3a09 100644
|
||||
--- services/network/network_context.cc
|
||||
+++ services/network/network_context.cc
|
||||
@@ -2000,16 +2000,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||
@@ -2003,16 +2003,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||
network_service_->network_quality_estimator());
|
||||
}
|
||||
|
||||
@ -157,7 +157,7 @@ index 8f70586b27c92..4c59ca3c452ec 100644
|
||||
trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
|
||||
|
||||
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
|
||||
index ee27133a56df4..3da7932bac49c 100644
|
||||
index e24ec4cb3c49a..b8d3aec99d8af 100644
|
||||
--- services/network/public/mojom/network_context.mojom
|
||||
+++ services/network/public/mojom/network_context.mojom
|
||||
@@ -252,6 +252,9 @@ struct NetworkContextParams {
|
||||
|
Reference in New Issue
Block a user