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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_network_transaction_spdy3_unittest.cc

Issue 9618002: SPDY - integration of spdy/3 code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 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
« net/http/http_network_transaction_spdy21_unittest.cc ('K') | « net/http/http_network_transaction_spdy2_unittest.cc ('k') | net/http/http_proxy_client_socket_pool_spdy3_unittest.cc » ('j') | net/http/http_server_properties.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_transaction_spdy3_unittest.cc
===================================================================
--- net/http/http_network_transaction_spdy3_unittest.cc (revision 125802)
+++ net/http/http_network_transaction_spdy3_unittest.cc (working copy)
@@ -97,7 +97,7 @@
// SpdyNextProtos returns a vector of NPN protocol strings for negotiating
// SPDY.
std::vector<std::string> SpdyNextProtos() {
- return MakeNextProtos("http/1.1", "spdy/2", "spdy/2.1", NULL);
+ return MakeNextProtos("http/1.1", "spdy/2", "spdy/2.1", "spdy/3", NULL);
}
} // namespace
@@ -164,6 +164,7 @@
};
virtual void SetUp() {
+ SpdySession::set_default_protocol(SSLClientSocket::kProtoSPDY3);
Ryan Hamilton 2012/03/09 19:09:58 Is this required to be set of all tests in this fi
ramant (doing other things) 2012/03/10 01:14:09 Added this because more than one test requires. H
NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
MessageLoop::current()->RunAllPending();
spdy::SpdyFramer::set_enable_compression_default(false);
@@ -385,7 +386,7 @@
// This is the expected return from a current server advertising SPDY.
static const char kAlternateProtocolHttpHeader[] =
- "Alternate-Protocol: 443:npn-spdy/2.1\r\n\r\n";
+ "Alternate-Protocol: 443:npn-spdy/3\r\n\r\n";
// Helper functions for validating that AuthChallengeInfo's are correctly
// configured for common cases.
@@ -2169,7 +2170,7 @@
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback1;
@@ -2253,7 +2254,7 @@
session_deps.socket_factory.AddSocketDataProvider(data.get());
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback1;
@@ -2348,7 +2349,7 @@
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
SSLSocketDataProvider ssl2(ASYNC, OK);
ssl2.was_npn_negotiated = false;
@@ -2427,11 +2428,11 @@
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
SSLSocketDataProvider ssl2(ASYNC, OK);
- ssl2.SetNextProto(SSLClientSocket::kProtoSPDY21);
- ssl2.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
+ ssl2.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl2.protocol_negotiated = SSLClientSocket::kProtoSPDY3;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2);
TestCompletionCallback callback1;
@@ -2491,10 +2492,10 @@
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
SSLSocketDataProvider ssl2(ASYNC, OK);
- ssl2.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ ssl2.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2);
TestCompletionCallback callback1;
@@ -4596,7 +4597,7 @@
data_reads, arraysize(data_reads),
data_writes, arraysize(data_writes)));
SSLSocketDataProvider proxy_ssl(ASYNC, OK); // SSL to the proxy
- proxy_ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ proxy_ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSocketDataProvider(data.get());
session_deps.socket_factory.AddSSLSocketDataProvider(&proxy_ssl);
@@ -4715,7 +4716,7 @@
data_reads, arraysize(data_reads),
data_writes, arraysize(data_writes)));
SSLSocketDataProvider proxy_ssl(ASYNC, OK); // SSL to the proxy
- proxy_ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ proxy_ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSocketDataProvider(data.get());
session_deps.socket_factory.AddSSLSocketDataProvider(&proxy_ssl);
@@ -4825,7 +4826,7 @@
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
// Negotiate SPDY to the proxy
SSLSocketDataProvider proxy(ASYNC, OK);
- proxy.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ proxy.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&proxy);
// Vanilla SSL to the server
SSLSocketDataProvider server(ASYNC, OK);
@@ -5625,7 +5626,7 @@
session->http_server_properties();
http_server_properties->SetAlternateProtocol(
HostPortPair("host.with.alternate", 80), 443,
- NPN_SPDY_21);
+ NPN_SPDY_3);
return session;
}
@@ -6572,7 +6573,7 @@
http_server_properties.GetAlternateProtocol(http_host_port_pair);
PortAlternateProtocolPair expected_alternate;
expected_alternate.port = 443;
- expected_alternate.protocol = NPN_SPDY_21;
+ expected_alternate.protocol = NPN_SPDY_3;
EXPECT_TRUE(expected_alternate.Equals(alternate));
HttpStreamFactory::set_use_alternate_protocols(false);
@@ -6612,7 +6613,7 @@
http_server_properties->SetAlternateProtocol(
HostPortPair::FromURL(request.url),
666 /* port is ignored by MockConnect anyway */,
- NPN_SPDY_21);
+ NPN_SPDY_3);
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
TestCompletionCallback callback;
@@ -6675,7 +6676,7 @@
http_server_properties->SetAlternateProtocol(
HostPortPair::FromURL(restricted_port_request.url),
kUnrestrictedAlternatePort,
- NPN_SPDY_21);
+ NPN_SPDY_3);
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
TestCompletionCallback callback;
@@ -6725,7 +6726,7 @@
http_server_properties->SetAlternateProtocol(
HostPortPair::FromURL(restricted_port_request.url),
kRestrictedAlternatePort,
- NPN_SPDY_21);
+ NPN_SPDY_3);
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
TestCompletionCallback callback;
@@ -6775,7 +6776,7 @@
http_server_properties->SetAlternateProtocol(
HostPortPair::FromURL(unrestricted_port_request.url),
kRestrictedAlternatePort,
- NPN_SPDY_21);
+ NPN_SPDY_3);
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
TestCompletionCallback callback;
@@ -6825,7 +6826,7 @@
http_server_properties->SetAlternateProtocol(
HostPortPair::FromURL(unrestricted_port_request.url),
kUnrestrictedAlternatePort,
- NPN_SPDY_21);
+ NPN_SPDY_3);
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
TestCompletionCallback callback;
@@ -6870,7 +6871,7 @@
http_server_properties->SetAlternateProtocol(
HostPortPair::FromURL(request.url),
kUnsafePort,
- NPN_SPDY_2);
+ NPN_SPDY_3);
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
TestCompletionCallback callback;
@@ -6915,7 +6916,7 @@
session_deps.socket_factory.AddSocketDataProvider(&first_transaction);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
@@ -7014,7 +7015,7 @@
session_deps.socket_factory.AddSocketDataProvider(&hanging_socket);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<spdy::SpdyFrame> req1(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
@@ -7120,7 +7121,7 @@
session_deps.socket_factory.AddSocketDataProvider(&first_transaction);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
@@ -7253,7 +7254,7 @@
session_deps.socket_factory.AddSocketDataProvider(&first_transaction);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
@@ -7357,7 +7358,7 @@
session_deps.socket_factory.AddSocketDataProvider(&first_transaction);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
// Make sure we use ssl for spdy here.
SpdySession::SetSSLMode(true);
@@ -8241,7 +8242,7 @@
request.load_flags = 0;
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
@@ -8277,7 +8278,7 @@
HttpStreamFactory::set_use_alternate_protocols(true);
HttpStreamFactory::SetNextProtos(
MakeNextProtos(
- "http/1.1", "http1.1", "spdy/2.1", "spdy/2", "spdy", NULL));
+ "http/1.1", "http1.1", "spdy/2", "spdy/2.1", "spdy/3", "spdy", NULL));
SessionDependencies session_deps(ProxyService::CreateFixed("myproxy:70"));
HttpAuthHandlerMock::Factory* auth_factory =
@@ -8302,7 +8303,7 @@
MockRead data_reads_1[] = {
MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
MockRead("HTTP/1.1 200 OK\r\n"
- "Alternate-Protocol: 443:npn-spdy/2.1\r\n"
+ "Alternate-Protocol: 443:npn-spdy/3\r\n"
"Proxy-Connection: close\r\n"
"\r\n"),
};
@@ -8372,7 +8373,7 @@
data_writes_2, arraysize(data_writes_2)));
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
StaticSocketDataProvider hanging_non_alternate_protocol_socket(
@@ -8653,7 +8654,7 @@
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -9085,7 +9086,7 @@
pool_peer.DisableDomainAuthenticationVerification();
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<spdy::SpdyFrame> host1_req(ConstructSpdyGet(
@@ -9236,7 +9237,7 @@
pool_peer.DisableDomainAuthenticationVerification();
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
+ ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<spdy::SpdyFrame> host1_req(ConstructSpdyGet(
« net/http/http_network_transaction_spdy21_unittest.cc ('K') | « net/http/http_network_transaction_spdy2_unittest.cc ('k') | net/http/http_proxy_client_socket_pool_spdy3_unittest.cc » ('j') | net/http/http_server_properties.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698