Index: net/quic/quic_network_transaction_unittest.cc |
diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc |
index 0410c5973d7eb5c949470d0089ef25703f33e818..0e5177169d096be474485b7f14de5463b3652d5f 100644 |
--- a/net/quic/quic_network_transaction_unittest.cc |
+++ b/net/quic/quic_network_transaction_unittest.cc |
@@ -294,23 +294,32 @@ class QuicNetworkTransactionTest |
void AddQuicAlternateProtocolMapping( |
MockCryptoClientStream::HandshakeMode handshake_mode) { |
crypto_client_stream_factory_.set_handshake_mode(handshake_mode); |
- session_->http_server_properties()->SetAlternateProtocol( |
- HostPortPair::FromURL(request_.url), 80, QUIC, 1); |
+ session_->http_server_properties()->AddAlternateProtocol( |
+ HostPortPair::FromURL(request_.url), 80, QUIC, 1.0); |
} |
void ExpectBrokenAlternateProtocolMapping() { |
- const AlternateProtocolInfo alternate = |
- session_->http_server_properties()->GetAlternateProtocol( |
+ const AlternateProtocols alternate_protocols = |
+ session_->http_server_properties()->GetAlternateProtocols( |
HostPortPair::FromURL(request_.url)); |
- EXPECT_NE(UNINITIALIZED_ALTERNATE_PROTOCOL, alternate.protocol); |
- EXPECT_TRUE(alternate.is_broken); |
+ for (const AlternateProtocolInfo& alternate : alternate_protocols) { |
+ if (alternate.is_broken) { |
+ return; |
+ } |
+ } |
+ EXPECT_FALSE(true) << "No broken alternate protocol found."; |
} |
void ExpectQuicAlternateProtocolMapping() { |
- const AlternateProtocolInfo alternate = |
- session_->http_server_properties()->GetAlternateProtocol( |
+ const AlternateProtocols alternate_protocols = |
+ session_->http_server_properties()->GetAlternateProtocols( |
HostPortPair::FromURL(request_.url)); |
- EXPECT_EQ(QUIC, alternate.protocol); |
+ for (const AlternateProtocolInfo& alternate : alternate_protocols) { |
+ if (alternate.protocol == QUIC) { |
+ return; |
+ } |
+ } |
+ EXPECT_FALSE(true) << "No QUIC alternate protocol found."; |
} |
void AddHangingNonAlternateProtocolSocketData() { |