diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc index fce39a2f52ddb..d91e8abd393b8 100644 --- content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc @@ -3316,9 +3316,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 "