diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc index d89552afd9c8f..7f2da3945aa3b 100644 --- chrome/browser/net/profile_network_context_service.cc +++ chrome/browser/net/profile_network_context_service.cc @@ -22,6 +22,7 @@ #include "base/task/thread_pool.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" +#include "cef/libcef/features/runtime.h" #include "chrome/browser/browser_features.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" @@ -718,7 +719,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( // Configure on-disk storage for non-OTR profiles. OTR profiles just use // default behavior (in memory storage, default sizes). - if (!in_memory) { + if (!in_memory && cef::IsAlloyRuntimeEnabled()) { + PrefService* prefs = profile_->GetPrefs(); + // Configure the HTTP cache path and size. + const base::FilePath& base_cache_path = + prefs->GetFilePath(prefs::kDiskCacheDir); + DCHECK(!base_cache_path.empty()); + network_context_params->http_cache_path = + base_cache_path.Append(chrome::kCacheDirname); + network_context_params->http_cache_max_size = + prefs->GetInteger(prefs::kDiskCacheSize); + } + + if (!in_memory && !cef::IsAlloyRuntimeEnabled()) { PrefService* local_state = g_browser_process->local_state(); // Configure the HTTP cache path and size. base::FilePath base_cache_path; @@ -746,7 +759,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( network_context_params->http_cache_max_size = local_state->GetInteger(prefs::kDiskCacheSize); } + } + if (!in_memory) { network_context_params->file_paths = ::network::mojom::NetworkContextFilePaths::New(); diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc index 0aaef609b0709..ab1a8e96fdb30 100644 --- net/cookies/cookie_monster.cc +++ net/cookies/cookie_monster.cc @@ -545,6 +545,25 @@ void CookieMonster::SetCookieableSchemes( MaybeRunCookieCallback(std::move(callback), true); } +void CookieMonster::AddCookieableSchemes( + const std::vector& schemes, + SetCookieableSchemesCallback callback) { + DCHECK(thread_checker_.CalledOnValidThread()); + + // Calls to this method will have no effect if made after a WebView or + // CookieManager instance has been created. + if (initialized_) { + MaybeRunCookieCallback(std::move(callback), false); + return; + } + + if (!schemes.empty()) { + cookieable_schemes_.insert(cookieable_schemes_.begin(), schemes.begin(), + schemes.end()); + } + MaybeRunCookieCallback(std::move(callback), true); +} + // This function must be called before the CookieMonster is used. void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) { DCHECK(thread_checker_.CalledOnValidThread()); diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h index 1ed421b60d526..d65d32b4c0ca0 100644 --- net/cookies/cookie_monster.h +++ net/cookies/cookie_monster.h @@ -205,6 +205,8 @@ class NET_EXPORT CookieMonster : public CookieStore { CookieChangeDispatcher& GetChangeDispatcher() override; void SetCookieableSchemes(const std::vector& schemes, SetCookieableSchemesCallback callback) override; + void AddCookieableSchemes(const std::vector& schemes, + SetCookieableSchemesCallback callback) override; // 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 8631b10535c7d..7c4c518ee5b3d 100644 --- net/cookies/cookie_store.h +++ net/cookies/cookie_store.h @@ -155,6 +155,11 @@ class NET_EXPORT CookieStore { // Transfer ownership of a CookieAccessDelegate. void SetCookieAccessDelegate(std::unique_ptr delegate); + // Adds to the list of cookieable schemes. Does nothing if called after first + // use of the instance (i.e. after the instance initialization process). + virtual void AddCookieableSchemes(const std::vector& schemes, + SetCookieableSchemesCallback callback) = 0; + // This may be null if no delegate has been set yet, or the delegate has been // reset to null. const CookieAccessDelegate* cookie_access_delegate() const { diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc index f0660ffa8bd4d..4eb14790b8979 100644 --- services/network/cookie_manager.cc +++ services/network/cookie_manager.cc @@ -324,14 +324,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) { void CookieManager::AllowFileSchemeCookies( bool allow, AllowFileSchemeCookiesCallback callback) { - std::vector cookieable_schemes( - net::CookieMonster::kDefaultCookieableSchemes, - net::CookieMonster::kDefaultCookieableSchemes + - net::CookieMonster::kDefaultCookieableSchemesCount); - if (allow) { - cookieable_schemes.push_back(url::kFileScheme); - } - cookie_store_->SetCookieableSchemes(cookieable_schemes, std::move(callback)); + if (!allow) + return; + cookie_store_->AddCookieableSchemes({url::kFileScheme}, std::move(callback)); } void CookieManager::SetForceKeepSessionState() { diff --git services/network/network_context.cc services/network/network_context.cc index abcf825d8049a..552d8403fa0a8 100644 --- services/network/network_context.cc +++ services/network/network_context.cc @@ -2216,17 +2216,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( network_service_->network_quality_estimator()); } - if (session_cleanup_cookie_store) { - std::unique_ptr cookie_store = - std::make_unique( - session_cleanup_cookie_store.get(), net_log, - network_service_->first_party_sets()->is_enabled()); - if (params_->persist_session_cookies) - cookie_store->SetPersistSessionCookies(true); + std::unique_ptr cookie_store = + std::make_unique( + session_cleanup_cookie_store.get(), net_log, + network_service_->first_party_sets()->is_enabled()); + if (session_cleanup_cookie_store && params_->persist_session_cookies) + cookie_store->SetPersistSessionCookies(true); - builder.SetCookieStore(std::move(cookie_store)); + if (params_->cookieable_schemes.has_value()) { + cookie_store->SetCookieableSchemes( + *params_->cookieable_schemes, + net::CookieStore::SetCookieableSchemesCallback()); } + builder.SetCookieStore(std::move(cookie_store)); + if (base::FeatureList::IsEnabled(features::kTrustTokens)) { trust_token_store_ = std::make_unique(); diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom index d7c10e5a55bf0..958c2c27211f7 100644 --- services/network/public/mojom/network_context.mojom +++ services/network/public/mojom/network_context.mojom @@ -330,6 +330,9 @@ struct NetworkContextParams { // cookies. Otherwise it should be false. bool persist_session_cookies = false; + // Schemes that will be passed to CookieMonster::SetCookieableSchemes. + array? cookieable_schemes; + // True if an HTTP cache should be used. bool http_cache_enabled = true; // Maximum size of the HTTP cache. 0 means to use the default size.