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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_network_transaction_unittest.cc

Issue 9252029: SPDY - default to SPDY/2.1 protocol in unittests (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync with trunk Created 8 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/http/http_network_layer.cc ('k') | net/http/http_pipelined_host_impl_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
===================================================================
--- net/http/http_network_transaction_unittest.cc (revision 119306)
+++ net/http/http_network_transaction_unittest.cc (working copy)
@@ -377,7 +377,7 @@
// This is the expected return from a current server advertising SPDY.
static const char kAlternateProtocolHttpHeader[] =
- "Alternate-Protocol: 443:npn-spdy/2\r\n\r\n";
+ "Alternate-Protocol: 443:npn-spdy/2.1\r\n\r\n";
// Helper functions for validating that AuthChallengeInfo's are correctly
// configured for common cases.
@@ -2541,9 +2541,9 @@
SSLSocketDataProvider ssl(true, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl.next_proto = "spdy/2";
+ ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
- ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback1;
@@ -2628,9 +2628,9 @@
SSLSocketDataProvider ssl(true, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl.next_proto = "spdy/2";
+ ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
- ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback1;
@@ -2723,9 +2723,9 @@
SSLSocketDataProvider ssl(true, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl.next_proto = "spdy/2";
+ ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
- ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
SSLSocketDataProvider ssl2(true, OK);
ssl2.was_npn_negotiated = false;
@@ -2798,15 +2798,15 @@
SSLSocketDataProvider ssl(true, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl.next_proto = "spdy/2";
+ ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
- ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
SSLSocketDataProvider ssl2(true, OK);
ssl2.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl2.next_proto = "spdy/2";
+ ssl2.next_proto = "spdy/2.1";
ssl2.was_npn_negotiated = true;
- ssl2.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl2.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2);
TestCompletionCallback callback1;
@@ -2867,15 +2867,15 @@
SSLSocketDataProvider ssl(true, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl.next_proto = "spdy/2";
+ ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
- ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
SSLSocketDataProvider ssl2(true, OK);
ssl2.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl2.next_proto = "spdy/2";
+ ssl2.next_proto = "spdy/2.1";
ssl2.was_npn_negotiated = true;
- ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2);
TestCompletionCallback callback1;
@@ -5269,9 +5269,9 @@
data_writes, arraysize(data_writes)));
SSLSocketDataProvider proxy_ssl(true, OK); // SSL to the proxy
proxy_ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- proxy_ssl.next_proto = "spdy/2";
+ proxy_ssl.next_proto = "spdy/2.1";
proxy_ssl.was_npn_negotiated = true;
- proxy_ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ proxy_ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSocketDataProvider(data.get());
session_deps.socket_factory.AddSSLSocketDataProvider(&proxy_ssl);
@@ -5389,9 +5389,9 @@
data_writes, arraysize(data_writes)));
SSLSocketDataProvider proxy_ssl(true, OK); // SSL to the proxy
proxy_ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- proxy_ssl.next_proto = "spdy/2";
+ proxy_ssl.next_proto = "spdy/2.1";
proxy_ssl.was_npn_negotiated = true;
- proxy_ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ proxy_ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSocketDataProvider(data.get());
session_deps.socket_factory.AddSSLSocketDataProvider(&proxy_ssl);
@@ -6145,7 +6145,7 @@
session->http_server_properties();
http_server_properties->SetAlternateProtocol(
HostPortPair("host.with.alternate", 80), 443,
- NPN_SPDY_2);
+ NPN_SPDY_21);
return session;
}
@@ -7085,7 +7085,7 @@
http_server_properties.GetAlternateProtocol(http_host_port_pair);
PortAlternateProtocolPair expected_alternate;
expected_alternate.port = 443;
- expected_alternate.protocol = NPN_SPDY_2;
+ expected_alternate.protocol = NPN_SPDY_21;
EXPECT_TRUE(expected_alternate.Equals(alternate));
HttpStreamFactory::set_use_alternate_protocols(false);
@@ -7124,7 +7124,7 @@
http_server_properties->SetAlternateProtocol(
HostPortPair::FromURL(request.url),
666 /* port is ignored by MockConnect anyway */,
- NPN_SPDY_2);
+ NPN_SPDY_21);
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
TestCompletionCallback callback;
@@ -7186,7 +7186,7 @@
http_server_properties->SetAlternateProtocol(
HostPortPair::FromURL(restricted_port_request.url),
kUnrestrictedAlternatePort,
- NPN_SPDY_2);
+ NPN_SPDY_21);
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
TestCompletionCallback callback;
@@ -7235,7 +7235,7 @@
http_server_properties->SetAlternateProtocol(
HostPortPair::FromURL(restricted_port_request.url),
kRestrictedAlternatePort,
- NPN_SPDY_2);
+ NPN_SPDY_21);
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
TestCompletionCallback callback;
@@ -7284,7 +7284,7 @@
http_server_properties->SetAlternateProtocol(
HostPortPair::FromURL(unrestricted_port_request.url),
kRestrictedAlternatePort,
- NPN_SPDY_2);
+ NPN_SPDY_21);
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
TestCompletionCallback callback;
@@ -7333,7 +7333,7 @@
http_server_properties->SetAlternateProtocol(
HostPortPair::FromURL(unrestricted_port_request.url),
kUnrestrictedAlternatePort,
- NPN_SPDY_2);
+ NPN_SPDY_21);
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
TestCompletionCallback callback;
@@ -7424,9 +7424,9 @@
SSLSocketDataProvider ssl(true, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl.next_proto = "spdy/2";
+ ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
- ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
@@ -7526,9 +7526,9 @@
SSLSocketDataProvider ssl(true, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl.next_proto = "spdy/2";
+ ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
- ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<spdy::SpdyFrame> req1(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
@@ -7635,9 +7635,9 @@
SSLSocketDataProvider ssl(true, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl.next_proto = "spdy/2";
+ ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
- ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
MockConnect never_finishing_connect(false, ERR_IO_PENDING);
@@ -7770,9 +7770,9 @@
SSLSocketDataProvider ssl(true, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl.next_proto = "spdy/2";
+ ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
- ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
@@ -7877,9 +7877,9 @@
SSLSocketDataProvider ssl(true, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl.next_proto = "spdy/2";
+ ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
- ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
// Make sure we use ssl for spdy here.
SpdySession::SetSSLMode(true);
@@ -8764,9 +8764,9 @@
SSLSocketDataProvider ssl(true, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl.next_proto = "spdy/2";
+ ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
- ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
@@ -8827,7 +8827,7 @@
MockRead data_reads_1[] = {
MockRead(false, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
MockRead("HTTP/1.1 200 OK\r\n"
- "Alternate-Protocol: 443:npn-spdy/2\r\n"
+ "Alternate-Protocol: 443:npn-spdy/2.1\r\n"
"Proxy-Connection: close\r\n"
"\r\n"),
};
@@ -8920,9 +8920,9 @@
SSLSocketDataProvider ssl(true, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl.next_proto = "spdy/2";
+ ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
- ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
MockConnect never_finishing_connect(false, ERR_IO_PENDING);
StaticSocketDataProvider hanging_non_alternate_protocol_socket(
@@ -9207,9 +9207,9 @@
SSLSocketDataProvider ssl(true, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl.next_proto = "spdy/2";
+ ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
- ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -9644,9 +9644,9 @@
SSLSocketDataProvider ssl(true, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl.next_proto = "spdy/2";
+ ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
- ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<spdy::SpdyFrame> host1_req(ConstructSpdyGet(
@@ -9798,9 +9798,9 @@
SSLSocketDataProvider ssl(true, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
- ssl.next_proto = "spdy/2";
+ ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
- ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
+ ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<spdy::SpdyFrame> host1_req(ConstructSpdyGet(
« no previous file with comments | « net/http/http_network_layer.cc ('k') | net/http/http_pipelined_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698