cef/patch/patches/services_network_2718.patch

34 lines
1.6 KiB
Diff
Raw Normal View History

diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
index a1db5b377647e..3442371165570 100644
--- content/browser/storage_partition_impl.cc
+++ content/browser/storage_partition_impl.cc
@@ -3345,8 +3345,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));
}
@@ -3356,9 +3360,12 @@ void StoragePartitionImpl::InitNetworkContext() {
cert_verifier::mojom::CertVerifierCreationParamsPtr
cert_verifier_creation_params =
cert_verifier::mojom::CertVerifierCreationParams::New();
- GetContentClient()->browser()->ConfigureNetworkContextParams(
+ if (!GetContentClient()->browser()->ConfigureNetworkContextParams(
browser_context_, is_in_memory(), relative_partition_path_,
- context_params.get(), cert_verifier_creation_params.get());
+ context_params.get(), cert_verifier_creation_params.get())) {
+ // Don't re-initialize the network context during shutdown.
+ return;
+ }
// Should be initialized with existing per-profile CORS access lists.
DCHECK(context_params->cors_origin_access_list.empty())
<< "NetworkContextParams::cors_origin_access_list should be populated "