|
@@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
|
|
|
session.setCertificateVerifyCallback.
|
|
|
|
|
|
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
|
|
|
-index 02ff46371083e4a5821e8877fbd31796fdb6a0a9..0d6d4d646bd6e7c187b5174edff2ddb0c51d7867 100644
|
|
|
+index d5d2f0738d89805a418fa90e062567ba66e96c2f..6c23ecefaf8162efde4379b90d9b116e63175d48 100644
|
|
|
--- a/services/network/network_context.cc
|
|
|
+++ b/services/network/network_context.cc
|
|
|
@@ -157,6 +157,11 @@
|
|
@@ -136,7 +136,7 @@ index 02ff46371083e4a5821e8877fbd31796fdb6a0a9..0d6d4d646bd6e7c187b5174edff2ddb0
|
|
|
void NetworkContext::CreateURLLoaderFactory(
|
|
|
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
|
|
|
mojom::URLLoaderFactoryParamsPtr params) {
|
|
|
-@@ -2474,6 +2579,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
|
|
+@@ -2493,6 +2598,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
|
|
std::move(cert_verifier));
|
|
|
cert_verifier = std::move(cert_verifier_with_trust_anchors);
|
|
|
#endif // BUILDFLAG(IS_CHROMEOS)
|
|
@@ -147,7 +147,7 @@ index 02ff46371083e4a5821e8877fbd31796fdb6a0a9..0d6d4d646bd6e7c187b5174edff2ddb0
|
|
|
|
|
|
builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
|
|
|
diff --git a/services/network/network_context.h b/services/network/network_context.h
|
|
|
-index 4f1cd30aa54de9a64372c7dced2bdaa683cc0d8e..b0df50eca7d4bed289940ebdf968a36fd891297b 100644
|
|
|
+index c73d2ca100eeda97406427f6ff20b12b0ce393f2..5ddd56b235229f85fa2d0619b7f4614cb00d914e 100644
|
|
|
--- a/services/network/network_context.h
|
|
|
+++ b/services/network/network_context.h
|
|
|
@@ -115,6 +115,7 @@ class URLMatcher;
|
|
@@ -167,7 +167,7 @@ index 4f1cd30aa54de9a64372c7dced2bdaa683cc0d8e..b0df50eca7d4bed289940ebdf968a36f
|
|
|
void ResetURLLoaderFactories() override;
|
|
|
void GetViaObliviousHttp(
|
|
|
mojom::ObliviousHttpRequestPtr request,
|
|
|
-@@ -923,6 +926,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
|
|
|
+@@ -925,6 +928,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
|
|
|
std::vector<base::OnceClosure> dismount_closures_;
|
|
|
#endif // BUILDFLAG(IS_DIRECTORY_TRANSFER_REQUIRED)
|
|
|
|
|
@@ -177,7 +177,7 @@ index 4f1cd30aa54de9a64372c7dced2bdaa683cc0d8e..b0df50eca7d4bed289940ebdf968a36f
|
|
|
std::unique_ptr<HostResolver> internal_host_resolver_;
|
|
|
std::set<std::unique_ptr<HostResolver>, base::UniquePtrComparator>
|
|
|
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
|
|
|
-index 1abef24d101b3426544f24484c32e7999535d3d0..1686353217d288c2faaef98f8cd445baf8ee0df5 100644
|
|
|
+index 0678afc12458f8609741bce73effe5315ec94036..1b3143b046135369c8b6a22b15d16fbfea3e615a 100644
|
|
|
--- a/services/network/public/mojom/network_context.mojom
|
|
|
+++ b/services/network/public/mojom/network_context.mojom
|
|
|
@@ -298,6 +298,16 @@ struct SocketBrokerRemotes {
|
|
@@ -208,7 +208,7 @@ index 1abef24d101b3426544f24484c32e7999535d3d0..1686353217d288c2faaef98f8cd445ba
|
|
|
CreateURLLoaderFactory(pending_receiver<URLLoaderFactory> url_loader_factory,
|
|
|
URLLoaderFactoryParams params);
|
|
|
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
|
|
|
-index c4444fef6804a1e494320e2cd539262e4e8b4f1b..edb9e10bca66bc93c274652574360dacadf02949 100644
|
|
|
+index c025846455a8a3b024fe6f39274c68b8f8d30899..3640daadd0f1874930d0ffe9e560b53771e1ade7 100644
|
|
|
--- a/services/network/test/test_network_context.h
|
|
|
+++ b/services/network/test/test_network_context.h
|
|
|
@@ -63,6 +63,8 @@ class TestNetworkContext : public mojom::NetworkContext {
|