Update to Chromium version 134.0.6998.0 (#1415337)

This commit is contained in:
Marshall Greenblatt
2025-02-12 12:35:33 -05:00
parent c8be96d15c
commit c7c6a109c9
88 changed files with 736 additions and 793 deletions

View File

@@ -1,8 +1,8 @@
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
index 7f03ff64090e5..a619186213674 100644
index 1dfbe67a3ec3c..6f0db67e6f929 100644
--- net/cookies/cookie_monster.cc
+++ net/cookies/cookie_monster.cc
@@ -632,6 +632,25 @@ void CookieMonster::SetCookieableSchemes(
@@ -660,6 +660,25 @@ void CookieMonster::SetCookieableSchemes(
MaybeRunCookieCallback(std::move(callback), true);
}
@@ -29,10 +29,10 @@ index 7f03ff64090e5..a619186213674 100644
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 5a81a20072932..269d7904b0693 100644
index 1533aea31832c..ea961cbc9f65d 100644
--- net/cookies/cookie_monster.h
+++ net/cookies/cookie_monster.h
@@ -210,6 +210,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
@@ -236,6 +236,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
CookieChangeDispatcher& GetChangeDispatcher() override;
void SetCookieableSchemes(const std::vector<std::string>& schemes,
SetCookieableSchemesCallback callback) override;
@@ -80,23 +80,27 @@ index 963ddd7d0fcce..81f37072b77fa 100644
void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc
index 8d2e38ac65ca8..58599658c2e0a 100644
index e74079c81ddad..7fd92dc9434a3 100644
--- services/network/network_context.cc
+++ services/network/network_context.cc
@@ -2636,17 +2636,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
network_service_->network_quality_estimator());
@@ -2769,19 +2769,23 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
pref_service.get(), network_service_->network_quality_estimator());
}
- if (session_cleanup_cookie_store) {
- std::unique_ptr<net::CookieMonster> cookie_store =
- std::make_unique<net::CookieMonster>(session_cleanup_cookie_store.get(),
- net_log);
- std::make_unique<net::CookieMonster>(
- session_cleanup_cookie_store.get(), net_log,
- std::make_unique<KnownLegacyScopeDomainsPrefDelegate>(
- pref_service.get()));
- if (params_->persist_session_cookies) {
- cookie_store->SetPersistSessionCookies(true);
- }
+ std::unique_ptr<net::CookieMonster> cookie_store =
+ std::make_unique<net::CookieMonster>(session_cleanup_cookie_store.get(),
+ net_log);
+ std::make_unique<net::CookieMonster>(
+ session_cleanup_cookie_store.get(), net_log,
+ std::make_unique<KnownLegacyScopeDomainsPrefDelegate>(
+ pref_service.get()));
+ if (session_cleanup_cookie_store && params_->persist_session_cookies) {
+ cookie_store->SetPersistSessionCookies(true);
+ }
@@ -110,14 +114,14 @@ index 8d2e38ac65ca8..58599658c2e0a 100644
+ builder.SetCookieStore(std::move(cookie_store));
+
trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
base::FilePath trust_token_path;
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 2ae706f12d920..83bad1d7c1155 100644
index c292e1472c724..3b2237872fe20 100644
--- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom
@@ -367,6 +367,9 @@ struct NetworkContextParams {
@@ -360,6 +360,9 @@ struct NetworkContextParams {
// cookies. Otherwise it should be false.
bool persist_session_cookies = false;