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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_network_transaction_unittest.cc

Issue 2140673002: Remove SPDY/3.1 tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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/bidirectional_stream_unittest.cc ('k') | net/http/http_proxy_client_socket_pool_unittest.cc » ('j') | no next file with comments »
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 7bac7b62e25a5daf54be835ab221a605e13e1849..92547395e8688a9ab589ca4172701dbfc8334717 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -108,16 +108,11 @@ namespace net {
namespace {
enum TestCase {
- // Test using the SPDY/3.1 protocol.
- kTestCaseSPDY31,
+ // Test without specifying a stream dependency based on the RequestPriority.
+ kTestCaseNoPriorityDependencies,
- // Test using the HTTP/2 protocol, without specifying a stream
- // dependency based on the RequestPriority.
- kTestCaseHTTP2NoPriorityDependencies,
-
- // Test using the HTTP/2 protocol, specifying a stream
- // dependency based on the RequestPriority.
- kTestCaseHTTP2PriorityDependencies
+ // Test specifying a stream dependency based on the RequestPriority.
+ kTestCasePriorityDependencies
};
const base::string16 kBar(ASCIIToUTF16("bar"));
@@ -285,8 +280,7 @@ class HttpNetworkTransactionTest
protected:
HttpNetworkTransactionTest()
- : spdy_util_(GetProtocol(), GetDependenciesFromPriority()),
- session_deps_(GetProtocol()),
+ : spdy_util_(GetDependenciesFromPriority()),
old_max_group_sockets_(ClientSocketPoolManager::max_sockets_per_group(
HttpNetworkSession::NORMAL_SOCKET_POOL)),
old_max_pool_sockets_(ClientSocketPoolManager::max_sockets_per_pool(
@@ -321,12 +315,8 @@ class HttpNetworkTransactionTest
base::RunLoop().RunUntilIdle();
}
- NextProto GetProtocol() const {
- return GetParam() == kTestCaseSPDY31 ? kProtoSPDY31 : kProtoHTTP2;
- }
-
bool GetDependenciesFromPriority() const {
- return GetParam() == kTestCaseHTTP2PriorityDependencies;
+ return GetParam() == kTestCasePriorityDependencies;
}
// Either |write_failure| specifies a write failure or |read_failure|
@@ -474,9 +464,8 @@ class HttpNetworkTransactionTest
INSTANTIATE_TEST_CASE_P(ProtoPlusDepend,
HttpNetworkTransactionTest,
- testing::Values(kTestCaseSPDY31,
- kTestCaseHTTP2NoPriorityDependencies,
- kTestCaseHTTP2PriorityDependencies));
+ testing::Values(kTestCaseNoPriorityDependencies,
+ kTestCasePriorityDependencies));
namespace {
@@ -1427,8 +1416,8 @@ void HttpNetworkTransactionTest::PreconnectErrorResendRequestTest(
SSLSocketDataProvider ssl1(ASYNC, OK);
SSLSocketDataProvider ssl2(ASYNC, OK);
if (use_spdy) {
- ssl1.SetNextProto(GetProtocol());
- ssl2.SetNextProto(GetProtocol());
+ ssl1.SetNextProto(kProtoHTTP2);
+ ssl2.SetNextProto(kProtoHTTP2);
}
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl1);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl2);
@@ -4504,7 +4493,7 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyGet) {
session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback1;
@@ -4566,7 +4555,7 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyGetWithSessionRace) {
session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback1;
@@ -4665,7 +4654,7 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyGetWithProxyAuth) {
session_deps_.socket_factory->AddSocketDataProvider(&data);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback1;
@@ -4762,7 +4751,7 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyConnectHttps) {
session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
SSLSocketDataProvider ssl2(ASYNC, OK);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl2);
@@ -4791,7 +4780,7 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyConnectHttps) {
// Test a SPDY CONNECT through an HTTPS Proxy to a SPDY server.
TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyConnectSpdy) {
- SpdyTestUtil spdy_util_wrapped(GetProtocol(), GetDependenciesFromPriority());
+ SpdyTestUtil spdy_util_wrapped(GetDependenciesFromPriority());
HttpRequestInfo request;
request.method = "GET";
@@ -4851,10 +4840,10 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyConnectSpdy) {
session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
SSLSocketDataProvider ssl2(ASYNC, OK);
- ssl2.SetNextProto(GetProtocol());
+ ssl2.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl2);
TestCompletionCallback callback1;
@@ -4922,10 +4911,10 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyConnectFailure) {
session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
SSLSocketDataProvider ssl2(ASYNC, OK);
- ssl2.SetNextProto(GetProtocol());
+ ssl2.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl2);
TestCompletionCallback callback1;
@@ -4984,14 +4973,8 @@ TEST_P(HttpNetworkTransactionTest,
// CONNECT to mail.example.org:443 via SPDY.
SpdyHeaderBlock connect2_block;
- spdy_util_.MaybeAddVersionHeader(&connect2_block);
connect2_block[spdy_util_.GetMethodKey()] = "CONNECT";
- if (GetProtocol() == kProtoHTTP2) {
- connect2_block[spdy_util_.GetHostKey()] = "mail.example.org:443";
- } else {
- connect2_block[spdy_util_.GetHostKey()] = "mail.example.org";
- connect2_block[spdy_util_.GetPathKey()] = "mail.example.org:443";
- }
+ connect2_block[spdy_util_.GetHostKey()] = "mail.example.org:443";
std::unique_ptr<SpdySerializedFrame> connect2(
spdy_util_.ConstructSpdySyn(3, std::move(connect2_block), LOWEST, false));
@@ -5034,7 +5017,7 @@ TEST_P(HttpNetworkTransactionTest,
session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
SSLSocketDataProvider ssl2(ASYNC, OK);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl2);
@@ -5158,7 +5141,7 @@ TEST_P(HttpNetworkTransactionTest,
session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
SSLSocketDataProvider ssl2(ASYNC, OK);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl2);
@@ -5264,7 +5247,7 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyLoadTimingTwoHttpRequests) {
session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback;
@@ -7697,7 +7680,7 @@ TEST_P(HttpNetworkTransactionTest, RedirectOfHttpsConnectViaSpdyProxy) {
SequencedSocketData data(data_reads, arraysize(data_reads), data_writes,
arraysize(data_writes));
SSLSocketDataProvider proxy_ssl(ASYNC, OK); // SSL to the proxy
- proxy_ssl.SetNextProto(GetProtocol());
+ proxy_ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSocketDataProvider(&data);
session_deps_.socket_factory->AddSSLSocketDataProvider(&proxy_ssl);
@@ -7804,7 +7787,7 @@ TEST_P(HttpNetworkTransactionTest,
SequencedSocketData data(data_reads, arraysize(data_reads), data_writes,
arraysize(data_writes));
SSLSocketDataProvider proxy_ssl(ASYNC, OK); // SSL to the proxy
- proxy_ssl.SetNextProto(GetProtocol());
+ proxy_ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSocketDataProvider(&data);
session_deps_.socket_factory->AddSSLSocketDataProvider(&proxy_ssl);
@@ -7902,7 +7885,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthSpdyProxy) {
session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
// Negotiate SPDY to the proxy
SSLSocketDataProvider proxy(ASYNC, OK);
- proxy.SetNextProto(GetProtocol());
+ proxy.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&proxy);
// Vanilla SSL to the server
SSLSocketDataProvider server(ASYNC, OK);
@@ -8023,7 +8006,7 @@ TEST_P(HttpNetworkTransactionTest, CrossOriginSPDYProxyPush) {
session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
// Negotiate SPDY to the proxy
SSLSocketDataProvider proxy(ASYNC, OK);
- proxy.SetNextProto(GetProtocol());
+ proxy.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&proxy);
std::unique_ptr<HttpTransaction> trans(
@@ -8134,7 +8117,7 @@ TEST_P(HttpNetworkTransactionTest, CrossOriginProxyPushCorrectness) {
session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
// Negotiate SPDY to the proxy
SSLSocketDataProvider proxy(ASYNC, OK);
- proxy.SetNextProto(GetProtocol());
+ proxy.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&proxy);
std::unique_ptr<HttpTransaction> trans(
@@ -8220,7 +8203,7 @@ TEST_P(HttpNetworkTransactionTest, SameOriginProxyPushCorrectness) {
session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
// Negotiate SPDY to the proxy
SSLSocketDataProvider proxy(ASYNC, OK);
- proxy.SetNextProto(GetProtocol());
+ proxy.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&proxy);
std::unique_ptr<HttpTransaction> trans(
@@ -9067,14 +9050,13 @@ struct GroupNameTest {
};
std::unique_ptr<HttpNetworkSession> SetupSessionForGroupNameTests(
- NextProto next_proto,
SpdySessionDependencies* session_deps_) {
std::unique_ptr<HttpNetworkSession> session(CreateSession(session_deps_));
HttpServerProperties* http_server_properties =
session->http_server_properties();
AlternativeService alternative_service(
- AlternateProtocolFromNextProto(next_proto), "", 444);
+ AlternateProtocolFromNextProto(kProtoHTTP2), "", 444);
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
http_server_properties->SetAlternativeService(
url::SchemeHostPort("https", "host.with.alternate", 443),
@@ -9141,7 +9123,7 @@ TEST_P(HttpNetworkTransactionTest, GroupNameForDirectConnections) {
session_deps_.proxy_service =
ProxyService::CreateFixed(tests[i].proxy_server);
std::unique_ptr<HttpNetworkSession> session(
- SetupSessionForGroupNameTests(GetProtocol(), &session_deps_));
+ SetupSessionForGroupNameTests(&session_deps_));
HttpNetworkSessionPeer peer(session.get());
CaptureGroupNameTransportSocketPool* transport_conn_pool =
@@ -9201,7 +9183,7 @@ TEST_P(HttpNetworkTransactionTest, GroupNameForHTTPProxyConnections) {
session_deps_.proxy_service =
ProxyService::CreateFixed(tests[i].proxy_server);
std::unique_ptr<HttpNetworkSession> session(
- SetupSessionForGroupNameTests(GetProtocol(), &session_deps_));
+ SetupSessionForGroupNameTests(&session_deps_));
HttpNetworkSessionPeer peer(session.get());
@@ -9269,7 +9251,7 @@ TEST_P(HttpNetworkTransactionTest, GroupNameForSOCKSConnections) {
session_deps_.proxy_service =
ProxyService::CreateFixed(tests[i].proxy_server);
std::unique_ptr<HttpNetworkSession> session(
- SetupSessionForGroupNameTests(GetProtocol(), &session_deps_));
+ SetupSessionForGroupNameTests(&session_deps_));
HttpNetworkSessionPeer peer(session.get());
@@ -9918,11 +9900,6 @@ TEST_P(HttpNetworkTransactionTest, ChangeAuthRealms) {
}
TEST_P(HttpNetworkTransactionTest, HonorAlternativeServiceHeader) {
- // SPDY/3.1 is not supported.
- if (GetProtocol() != kProtoHTTP2) {
- return;
- }
-
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead(kAlternativeServiceHttpHeader),
@@ -9974,7 +9951,7 @@ TEST_P(HttpNetworkTransactionTest, HonorAlternativeServiceHeader) {
alternative_service_vector =
http_server_properties->GetAlternativeServices(test_server);
ASSERT_EQ(1u, alternative_service_vector.size());
- EXPECT_EQ(AlternateProtocolFromNextProto(GetProtocol()),
+ EXPECT_EQ(AlternateProtocolFromNextProto(kProtoHTTP2),
alternative_service_vector[0].protocol);
EXPECT_EQ("mail.example.org", alternative_service_vector[0].host);
EXPECT_EQ(443, alternative_service_vector[0].port);
@@ -10065,7 +10042,7 @@ TEST_P(HttpNetworkTransactionTest,
HttpServerProperties* http_server_properties =
session->http_server_properties();
AlternativeService alternative_service(
- AlternateProtocolFromNextProto(GetProtocol()), "different.example.org",
+ AlternateProtocolFromNextProto(kProtoHTTP2), "different.example.org",
444);
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
http_server_properties->SetAlternativeService(
@@ -10107,7 +10084,7 @@ TEST_P(HttpNetworkTransactionTest,
HttpServerProperties* http_server_properties =
session->http_server_properties();
AlternativeService alternative_service(
- AlternateProtocolFromNextProto(GetProtocol()), "", 444);
+ AlternateProtocolFromNextProto(kProtoHTTP2), "", 444);
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
http_server_properties->SetAlternativeService(
url::SchemeHostPort(request.url), alternative_service, expiration);
@@ -10179,11 +10156,6 @@ TEST_P(HttpNetworkTransactionTest, ClearAlternativeServices) {
}
TEST_P(HttpNetworkTransactionTest, HonorMultipleAlternativeServiceHeaders) {
- // SPDY/3.1 is not supported.
- if (GetProtocol() != kProtoHTTP2) {
- return;
- }
-
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Alt-Svc: h2=\"www.example.com:443\","),
@@ -10235,11 +10207,11 @@ TEST_P(HttpNetworkTransactionTest, HonorMultipleAlternativeServiceHeaders) {
alternative_service_vector =
http_server_properties->GetAlternativeServices(test_server);
ASSERT_EQ(2u, alternative_service_vector.size());
- EXPECT_EQ(AlternateProtocolFromNextProto(GetProtocol()),
+ EXPECT_EQ(AlternateProtocolFromNextProto(kProtoHTTP2),
alternative_service_vector[0].protocol);
EXPECT_EQ("www.example.com", alternative_service_vector[0].host);
EXPECT_EQ(443, alternative_service_vector[0].port);
- EXPECT_EQ(AlternateProtocolFromNextProto(GetProtocol()),
+ EXPECT_EQ(AlternateProtocolFromNextProto(kProtoHTTP2),
alternative_service_vector[1].protocol);
EXPECT_EQ("www.example.org", alternative_service_vector[1].host);
EXPECT_EQ(1234, alternative_service_vector[1].port);
@@ -10410,7 +10382,7 @@ TEST_P(HttpNetworkTransactionTest,
// Port must be < 1024, or the header will be ignored (since initial port was
// port 80 (another restricted port).
const AlternativeService alternative_service(
- AlternateProtocolFromNextProto(GetProtocol()), "www.example.org",
+ AlternateProtocolFromNextProto(kProtoHTTP2), "www.example.org",
666); // Port is ignored by MockConnect anyway.
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
http_server_properties->SetAlternativeService(server, alternative_service,
@@ -10475,7 +10447,7 @@ TEST_P(HttpNetworkTransactionTest,
session->http_server_properties();
const int kUnrestrictedAlternatePort = 1024;
AlternativeService alternative_service(
- AlternateProtocolFromNextProto(GetProtocol()), "www.example.org",
+ AlternateProtocolFromNextProto(kProtoHTTP2), "www.example.org",
kUnrestrictedAlternatePort);
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
http_server_properties->SetAlternativeService(
@@ -10529,7 +10501,7 @@ TEST_P(HttpNetworkTransactionTest,
session->http_server_properties();
const int kUnrestrictedAlternatePort = 1024;
AlternativeService alternative_service(
- AlternateProtocolFromNextProto(GetProtocol()), "www.example.org",
+ AlternateProtocolFromNextProto(kProtoHTTP2), "www.example.org",
kUnrestrictedAlternatePort);
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
http_server_properties->SetAlternativeService(
@@ -10581,7 +10553,7 @@ TEST_P(HttpNetworkTransactionTest,
session->http_server_properties();
const int kRestrictedAlternatePort = 80;
AlternativeService alternative_service(
- AlternateProtocolFromNextProto(GetProtocol()), "www.example.org",
+ AlternateProtocolFromNextProto(kProtoHTTP2), "www.example.org",
kRestrictedAlternatePort);
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
http_server_properties->SetAlternativeService(
@@ -10634,7 +10606,7 @@ TEST_P(HttpNetworkTransactionTest,
session->http_server_properties();
const int kRestrictedAlternatePort = 80;
AlternativeService alternative_service(
- AlternateProtocolFromNextProto(GetProtocol()), "www.example.org",
+ AlternateProtocolFromNextProto(kProtoHTTP2), "www.example.org",
kRestrictedAlternatePort);
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
http_server_properties->SetAlternativeService(
@@ -10686,7 +10658,7 @@ TEST_P(HttpNetworkTransactionTest,
session->http_server_properties();
const int kUnrestrictedAlternatePort = 1025;
AlternativeService alternative_service(
- AlternateProtocolFromNextProto(GetProtocol()), "www.example.org",
+ AlternateProtocolFromNextProto(kProtoHTTP2), "www.example.org",
kUnrestrictedAlternatePort);
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
http_server_properties->SetAlternativeService(
@@ -10730,7 +10702,7 @@ TEST_P(HttpNetworkTransactionTest, AlternateProtocolUnsafeBlocked) {
session->http_server_properties();
const int kUnsafePort = 7;
AlternativeService alternative_service(
- AlternateProtocolFromNextProto(GetProtocol()), "www.example.org",
+ AlternateProtocolFromNextProto(kProtoHTTP2), "www.example.org",
kUnsafePort);
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
http_server_properties->SetAlternativeService(
@@ -10777,7 +10749,7 @@ TEST_P(HttpNetworkTransactionTest, UseAlternateProtocolForNpnSpdy) {
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl_http11);
SSLSocketDataProvider ssl_http2(ASYNC, OK);
- ssl_http2.SetNextProto(GetProtocol());
+ ssl_http2.SetNextProto(kProtoHTTP2);
ssl_http2.cert =
ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem");
ASSERT_TRUE(ssl_http2.cert.get());
@@ -10844,11 +10816,6 @@ TEST_P(HttpNetworkTransactionTest, UseAlternateProtocolForNpnSpdy) {
}
TEST_P(HttpNetworkTransactionTest, AlternateProtocolWithSpdyLateBinding) {
- // SPDY/3.1 is not supported.
- if (GetProtocol() != kProtoHTTP2) {
- return;
- }
-
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("https://www.example.org/");
@@ -10913,7 +10880,7 @@ TEST_P(HttpNetworkTransactionTest, AlternateProtocolWithSpdyLateBinding) {
session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
SSLSocketDataProvider ssl_http2(ASYNC, OK);
- ssl_http2.SetNextProto(GetProtocol());
+ ssl_http2.SetNextProto(kProtoHTTP2);
ssl_http2.cert =
ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem");
ASSERT_TRUE(ssl_http2.cert);
@@ -10973,11 +10940,6 @@ TEST_P(HttpNetworkTransactionTest, AlternateProtocolWithSpdyLateBinding) {
}
TEST_P(HttpNetworkTransactionTest, StallAlternativeServiceForNpnSpdy) {
- // SPDY/3.1 is not supported.
- if (GetProtocol() != kProtoHTTP2) {
- return;
- }
-
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("https://www.example.org/");
@@ -11135,7 +11097,7 @@ TEST_P(HttpNetworkTransactionTest, UseAlternativeServiceForTunneledNpnSpdy) {
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl_http11);
SSLSocketDataProvider ssl_http2(ASYNC, OK);
- ssl_http2.SetNextProto(GetProtocol());
+ ssl_http2.SetNextProto(kProtoHTTP2);
ssl_http2.cert =
ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem");
ASSERT_TRUE(ssl_http2.cert);
@@ -11245,7 +11207,7 @@ TEST_P(HttpNetworkTransactionTest,
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl_http11);
SSLSocketDataProvider ssl_http2(ASYNC, OK);
- ssl_http2.SetNextProto(GetProtocol());
+ ssl_http2.SetNextProto(kProtoHTTP2);
ssl_http2.cert =
ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem");
ASSERT_TRUE(ssl_http2.cert);
@@ -11988,7 +11950,7 @@ TEST_P(HttpNetworkTransactionTest, SpdyPostNPNServerHangup) {
request.load_flags = 0;
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
std::unique_ptr<SpdySerializedFrame> req(
@@ -12423,7 +12385,7 @@ TEST_P(HttpNetworkTransactionTest, PreconnectWithExistingSpdySession) {
session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -12825,7 +12787,7 @@ TEST_P(HttpNetworkTransactionTest, UseIPConnectionPooling) {
pool_peer.DisableDomainAuthenticationVerification();
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
std::unique_ptr<SpdySerializedFrame> host1_req(
@@ -12920,7 +12882,7 @@ TEST_P(HttpNetworkTransactionTest, UseIPConnectionPoolingAfterResolution) {
pool_peer.DisableDomainAuthenticationVerification();
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
std::unique_ptr<SpdySerializedFrame> host1_req(
@@ -13046,7 +13008,7 @@ TEST_P(HttpNetworkTransactionTest,
pool_peer.DisableDomainAuthenticationVerification();
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
std::unique_ptr<SpdySerializedFrame> host1_req(
@@ -13174,7 +13136,7 @@ TEST_P(HttpNetworkTransactionTest, DoNotUseSpdySessionForHttp) {
arraysize(writes2));
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
session_deps_.socket_factory->AddSocketDataProvider(&data1);
session_deps_.socket_factory->AddSocketDataProvider(&data2);
@@ -13227,7 +13189,7 @@ class AltSvcCertificateVerificationTest : public HttpNetworkTransactionTest {
EXPECT_TRUE(
cert->VerifyNameMatch(alternative.host(), &common_name_fallback_used));
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
ssl.cert = cert;
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
@@ -13295,7 +13257,7 @@ class AltSvcCertificateVerificationTest : public HttpNetworkTransactionTest {
HttpServerProperties* http_server_properties =
session->http_server_properties();
AlternativeService alternative_service(
- AlternateProtocolFromNextProto(GetProtocol()), alternative);
+ AlternateProtocolFromNextProto(kProtoHTTP2), alternative);
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
http_server_properties->SetAlternativeService(server, alternative_service,
expiration);
@@ -13345,9 +13307,8 @@ class AltSvcCertificateVerificationTest : public HttpNetworkTransactionTest {
INSTANTIATE_TEST_CASE_P(ProtoPlusDepend,
AltSvcCertificateVerificationTest,
- testing::Values(kTestCaseSPDY31,
- kTestCaseHTTP2NoPriorityDependencies,
- kTestCaseHTTP2PriorityDependencies));
+ testing::Values(kTestCaseNoPriorityDependencies,
+ kTestCasePriorityDependencies));
// The alternative service host must exhibit a certificate that is valid for the
// origin host. Test that this is enforced when pooling to an existing
@@ -13399,7 +13360,7 @@ TEST_P(HttpNetworkTransactionTest, AlternativeServiceNotOnHttp11) {
HttpServerProperties* http_server_properties =
session->http_server_properties();
AlternativeService alternative_service(
- AlternateProtocolFromNextProto(GetProtocol()), alternative);
+ AlternateProtocolFromNextProto(kProtoHTTP2), alternative);
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
http_server_properties->SetAlternativeService(server, alternative_service,
expiration);
@@ -13469,7 +13430,7 @@ TEST_P(HttpNetworkTransactionTest, FailedAlternativeServiceIsNotUserVisible) {
HttpServerProperties* http_server_properties =
session->http_server_properties();
AlternativeService alternative_service(
- AlternateProtocolFromNextProto(GetProtocol()), alternative);
+ AlternateProtocolFromNextProto(kProtoHTTP2), alternative);
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
http_server_properties->SetAlternativeService(server, alternative_service,
expiration);
@@ -13577,7 +13538,7 @@ TEST_P(HttpNetworkTransactionTest, AlternativeServiceShouldNotPoolToHttp11) {
HttpServerProperties* http_server_properties =
session->http_server_properties();
AlternativeService alternative_service(
- AlternateProtocolFromNextProto(GetProtocol()), alternative);
+ AlternateProtocolFromNextProto(kProtoHTTP2), alternative);
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
http_server_properties->SetAlternativeService(server, alternative_service,
expiration);
@@ -13647,7 +13608,7 @@ TEST_P(HttpNetworkTransactionTest, DoNotUseSpdySessionForHttpOverTunnel) {
const std::string http_url = "http://www.example.org:8080/";
// Separate SPDY util instance for naked and wrapped requests.
- SpdyTestUtil spdy_util_wrapped(GetProtocol(), GetDependenciesFromPriority());
+ SpdyTestUtil spdy_util_wrapped(GetDependenciesFromPriority());
// SPDY GET for HTTPS URL (through CONNECT tunnel)
const HostPortPair host_port_pair("www.example.org", 8080);
@@ -13660,7 +13621,6 @@ TEST_P(HttpNetworkTransactionTest, DoNotUseSpdySessionForHttpOverTunnel) {
// SPDY GET for HTTP URL (through the proxy, but not the tunnel).
SpdyHeaderBlock req2_block;
- spdy_util_.MaybeAddVersionHeader(&req2_block);
req2_block[spdy_util_.GetMethodKey()] = "GET";
req2_block[spdy_util_.GetHostKey()] = "www.example.org:8080";
req2_block[spdy_util_.GetSchemeKey()] = "http";
@@ -13708,10 +13668,10 @@ TEST_P(HttpNetworkTransactionTest, DoNotUseSpdySessionForHttpOverTunnel) {
TestNetLog log;
session_deps_.net_log = &log;
SSLSocketDataProvider ssl1(ASYNC, OK); // to the proxy
- ssl1.SetNextProto(GetProtocol());
+ ssl1.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl1);
SSLSocketDataProvider ssl2(ASYNC, OK); // to the server
- ssl2.SetNextProto(GetProtocol());
+ ssl2.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl2);
session_deps_.socket_factory->AddSocketDataProvider(&data1);
@@ -13774,7 +13734,7 @@ TEST_P(HttpNetworkTransactionTest, DoNotUseSpdySessionIfCertDoesNotMatch) {
const std::string ip_addr = "1.2.3.4";
// Second SpdyTestUtil instance for the second socket.
- SpdyTestUtil spdy_util_secure(GetProtocol(), GetDependenciesFromPriority());
+ SpdyTestUtil spdy_util_secure(GetDependenciesFromPriority());
// SPDY GET for HTTP URL (through SPDY proxy)
SpdyHeaderBlock headers(
@@ -13832,7 +13792,7 @@ TEST_P(HttpNetworkTransactionTest, DoNotUseSpdySessionIfCertDoesNotMatch) {
NULL));
SSLSocketDataProvider ssl1(ASYNC, OK); // to the proxy
- ssl1.SetNextProto(GetProtocol());
+ ssl1.SetNextProto(kProtoHTTP2);
// Load a valid cert. Note, that this does not need to
// be valid for proxy because the MockSSLClientSocket does
// not actually verify it. But SpdySession will use this
@@ -13843,7 +13803,7 @@ TEST_P(HttpNetworkTransactionTest, DoNotUseSpdySessionIfCertDoesNotMatch) {
session_deps_.socket_factory->AddSocketDataProvider(&data1);
SSLSocketDataProvider ssl2(ASYNC, OK); // to the server
- ssl2.SetNextProto(GetProtocol());
+ ssl2.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl2);
session_deps_.socket_factory->AddSocketDataProvider(&data2);
@@ -13919,12 +13879,12 @@ TEST_P(HttpNetworkTransactionTest, ErrorSocketNotConnected) {
arraysize(writes2));
SSLSocketDataProvider ssl1(ASYNC, OK);
- ssl1.SetNextProto(GetProtocol());
+ ssl1.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl1);
session_deps_.socket_factory->AddSocketDataProvider(&data1);
SSLSocketDataProvider ssl2(ASYNC, OK);
- ssl2.SetNextProto(GetProtocol());
+ ssl2.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl2);
session_deps_.socket_factory->AddSocketDataProvider(&data2);
@@ -13969,9 +13929,9 @@ TEST_P(HttpNetworkTransactionTest, CloseIdleSpdySessionToOpenNewOne) {
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
SSLSocketDataProvider ssl1(ASYNC, OK);
- ssl1.SetNextProto(GetProtocol());
+ ssl1.SetNextProto(kProtoHTTP2);
SSLSocketDataProvider ssl2(ASYNC, OK);
- ssl2.SetNextProto(GetProtocol());
+ ssl2.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl1);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl2);
@@ -13991,7 +13951,7 @@ TEST_P(HttpNetworkTransactionTest, CloseIdleSpdySessionToOpenNewOne) {
// Use a separate test instance for the separate SpdySession that will be
// created.
- SpdyTestUtil spdy_util_2(GetProtocol(), GetDependenciesFromPriority());
+ SpdyTestUtil spdy_util_2(GetDependenciesFromPriority());
std::unique_ptr<SequencedSocketData> spdy1_data(
new SequencedSocketData(spdy1_reads, arraysize(spdy1_reads), spdy1_writes,
arraysize(spdy1_writes)));
@@ -15839,7 +15799,7 @@ TEST_P(HttpNetworkTransactionTest, TokenBindingSpdy) {
SSLSocketDataProvider ssl(ASYNC, OK);
ssl.token_binding_negotiated = true;
ssl.token_binding_key_param = TB_PARAM_ECDSAP256;
- ssl.SetNextProto(GetProtocol());
+ ssl.SetNextProto(kProtoHTTP2);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
std::unique_ptr<SpdySerializedFrame> resp(
« no previous file with comments | « net/http/bidirectional_stream_unittest.cc ('k') | net/http/http_proxy_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698