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

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: Re: 18. Created 5 years, 10 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
« no previous file with comments | « net/http/http_stream_factory_impl_unittest.cc ('k') | net/quic/quic_stream_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « net/http/http_stream_factory_impl_unittest.cc ('k') | net/quic/quic_stream_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698