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 120.0.6099.35

Browse Source
This commit is contained in:
Marshall Greenblatt
2023-11-27 15:56:19 -05:00
parent d6af79e7a6
commit 7edfbed283
12 changed files with 90 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patch/patches/services_network_2622.patch
View File

@@ -21,7 +21,7 @@ index 0a6c1f498b8fc..79e0cf27a7715 100644
// If the corresponding Connector policy isn't set, don't perform scans.
if (!service || !service->IsConnectorEnabled(connector))
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
index 9a777bb144d00..b6eeebc040351 100644
index 392127630de15..af90e3a3e970d 100644
--- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc
@@ -22,6 +22,7 @@
@@ -32,7 +32,7 @@ index 9a777bb144d00..b6eeebc040351 100644
#include "chrome/browser/browser_features.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/cookie_settings_factory.h"
@@ -272,8 +273,10 @@ ProfileNetworkContextService::ProfileNetworkContextService(Profile* profile)
@@ -273,8 +274,10 @@ ProfileNetworkContextService::ProfileNetworkContextService(Profile* profile)
base::Unretained(this)));
cookie_settings_ = CookieSettingsFactory::GetForProfile(profile);
cookie_settings_observation_.Observe(cookie_settings_.get());
@@ -45,7 +45,7 @@ index 9a777bb144d00..b6eeebc040351 100644
DisableQuicIfNotAllowed();
@@ -442,6 +445,9 @@ void ProfileNetworkContextService::OnTruncatedCookieBlockingChanged() {
@@ -455,6 +458,9 @@ void ProfileNetworkContextService::OnTruncatedCookieBlockingChanged() {
void ProfileNetworkContextService::OnFirstPartySetsEnabledChanged(
bool enabled) {
@@ -55,7 +55,7 @@ index 9a777bb144d00..b6eeebc040351 100644
// Update all FPS Access Delegates on the FPS service to be `enabled`.
first_party_sets::FirstPartySetsPolicyServiceFactory::GetForBrowserContext(
profile_)
@@ -817,9 +823,26 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -833,9 +839,26 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
network_context_params->cookie_manager_params =
CreateCookieManagerParams(profile_, *cookie_settings_);
@@ -83,7 +83,7 @@ index 9a777bb144d00..b6eeebc040351 100644
PrefService* local_state = g_browser_process->local_state();
// Configure the HTTP cache path and size.
base::FilePath base_cache_path;
@@ -828,15 +851,14 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -844,15 +867,14 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
local_state->GetFilePath(prefs::kDiskCacheDir);
if (!disk_cache_dir.empty())
base_cache_path = disk_cache_dir.Append(base_cache_path.BaseName());
@@ -103,7 +103,7 @@ index 9a777bb144d00..b6eeebc040351 100644
network_context_params->file_paths->data_directory =
path.Append(chrome::kNetworkDataDirname);
network_context_params->file_paths->unsandboxed_data_path = path;
@@ -989,6 +1011,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -1005,6 +1027,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
network_context_params->block_trust_tokens =
anti_abuse_content_setting == CONTENT_SETTING_BLOCK;
@@ -111,7 +111,7 @@ index 9a777bb144d00..b6eeebc040351 100644
network_context_params->first_party_sets_access_delegate_params =
network::mojom::FirstPartySetsAccessDelegateParams::New();
network_context_params->first_party_sets_access_delegate_params->enabled =
@@ -1005,6 +1028,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -1021,6 +1044,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
GetForBrowserContext(profile_);
DCHECK(fps_service);
fps_service->AddRemoteAccessDelegate(std::move(fps_access_delegate_remote));
@@ -223,7 +223,7 @@ index 61fd008fc067e..73909be088278 100644
// reset to null.
const CookieAccessDelegate* cookie_access_delegate() const {
diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
index bcc62a6f41379..b0e052349ad35 100644
index bd5a6ed1377da..5c53f834b49b3 100644
--- services/network/cookie_manager.cc
+++ services/network/cookie_manager.cc
@@ -303,14 +303,9 @@ void CookieManager::AllowFileSchemeCookies(
@@ -245,10 +245,10 @@ index bcc62a6f41379..b0e052349ad35 100644
void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc
index 344fb45470747..100c815cf3db4 100644
index 735c165f95e43..7d04642a3cd6d 100644
--- services/network/network_context.cc
+++ services/network/network_context.cc
@@ -2528,16 +2528,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2530,16 +2530,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
network_service_->network_quality_estimator());
}
@@ -277,7 +277,7 @@ index 344fb45470747..100c815cf3db4 100644
base::FeatureList::IsEnabled(features::kFledgePst)) {
trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
index 88fc9ddba7fff..9a50865fa2d14 100644
index e696f8197cd9f..a5bef1a7e532a 100644
--- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom
@@ -371,6 +371,9 @@ struct NetworkContextParams {