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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_server_properties_impl_unittest.cc

Issue 377063002: Revert of Add a probability to Alternate-Protocol support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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_server_properties_impl.cc ('k') | net/http/http_stream_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f21c9692f255e4b5228fa474660d3828cfa818a6..e3b08d46d5f4f87be1300befc4578c1f54368ab4 100644
--- a/net/http/http_server_properties_impl_unittest.cc
+++ b/net/http/http_server_properties_impl_unittest.cc
@@ -243,37 +243,14 @@
TEST_F(AlternateProtocolServerPropertiesTest, Basic) {
HostPortPair test_host_port_pair("foo", 80);
EXPECT_FALSE(impl_.HasAlternateProtocol(test_host_port_pair));
- impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 1);
+ impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3);
ASSERT_TRUE(impl_.HasAlternateProtocol(test_host_port_pair));
- const AlternateProtocolInfo alternate =
+ const PortAlternateProtocolPair alternate =
impl_.GetAlternateProtocol(test_host_port_pair);
EXPECT_EQ(443, alternate.port);
EXPECT_EQ(NPN_SPDY_3, alternate.protocol);
impl_.Clear();
- EXPECT_FALSE(impl_.HasAlternateProtocol(test_host_port_pair));
-}
-
-TEST_F(AlternateProtocolServerPropertiesTest, Probability) {
- impl_.SetAlternateProtocolProbabilityThreshold(.25);
-
- HostPortPair test_host_port_pair("foo", 80);
- impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, .5);
-
- ASSERT_TRUE(impl_.HasAlternateProtocol(test_host_port_pair));
- const AlternateProtocolInfo alternate =
- impl_.GetAlternateProtocol(test_host_port_pair);
- EXPECT_EQ(443, alternate.port);
- EXPECT_EQ(NPN_SPDY_3, alternate.protocol);
- EXPECT_EQ(.5, alternate.probability);
-}
-
-TEST_F(AlternateProtocolServerPropertiesTest, ProbabilityExcluded) {
- impl_.SetAlternateProtocolProbabilityThreshold(.75);
-
- HostPortPair test_host_port_pair("foo", 80);
-
- impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, .5);
EXPECT_FALSE(impl_.HasAlternateProtocol(test_host_port_pair));
}
@@ -281,11 +258,13 @@
HostPortPair test_host_port_pair1("foo1", 80);
impl_.SetBrokenAlternateProtocol(test_host_port_pair1);
HostPortPair test_host_port_pair2("foo2", 80);
- impl_.SetAlternateProtocol(test_host_port_pair2, 443, NPN_SPDY_3, 1);
+ impl_.SetAlternateProtocol(test_host_port_pair2, 443, NPN_SPDY_3);
AlternateProtocolMap alternate_protocol_map(
AlternateProtocolMap::NO_AUTO_EVICT);
- AlternateProtocolInfo port_alternate_protocol_pair(123, NPN_SPDY_3, 1);
+ PortAlternateProtocolPair port_alternate_protocol_pair;
+ port_alternate_protocol_pair.port = 123;
+ port_alternate_protocol_pair.protocol = NPN_SPDY_3;
alternate_protocol_map.Put(test_host_port_pair2,
port_alternate_protocol_pair);
HostPortPair test_host_port_pair3("foo3", 80);
@@ -315,9 +294,9 @@
TEST_F(AlternateProtocolServerPropertiesTest, MRUOfHasAlternateProtocol) {
HostPortPair test_host_port_pair1("foo1", 80);
- impl_.SetAlternateProtocol(test_host_port_pair1, 443, NPN_SPDY_3, 1);
+ impl_.SetAlternateProtocol(test_host_port_pair1, 443, NPN_SPDY_3);
HostPortPair test_host_port_pair2("foo2", 80);
- impl_.SetAlternateProtocol(test_host_port_pair2, 1234, NPN_SPDY_3, 1);
+ impl_.SetAlternateProtocol(test_host_port_pair2, 1234, NPN_SPDY_3);
const net::AlternateProtocolMap& map = impl_.alternate_protocol_map();
net::AlternateProtocolMap::const_iterator it = map.begin();
@@ -335,9 +314,9 @@
TEST_F(AlternateProtocolServerPropertiesTest, MRUOfGetAlternateProtocol) {
HostPortPair test_host_port_pair1("foo1", 80);
- impl_.SetAlternateProtocol(test_host_port_pair1, 443, NPN_SPDY_3, 1);
+ impl_.SetAlternateProtocol(test_host_port_pair1, 443, NPN_SPDY_3);
HostPortPair test_host_port_pair2("foo2", 80);
- impl_.SetAlternateProtocol(test_host_port_pair2, 1234, NPN_SPDY_3, 1);
+ impl_.SetAlternateProtocol(test_host_port_pair2, 1234, NPN_SPDY_3);
const net::AlternateProtocolMap& map = impl_.alternate_protocol_map();
net::AlternateProtocolMap::const_iterator it = map.begin();
@@ -346,7 +325,7 @@
EXPECT_EQ(NPN_SPDY_3, it->second.protocol);
// GetAlternateProtocol should reoder the AlternateProtocol map.
- AlternateProtocolInfo alternate =
+ PortAlternateProtocolPair alternate =
impl_.GetAlternateProtocol(test_host_port_pair1);
EXPECT_EQ(443, alternate.port);
EXPECT_EQ(NPN_SPDY_3, alternate.protocol);
@@ -360,15 +339,14 @@
HostPortPair test_host_port_pair("foo", 80);
impl_.SetBrokenAlternateProtocol(test_host_port_pair);
ASSERT_TRUE(impl_.HasAlternateProtocol(test_host_port_pair));
- AlternateProtocolInfo alternate =
+ PortAlternateProtocolPair alternate =
impl_.GetAlternateProtocol(test_host_port_pair);
EXPECT_EQ(ALTERNATE_PROTOCOL_BROKEN, alternate.protocol);
impl_.SetAlternateProtocol(
test_host_port_pair,
1234,
- NPN_SPDY_3,
- 1);
+ NPN_SPDY_3);
alternate = impl_.GetAlternateProtocol(test_host_port_pair);
EXPECT_EQ(ALTERNATE_PROTOCOL_BROKEN, alternate.protocol)
<< "Second attempt should be ignored.";
@@ -378,7 +356,7 @@
HostPortPair test_host_port_pair("foo", 80);
impl_.SetBrokenAlternateProtocol(test_host_port_pair);
ASSERT_TRUE(impl_.HasAlternateProtocol(test_host_port_pair));
- AlternateProtocolInfo alternate =
+ PortAlternateProtocolPair alternate =
impl_.GetAlternateProtocol(test_host_port_pair);
EXPECT_EQ(ALTERNATE_PROTOCOL_BROKEN, alternate.protocol);
impl_.ClearAlternateProtocol(test_host_port_pair);
@@ -388,19 +366,21 @@
TEST_F(AlternateProtocolServerPropertiesTest, Forced) {
// Test forced alternate protocols.
- AlternateProtocolInfo default_protocol(1234, NPN_SPDY_3, 1);
+ PortAlternateProtocolPair default_protocol;
+ default_protocol.port = 1234;
+ default_protocol.protocol = NPN_SPDY_3;
HttpServerPropertiesImpl::ForceAlternateProtocol(default_protocol);
// Verify the forced protocol.
HostPortPair test_host_port_pair("foo", 80);
EXPECT_TRUE(impl_.HasAlternateProtocol(test_host_port_pair));
- AlternateProtocolInfo alternate =
+ PortAlternateProtocolPair alternate =
impl_.GetAlternateProtocol(test_host_port_pair);
EXPECT_EQ(default_protocol.port, alternate.port);
EXPECT_EQ(default_protocol.protocol, alternate.protocol);
// Verify the real protocol overrides the forced protocol.
- impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 1);
+ impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3);
ASSERT_TRUE(impl_.HasAlternateProtocol(test_host_port_pair));
alternate = impl_.GetAlternateProtocol(test_host_port_pair);
EXPECT_EQ(443, alternate.port);
@@ -422,15 +402,16 @@
HostPortPair canonical_port_pair("bar.c.youtube.com", 80);
EXPECT_FALSE(impl_.HasAlternateProtocol(canonical_port_pair));
- AlternateProtocolInfo canonical_protocol(1234, QUIC, 1);
+ PortAlternateProtocolPair canonical_protocol;
+ canonical_protocol.port = 1234;
+ canonical_protocol.protocol = QUIC;
impl_.SetAlternateProtocol(canonical_port_pair,
canonical_protocol.port,
- canonical_protocol.protocol,
- 1);
+ canonical_protocol.protocol);
// Verify the forced protocol.
ASSERT_TRUE(impl_.HasAlternateProtocol(test_host_port_pair));
- AlternateProtocolInfo alternate =
+ PortAlternateProtocolPair alternate =
impl_.GetAlternateProtocol(test_host_port_pair);
EXPECT_EQ(canonical_protocol.port, alternate.port);
EXPECT_EQ(canonical_protocol.protocol, alternate.protocol);
@@ -444,12 +425,13 @@
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);
+ PortAlternateProtocolPair canonical_protocol;
+ canonical_protocol.port = 1234;
+ canonical_protocol.protocol = QUIC;
impl_.SetAlternateProtocol(canonical_port_pair,
canonical_protocol.port,
- canonical_protocol.protocol,
- canonical_protocol.probability);
+ canonical_protocol.protocol);
impl_.ClearAlternateProtocol(canonical_port_pair);
EXPECT_FALSE(impl_.HasAlternateProtocol(test_host_port_pair));
@@ -459,12 +441,13 @@
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);
+ PortAlternateProtocolPair canonical_protocol;
+ canonical_protocol.port = 1234;
+ canonical_protocol.protocol = QUIC;
impl_.SetAlternateProtocol(canonical_port_pair,
canonical_protocol.port,
- canonical_protocol.protocol,
- canonical_protocol.probability);
+ canonical_protocol.protocol);
impl_.SetBrokenAlternateProtocol(canonical_port_pair);
EXPECT_FALSE(impl_.HasAlternateProtocol(test_host_port_pair));
@@ -474,12 +457,13 @@
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);
+ PortAlternateProtocolPair canonical_protocol;
+ canonical_protocol.port = 1234;
+ canonical_protocol.protocol = QUIC;
impl_.SetAlternateProtocol(canonical_port_pair,
canonical_protocol.port,
- canonical_protocol.protocol,
- canonical_protocol.probability);
+ canonical_protocol.protocol);
impl_.Clear();
EXPECT_FALSE(impl_.HasAlternateProtocol(test_host_port_pair));
« no previous file with comments | « net/http/http_server_properties_impl.cc ('k') | net/http/http_stream_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698