Remove DanglingUntriaged annotation from HttpNetworkSession.
The QuicNetworkTransactionTest.QuicProxyAuth test was creating an
HttpNetworkSession twice from the same objects, but creating a
new ProxyResolutionService for each session, and only destroying the
first HttpNetworkSession after overwriting and destroying the first
ProxyResolutionService.
There was no need for the test to create a ProxyResolutionService
twice, so just switch to using a single ProxyResolutionService for
both HttpNetworkSessions.
The test could perhaps be switching to using a single
HttpNetworkSession as well, flushing the QUIC session pool between
tests, but keeping that as-is, for now.
Bug: 40212619
Change-Id: I41886941b2325cb623d24602f4b116fed3c239f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5388922
Commit-Queue: mmenke <[email protected]>
Reviewed-by: Adam Rice <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1278258}
diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc
index ed60973..0667c33fe1 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -7348,6 +7348,13 @@
const std::u16string kBaz(u"baz");
const std::u16string kFoo(u"foo");
+ session_params_.enable_quic = true;
+ proxy_resolution_service_ =
+ ConfiguredProxyResolutionService::CreateFixedFromProxyChainsForTest(
+ {ProxyChain::ForIpProtection({ProxyServer::FromSchemeHostAndPort(
+ ProxyServer::SCHEME_QUIC, "proxy.example.org", 70)})},
+ TRAFFIC_ANNOTATION_FOR_TESTS);
+
// On the second pass, the body read of the auth challenge is synchronous, so
// IsConnectedAndIdle returns false. The socket should still be drained and
// reused. See http://crbug.com/544255.
@@ -7363,13 +7370,6 @@
context_.clock(), kDefaultServerHostName, quic::Perspective::IS_SERVER,
false);
- session_params_.enable_quic = true;
- proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromProxyChainsForTest(
- {ProxyChain::ForIpProtection({ProxyServer::FromSchemeHostAndPort(
- ProxyServer::SCHEME_QUIC, "proxy.example.org", 70)})},
- TRAFFIC_ANNOTATION_FOR_TESTS);
-
MockQuicData mock_quic_data(version_);
int packet_num = 1;