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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_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: Rebase. Created 5 years, 11 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/base/net_log_util.cc ('k') | net/http/http_server_properties.h » ('j') | net/http/http_server_properties.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_transaction_unittest.cc
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 136791ec5bea3af66d2574b228272ccf6e8becb0..d3c40dea9d45a7c16cfe247496c9fd257bf80793 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -7602,7 +7602,7 @@ scoped_refptr<HttpNetworkSession> SetupSessionForGroupNameTests(
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
- http_server_properties->SetAlternateProtocol(
+ http_server_properties->AddAlternateProtocol(
HostPortPair("host.with.alternate", 80), 443,
AlternateProtocolFromNextProto(next_proto), 1);
@@ -8513,11 +8513,12 @@ TEST_P(HttpNetworkTransactionTest, HonorAlternateProtocolHeader) {
EXPECT_EQ("hello world", response_data);
ASSERT_TRUE(http_server_properties.HasAlternateProtocol(http_host_port_pair));
- const AlternateProtocolInfo alternate =
- http_server_properties.GetAlternateProtocol(http_host_port_pair);
+ const AlternateProtocols alternate_protocols =
+ http_server_properties.GetAlternateProtocols(http_host_port_pair);
+ ASSERT_EQ(1u, alternate_protocols.size());
AlternateProtocolInfo expected_alternate(
443, AlternateProtocolFromNextProto(GetParam()), 1);
- EXPECT_TRUE(expected_alternate.Equals(alternate));
+ EXPECT_TRUE(expected_alternate.Equals(alternate_protocols[0]));
}
TEST_P(HttpNetworkTransactionTest,
@@ -8549,7 +8550,7 @@ TEST_P(HttpNetworkTransactionTest,
session->http_server_properties();
// Port must be < 1024, or the header will be ignored (since initial port was
// port 80 (another restricted port).
- http_server_properties->SetAlternateProtocol(
+ http_server_properties->AddAlternateProtocol(
HostPortPair::FromURL(request.url),
666 /* port is ignored by MockConnect anyway */,
AlternateProtocolFromNextProto(GetParam()), 1);
@@ -8573,9 +8574,11 @@ TEST_P(HttpNetworkTransactionTest,
ASSERT_TRUE(http_server_properties->HasAlternateProtocol(
HostPortPair::FromURL(request.url)));
- const AlternateProtocolInfo alternate =
- http_server_properties->GetAlternateProtocol(
+ const AlternateProtocols alternate_protocols =
+ http_server_properties->GetAlternateProtocols(
HostPortPair::FromURL(request.url));
+ ASSERT_EQ(1u, alternate_protocols.size());
+ const AlternateProtocolInfo alternate = alternate_protocols[0];
EXPECT_TRUE(alternate.is_broken);
}
@@ -8611,10 +8614,10 @@ TEST_P(HttpNetworkTransactionTest,
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
const int kUnrestrictedAlternatePort = 1024;
- http_server_properties->SetAlternateProtocol(
+ http_server_properties->AddAlternateProtocol(
HostPortPair::FromURL(restricted_port_request.url),
- kUnrestrictedAlternatePort,
- AlternateProtocolFromNextProto(GetParam()), 1);
+ kUnrestrictedAlternatePort, AlternateProtocolFromNextProto(GetParam()),
+ 1);
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -8662,10 +8665,10 @@ TEST_P(HttpNetworkTransactionTest,
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
const int kUnrestrictedAlternatePort = 1024;
- http_server_properties->SetAlternateProtocol(
+ http_server_properties->AddAlternateProtocol(
HostPortPair::FromURL(restricted_port_request.url),
- kUnrestrictedAlternatePort,
- AlternateProtocolFromNextProto(GetParam()), 1);
+ kUnrestrictedAlternatePort, AlternateProtocolFromNextProto(GetParam()),
+ 1);
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -8710,10 +8713,9 @@ TEST_P(HttpNetworkTransactionTest,
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
const int kRestrictedAlternatePort = 80;
- http_server_properties->SetAlternateProtocol(
+ http_server_properties->AddAlternateProtocol(
HostPortPair::FromURL(restricted_port_request.url),
- kRestrictedAlternatePort,
- AlternateProtocolFromNextProto(GetParam()), 1);
+ kRestrictedAlternatePort, AlternateProtocolFromNextProto(GetParam()), 1);
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -8759,10 +8761,9 @@ TEST_P(HttpNetworkTransactionTest,
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
const int kRestrictedAlternatePort = 80;
- http_server_properties->SetAlternateProtocol(
+ http_server_properties->AddAlternateProtocol(
HostPortPair::FromURL(unrestricted_port_request.url),
- kRestrictedAlternatePort,
- AlternateProtocolFromNextProto(GetParam()), 1);
+ kRestrictedAlternatePort, AlternateProtocolFromNextProto(GetParam()), 1);
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -8807,10 +8808,10 @@ TEST_P(HttpNetworkTransactionTest,
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
const int kUnrestrictedAlternatePort = 1024;
- http_server_properties->SetAlternateProtocol(
+ http_server_properties->AddAlternateProtocol(
HostPortPair::FromURL(unrestricted_port_request.url),
- kUnrestrictedAlternatePort,
- AlternateProtocolFromNextProto(GetParam()), 1);
+ kUnrestrictedAlternatePort, AlternateProtocolFromNextProto(GetParam()),
+ 1);
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -8850,9 +8851,8 @@ TEST_P(HttpNetworkTransactionTest, AlternateProtocolUnsafeBlocked) {
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
const int kUnsafePort = 7;
- http_server_properties->SetAlternateProtocol(
- HostPortPair::FromURL(request.url),
- kUnsafePort,
+ http_server_properties->AddAlternateProtocol(
+ HostPortPair::FromURL(request.url), kUnsafePort,
AlternateProtocolFromNextProto(GetParam()), 1);
scoped_ptr<HttpTransaction> trans(
« no previous file with comments | « net/base/net_log_util.cc ('k') | net/http/http_server_properties.h » ('j') | net/http/http_server_properties.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698