Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(443)

Unified Diff: net/quic/quic_network_transaction_unittest.cc

Issue 665083009: ABANDONED Handle multiple AlternateProtocols for each HostPortPair. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ab698f39629aa756e42f9a3beda43559801e8539..b6eb54a518ca64edad3c91da19a17ad8c744a884 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -276,26 +276,34 @@ class QuicNetworkTransactionTest
void AddQuicAlternateProtocolMapping(
MockCryptoClientStream::HandshakeMode handshake_mode) {
crypto_client_stream_factory_.set_handshake_mode(handshake_mode);
- session_->http_server_properties()->SetAlternateProtocol(
+ session_->http_server_properties()->AddAlternateProtocol(
HostPortPair::FromURL(request_.url), 80, QUIC, 1);
}
void ExpectBrokenAlternateProtocolMapping() {
ASSERT_TRUE(session_->http_server_properties()->HasAlternateProtocol(
HostPortPair::FromURL(request_.url)));
- const AlternateProtocolInfo alternate =
+ const AlternateProtocols alternate_protocols =
session_->http_server_properties()->GetAlternateProtocol(
HostPortPair::FromURL(request_.url));
- EXPECT_EQ(ALTERNATE_PROTOCOL_BROKEN, alternate.protocol);
+ for (AlternateProtocols::const_iterator it = alternate_protocols.begin();
+ it != alternate_protocols.end();
+ ++it) {
+ if (it->protocol == ALTERNATE_PROTOCOL_BROKEN) {
+ return;
+ }
+ }
+ EXPECT_FALSE(true) << "No broken protocol found.";
}
void ExpectQuicAlternateProtocolMapping() {
ASSERT_TRUE(session_->http_server_properties()->HasAlternateProtocol(
HostPortPair::FromURL(request_.url)));
- const AlternateProtocolInfo alternate =
+ const AlternateProtocols alternate_protocols =
session_->http_server_properties()->GetAlternateProtocol(
HostPortPair::FromURL(request_.url));
- EXPECT_EQ(QUIC, alternate.protocol);
+ ASSERT_EQ(1u, alternate_protocols.size());
+ EXPECT_EQ(QUIC, alternate_protocols[0].protocol);
}
void AddHangingNonAlternateProtocolSocketData() {

Powered by Google App Engine
This is Rietveld 408576698