diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc index e5160aa3ff1a..87b037e517c2 100644 --- chrome/browser/net/profile_network_context_service.cc +++ chrome/browser/net/profile_network_context_service.cc @@ -19,6 +19,7 @@ #include "base/strings/string_split.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" +#include "cef/libcef/features/runtime.h" #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" @@ -668,9 +669,23 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( network_context_params->cookie_manager_params = CreateCookieManagerParams(profile_, *cookie_settings_); + network_context_params->cookieable_schemes = profile_->GetCookieableSchemes(); + // 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; @@ -683,7 +698,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( base_cache_path.Append(chrome::kCacheDirname); network_context_params->http_cache_max_size = local_state->GetInteger(prefs::kDiskCacheSize); + } + if (!in_memory) { // Currently this just contains HttpServerProperties, but that will likely // change. network_context_params->http_server_properties_path = diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h index a9dc5ed20a9f..3ce894531a21 100644 --- chrome/browser/profiles/profile.h +++ chrome/browser/profiles/profile.h @@ -449,6 +449,11 @@ class Profile : public content::BrowserContext { virtual bool ShouldRestoreOldSessionCookies() const; virtual bool ShouldPersistSessionCookies() const; + // Returns schemes that should be cookieable, if other than the defaults. + virtual base::Optional> GetCookieableSchemes() { + return base::nullopt; + } + // Configures NetworkContextParams and CertVerifierCreationParams for the // specified isolated app (or for the profile itself, if |relative_path| is // empty). diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc index 265deed0e52e..89d37ae6218a 100644 --- net/cookies/cookie_monster.cc +++ net/cookies/cookie_monster.cc @@ -479,6 +479,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 57ce9d640ac0..8c4cc927cf15 100644 --- net/cookies/cookie_monster.h +++ net/cookies/cookie_monster.h @@ -184,6 +184,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 5ffbe648343d..3d9a0f2e828f 100644 --- net/cookies/cookie_store.h +++ net/cookies/cookie_store.h @@ -149,6 +149,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; + // Reports the estimate of dynamically allocated memory in bytes. 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 1d988375b00a..e71cbc3b612f 100644 --- services/network/cookie_manager.cc +++ services/network/cookie_manager.cc @@ -228,14 +228,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 5b4588fadf4b..1f685c4d6700 100644 --- services/network/network_context.cc +++ services/network/network_context.cc @@ -1906,6 +1906,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( } scoped_refptr session_cleanup_cookie_store; + std::unique_ptr cookie_store; if (params_->cookie_path) { scoped_refptr client_task_runner = base::ThreadTaskRunnerHandle::Get(); @@ -1932,18 +1933,26 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( session_cleanup_cookie_store = base::MakeRefCounted(sqlite_store); - std::unique_ptr cookie_store = + cookie_store = std::make_unique(session_cleanup_cookie_store.get(), net_log); if (params_->persist_session_cookies) cookie_store->SetPersistSessionCookies(true); - - builder.SetCookieStore(std::move(cookie_store)); } else { DCHECK(!params_->restore_old_session_cookies); DCHECK(!params_->persist_session_cookies); + cookie_store = + std::make_unique(nullptr /* store */, net_log); + } + + 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 87b26150440e..60c9eee375bb 100644 --- services/network/public/mojom/network_context.mojom +++ services/network/public/mojom/network_context.mojom @@ -274,6 +274,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.