55 lines
2.3 KiB
Diff
55 lines
2.3 KiB
Diff
diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
|
|
index a948dde94213..4f4b09647fdb 100644
|
|
--- content/browser/storage_partition_impl.cc
|
|
+++ content/browser/storage_partition_impl.cc
|
|
@@ -495,10 +495,6 @@ class LoginHandlerDelegate {
|
|
}
|
|
|
|
WebContents* web_contents = web_contents_getter_.Run();
|
|
- if (!web_contents) {
|
|
- OnAuthCredentials(base::nullopt);
|
|
- return;
|
|
- }
|
|
|
|
// WeakPtr is not strictly necessary here due to OnRequestCancelled.
|
|
creating_login_delegate_ = true;
|
|
@@ -551,12 +547,6 @@ void OnAuthRequiredContinuation(
|
|
mojo::PendingRemote<network::mojom::AuthChallengeResponder>
|
|
auth_challenge_responder,
|
|
base::RepeatingCallback<WebContents*(void)> web_contents_getter) {
|
|
- if (!web_contents_getter || !web_contents_getter.Run()) {
|
|
- mojo::Remote<network::mojom::AuthChallengeResponder>
|
|
- auth_challenge_responder_remote(std::move(auth_challenge_responder));
|
|
- auth_challenge_responder_remote->OnAuthCredentials(base::nullopt);
|
|
- return;
|
|
- }
|
|
new LoginHandlerDelegate(std::move(auth_challenge_responder),
|
|
std::move(web_contents_getter), auth_info,
|
|
is_request_for_main_frame, process_id, routing_id,
|
|
@@ -2479,8 +2469,12 @@ void StoragePartitionImpl::GetQuotaSettings(
|
|
return;
|
|
}
|
|
|
|
+ // CEF always returns false for IsOffTheRecord(), so also check the path.
|
|
+ const bool is_incognito = browser_context_->IsOffTheRecord() ||
|
|
+ browser_context_->GetPath().empty();
|
|
+
|
|
storage::GetNominalDynamicSettings(
|
|
- GetPath(), browser_context_->IsOffTheRecord(),
|
|
+ GetPath(), is_incognito,
|
|
storage::GetDefaultDeviceInfoHelper(), std::move(callback));
|
|
}
|
|
|
|
@@ -2493,6 +2487,11 @@ void StoragePartitionImpl::InitNetworkContext() {
|
|
GetContentClient()->browser()->ConfigureNetworkContextParams(
|
|
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") {
|
|
+ // Don't re-initialize the network context during shutdown.
|
|
+ return;
|
|
+ }
|
|
devtools_instrumentation::ApplyNetworkContextParamsOverrides(
|
|
browser_context_, context_params.get());
|
|
DCHECK(!context_params->cert_verifier_params)
|