Update to Chromium version 93.0.4577.15

This commit is contained in:
Marshall Greenblatt
2021-07-28 21:29:46 -04:00
parent 0cfa65b48c
commit 2d46bb789e
61 changed files with 277 additions and 276 deletions

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
index bae294fef1f8b..06d2dfcecc956 100644
index bae294fef1f8..06d2dfcecc95 100644
--- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc
@@ -21,6 +21,7 @@
@@ -42,7 +42,7 @@ index bae294fef1f8b..06d2dfcecc956 100644
// change.
network_context_params->http_server_properties_path =
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
index e2e1e9acb3605..f0b22ab2dce9d 100644
index e2e1e9acb360..f0b22ab2dce9 100644
--- net/cookies/cookie_monster.cc
+++ net/cookies/cookie_monster.cc
@@ -506,6 +506,25 @@ void CookieMonster::SetCookieableSchemes(
@@ -72,7 +72,7 @@ index e2e1e9acb3605..f0b22ab2dce9d 100644
void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) {
DCHECK(thread_checker_.CalledOnValidThread());
diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h
index 4b24d429aabb4..fbfa765aba86a 100644
index 4b24d429aabb..fbfa765aba86 100644
--- net/cookies/cookie_monster.h
+++ net/cookies/cookie_monster.h
@@ -182,6 +182,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
@@ -85,7 +85,7 @@ index 4b24d429aabb4..fbfa765aba86a 100644
// 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 afa99e255bdf1..5e8201696c613 100644
index afa99e255bdf..5e8201696c61 100644
--- net/cookies/cookie_store.h
+++ net/cookies/cookie_store.h
@@ -156,6 +156,11 @@ class NET_EXPORT CookieStore {
@@ -101,7 +101,7 @@ index afa99e255bdf1..5e8201696c613 100644
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 a397306372054..8a1bacea8d70c 100644
index a39730637205..8a1bacea8d70 100644
--- services/network/cookie_manager.cc
+++ services/network/cookie_manager.cc
@@ -249,14 +249,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
@@ -123,7 +123,7 @@ index a397306372054..8a1bacea8d70c 100644
void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc
index a38eeaf6e58af..02ec2034afc8a 100644
index a38eeaf6e58a..02ec2034afc8 100644
--- services/network/network_context.cc
+++ services/network/network_context.cc
@@ -2052,16 +2052,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -157,7 +157,7 @@ index a38eeaf6e58af..02ec2034afc8a 100644
trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
index 25d6c99d4f6be..2c6cf5a907d16 100644
index 25d6c99d4f6b..2c6cf5a907d1 100644
--- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom
@@ -249,6 +249,9 @@ struct NetworkContextParams {