diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc index 1dfbe67a3ec3c..6f0db67e6f929 100644 --- net/cookies/cookie_monster.cc +++ net/cookies/cookie_monster.cc @@ -660,6 +660,25 @@ void CookieMonster::SetCookieableSchemes( MaybeRunCookieCallback(std::move(callback), true); } +void CookieMonster::AddCookieableSchemes( + const std::vector& schemes, + SetCookieableSchemesCallback callback) { + DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); + + // 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_CALLED_ON_VALID_THREAD(thread_checker_); diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h index 1533aea31832c..ea961cbc9f65d 100644 --- net/cookies/cookie_monster.h +++ net/cookies/cookie_monster.h @@ -236,6 +236,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; std::optional SiteHasCookieInOtherPartition( const net::SchemefulSite& site, const std::optional& partition_key) const override; diff --git net/cookies/cookie_store.h net/cookies/cookie_store.h index 3f0be99e0e145..0462ebbe9bedc 100644 --- net/cookies/cookie_store.h +++ net/cookies/cookie_store.h @@ -163,6 +163,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 963ddd7d0fcce..81f37072b77fa 100644 --- services/network/cookie_manager.cc +++ services/network/cookie_manager.cc @@ -347,14 +347,9 @@ void CookieManager::AllowFileSchemeCookies( AllowFileSchemeCookiesCallback callback) { OnSettingsWillChange(); - 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 e74079c81ddad..7fd92dc9434a3 100644 --- services/network/network_context.cc +++ services/network/network_context.cc @@ -2769,19 +2769,23 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( pref_service.get(), 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, - std::make_unique( - pref_service.get())); - if (params_->persist_session_cookies) { - cookie_store->SetPersistSessionCookies(true); - } + std::unique_ptr cookie_store = + std::make_unique( + session_cleanup_cookie_store.get(), net_log, + std::make_unique( + pref_service.get())); + 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)); + base::FilePath transport_security_persister_file_name; if (GetFullDataFilePath(params_->file_paths, &network::mojom::NetworkContextFilePaths:: diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom index c292e1472c724..3b2237872fe20 100644 --- services/network/public/mojom/network_context.mojom +++ services/network/public/mojom/network_context.mojom @@ -360,6 +360,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.