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

Unified Diff: net/quic/quic_network_transaction_unittest.cc

Issue 1017453008: Make GetAlternateProtocol return AlternativeService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: s/server/origin/g in other methods too. Created 5 years, 9 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.cc ('k') | no next file » | 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 4d027e21ee1a614b6bb1e76f794255ab337052be..85d5a3d344424f5d30056cd5e14721a1dd98c5bf 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -300,20 +300,18 @@ class QuicNetworkTransactionTest
void ExpectBrokenAlternateProtocolMapping() {
const HostPortPair origin = HostPortPair::FromURL(request_.url);
- const AlternateProtocolInfo alternate =
- session_->http_server_properties()->GetAlternateProtocol(origin);
- EXPECT_NE(UNINITIALIZED_ALTERNATE_PROTOCOL, alternate.protocol);
- const AlternativeService alternative_service(alternate.protocol,
- origin.host(), alternate.port);
+ const AlternativeService alternative_service =
+ session_->http_server_properties()->GetAlternativeService(origin);
+ EXPECT_NE(UNINITIALIZED_ALTERNATE_PROTOCOL, alternative_service.protocol);
EXPECT_TRUE(session_->http_server_properties()->IsAlternativeServiceBroken(
alternative_service));
}
void ExpectQuicAlternateProtocolMapping() {
- const AlternateProtocolInfo alternate =
- session_->http_server_properties()->GetAlternateProtocol(
+ const AlternativeService alternative_service =
+ session_->http_server_properties()->GetAlternativeService(
HostPortPair::FromURL(request_.url));
- EXPECT_EQ(QUIC, alternate.protocol);
+ EXPECT_EQ(QUIC, alternative_service.protocol);
}
void AddHangingNonAlternateProtocolSocketData() {
« no previous file with comments | « net/http/http_stream_factory_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698