Update to Chromium version 94.0.4606.0 (#911515)

This commit is contained in:
Marshall Greenblatt
2021-08-19 19:40:49 -04:00
parent 955097ea77
commit 25c1947f1d
85 changed files with 745 additions and 726 deletions

View File

@@ -1,8 +1,8 @@
diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
index a7584ed4201ec..7cf54d07d0954 100644
index 5edf24182bc5a..8fed55299bacf 100644
--- content/browser/storage_partition_impl.cc
+++ content/browser/storage_partition_impl.cc
@@ -494,10 +494,6 @@ class LoginHandlerDelegate {
@@ -500,10 +500,6 @@ class LoginHandlerDelegate {
}
WebContents* web_contents = web_contents_getter_.Run();
@@ -13,7 +13,7 @@ index a7584ed4201ec..7cf54d07d0954 100644
// WeakPtr is not strictly necessary here due to OnRequestCancelled.
creating_login_delegate_ = true;
@@ -550,12 +546,6 @@ void OnAuthRequiredContinuation(
@@ -556,12 +552,6 @@ void OnAuthRequiredContinuation(
mojo::PendingRemote<network::mojom::AuthChallengeResponder>
auth_challenge_responder,
base::RepeatingCallback<WebContents*(void)> web_contents_getter) {
@@ -26,7 +26,7 @@ index a7584ed4201ec..7cf54d07d0954 100644
new LoginHandlerDelegate(std::move(auth_challenge_responder),
std::move(web_contents_getter), auth_info,
is_request_for_main_frame, process_id, routing_id,
@@ -2598,8 +2588,12 @@ void StoragePartitionImpl::GetQuotaSettings(
@@ -2712,8 +2702,12 @@ void StoragePartitionImpl::GetQuotaSettings(
return;
}
@@ -40,9 +40,9 @@ index a7584ed4201ec..7cf54d07d0954 100644
storage::GetDefaultDeviceInfoHelper(), std::move(callback));
}
@@ -2612,6 +2606,11 @@ void StoragePartitionImpl::InitNetworkContext() {
@@ -2726,6 +2720,11 @@ void StoragePartitionImpl::InitNetworkContext() {
GetContentClient()->browser()->ConfigureNetworkContextParams(
browser_context_, is_in_memory_, relative_partition_path_,
browser_context_, is_in_memory(), relative_partition_path_,
context_params.get(), cert_verifier_creation_params.get());
+ if (context_params->context_name &&
+ *context_params->context_name == "magic_shutting_down") {