Index: net/http/http_server_properties_impl_unittest.cc |
diff --git a/net/http/http_server_properties_impl_unittest.cc b/net/http/http_server_properties_impl_unittest.cc |
index ae6302b52c32ab3b6a7d62594b9b319e27cda1fc..d6c2c1c9e0b6f050ab4d552cd200474e0f55859a 100644 |
--- a/net/http/http_server_properties_impl_unittest.cc |
+++ b/net/http/http_server_properties_impl_unittest.cc |
@@ -290,9 +290,9 @@ |
EXPECT_EQ(NPN_SPDY_3, it->second.protocol); |
ASSERT_TRUE(HasAlternateProtocol(test_host_port_pair1)); |
- const AlternativeService alternative_service( |
- NPN_SPDY_3, test_host_port_pair1.host(), 443); |
- EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service)); |
+ ASSERT_TRUE(HasAlternateProtocol(test_host_port_pair2)); |
+ alternate = impl_.GetAlternateProtocol(test_host_port_pair1); |
+ EXPECT_TRUE(alternate.is_broken); |
alternate = impl_.GetAlternateProtocol(test_host_port_pair2); |
EXPECT_EQ(123, alternate.port); |
EXPECT_EQ(NPN_SPDY_3, alternate.protocol); |
@@ -326,15 +326,13 @@ |
impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 1.0); |
impl_.SetBrokenAlternateProtocol(test_host_port_pair); |
ASSERT_TRUE(HasAlternateProtocol(test_host_port_pair)); |
- const AlternativeService alternative_service(NPN_SPDY_3, |
- test_host_port_pair.host(), 443); |
- EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service)); |
+ AlternateProtocolInfo alternate = |
+ impl_.GetAlternateProtocol(test_host_port_pair); |
+ EXPECT_TRUE(alternate.is_broken); |
impl_.SetAlternateProtocol(test_host_port_pair, 1234, NPN_SPDY_3, 1.0); |
- EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service)); |
- const AlternateProtocolInfo alternate = |
- impl_.GetAlternateProtocol(test_host_port_pair); |
- EXPECT_EQ(1234, alternate.port); |
+ alternate = impl_.GetAlternateProtocol(test_host_port_pair); |
+ EXPECT_TRUE(alternate.is_broken) << "Second attempt should be ignored."; |
} |
TEST_F(AlternateProtocolServerPropertiesTest, ClearBroken) { |
@@ -342,11 +340,11 @@ |
impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 1.0); |
impl_.SetBrokenAlternateProtocol(test_host_port_pair); |
ASSERT_TRUE(HasAlternateProtocol(test_host_port_pair)); |
- const AlternativeService alternative_service(NPN_SPDY_3, |
- test_host_port_pair.host(), 443); |
- EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service)); |
+ AlternateProtocolInfo alternate = |
+ impl_.GetAlternateProtocol(test_host_port_pair); |
+ EXPECT_TRUE(alternate.is_broken); |
impl_.ClearAlternateProtocol(test_host_port_pair); |
- EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service)); |
+ EXPECT_FALSE(HasAlternateProtocol(test_host_port_pair)); |
} |
TEST_F(AlternateProtocolServerPropertiesTest, Forced) { |
@@ -458,6 +456,22 @@ |
impl_.SetBrokenAlternateProtocol(canonical_port_pair); |
EXPECT_FALSE(HasAlternateProtocol(test_host_port_pair)); |
+} |
+ |
+TEST_F(AlternateProtocolServerPropertiesTest, CanonicalBroken2) { |
+ HostPortPair test_host_port_pair("foo.c.youtube.com", 80); |
+ HostPortPair canonical_port_pair("bar.c.youtube.com", 80); |
+ |
+ AlternateProtocolInfo canonical_protocol(1234, QUIC, 1); |
+ |
+ impl_.SetAlternateProtocol(canonical_port_pair, canonical_protocol.port, |
+ canonical_protocol.protocol, |
+ canonical_protocol.probability); |
+ |
+ impl_.SetBrokenAlternateProtocol(test_host_port_pair); |
+ AlternateProtocolInfo alternate = |
+ impl_.GetAlternateProtocol(test_host_port_pair); |
+ EXPECT_TRUE(alternate.is_broken); |
} |
TEST_F(AlternateProtocolServerPropertiesTest, ClearWithCanonical) { |