Index: net/http/http_network_transaction_spdy3_unittest.cc |
=================================================================== |
--- net/http/http_network_transaction_spdy3_unittest.cc (revision 124690) |
+++ net/http/http_network_transaction_spdy3_unittest.cc (working copy) |
@@ -51,10 +51,12 @@ |
#include "net/spdy/spdy_framer.h" |
#include "net/spdy/spdy_session.h" |
#include "net/spdy/spdy_session_pool.h" |
-#include "net/spdy/spdy_test_util.h" |
+#include "net/spdy/spdy_test_util_spdy3.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "testing/platform_test.h" |
+using namespace net::test_spdy3; |
+ |
//----------------------------------------------------------------------------- |
namespace { |
@@ -102,6 +104,8 @@ |
namespace net { |
+namespace { |
+ |
// Helper to manage the lifetimes of the dependencies for a |
// HttpNetworkTransaction. |
struct SessionDependencies { |
@@ -149,7 +153,9 @@ |
return new HttpNetworkSession(params); |
} |
-class HttpNetworkTransactionTest : public PlatformTest { |
+} // namespace |
+ |
+class HttpNetworkTransactionSpdy3Test : public PlatformTest { |
protected: |
struct SimpleGetHelperResult { |
int rv; |
@@ -258,6 +264,8 @@ |
void ConnectStatusHelper(const MockRead& status); |
}; |
+namespace { |
+ |
// Fill |str| with a long header list that consumes >= |size| bytes. |
void FillLargeHeadersString(std::string* str, int size) { |
const char* row = |
@@ -421,13 +429,15 @@ |
return true; |
} |
-TEST_F(HttpNetworkTransactionTest, Basic) { |
+} // namespace |
+ |
+TEST_F(HttpNetworkTransactionSpdy3Test, Basic) { |
SessionDependencies session_deps; |
scoped_ptr<HttpTransaction> trans( |
new HttpNetworkTransaction(CreateSession(&session_deps))); |
} |
-TEST_F(HttpNetworkTransactionTest, SimpleGET) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, SimpleGET) { |
MockRead data_reads[] = { |
MockRead("HTTP/1.0 200 OK\r\n\r\n"), |
MockRead("hello world"), |
@@ -441,7 +451,7 @@ |
} |
// Response with no status line. |
-TEST_F(HttpNetworkTransactionTest, SimpleGETNoHeaders) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, SimpleGETNoHeaders) { |
MockRead data_reads[] = { |
MockRead("hello world"), |
MockRead(SYNCHRONOUS, OK), |
@@ -454,7 +464,7 @@ |
} |
// Allow up to 4 bytes of junk to precede status line. |
-TEST_F(HttpNetworkTransactionTest, StatusLineJunk2Bytes) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, StatusLineJunk2Bytes) { |
MockRead data_reads[] = { |
MockRead("xxxHTTP/1.0 404 Not Found\nServer: blah\n\nDATA"), |
MockRead(SYNCHRONOUS, OK), |
@@ -467,7 +477,7 @@ |
} |
// Allow up to 4 bytes of junk to precede status line. |
-TEST_F(HttpNetworkTransactionTest, StatusLineJunk4Bytes) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, StatusLineJunk4Bytes) { |
MockRead data_reads[] = { |
MockRead("\n\nQJHTTP/1.0 404 Not Found\nServer: blah\n\nDATA"), |
MockRead(SYNCHRONOUS, OK), |
@@ -480,7 +490,7 @@ |
} |
// Beyond 4 bytes of slop and it should fail to find a status line. |
-TEST_F(HttpNetworkTransactionTest, StatusLineJunk5Bytes) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, StatusLineJunk5Bytes) { |
MockRead data_reads[] = { |
MockRead("xxxxxHTTP/1.1 404 Not Found\nServer: blah"), |
MockRead(SYNCHRONOUS, OK), |
@@ -493,7 +503,7 @@ |
} |
// Same as StatusLineJunk4Bytes, except the read chunks are smaller. |
-TEST_F(HttpNetworkTransactionTest, StatusLineJunk4Bytes_Slow) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, StatusLineJunk4Bytes_Slow) { |
MockRead data_reads[] = { |
MockRead("\n"), |
MockRead("\n"), |
@@ -510,7 +520,7 @@ |
} |
// Close the connection before enough bytes to have a status line. |
-TEST_F(HttpNetworkTransactionTest, StatusLinePartial) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, StatusLinePartial) { |
MockRead data_reads[] = { |
MockRead("HTT"), |
MockRead(SYNCHRONOUS, OK), |
@@ -525,7 +535,7 @@ |
// Simulate a 204 response, lacking a Content-Length header, sent over a |
// persistent connection. The response should still terminate since a 204 |
// cannot have a response body. |
-TEST_F(HttpNetworkTransactionTest, StopsReading204) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, StopsReading204) { |
MockRead data_reads[] = { |
MockRead("HTTP/1.1 204 No Content\r\n\r\n"), |
MockRead("junk"), // Should not be read!! |
@@ -540,7 +550,7 @@ |
// A simple request using chunked encoding with some extra data after. |
// (Like might be seen in a pipelined response.) |
-TEST_F(HttpNetworkTransactionTest, ChunkedEncoding) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ChunkedEncoding) { |
MockRead data_reads[] = { |
MockRead("HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n"), |
MockRead("5\r\nHello\r\n"), |
@@ -559,7 +569,7 @@ |
// Next tests deal with http://crbug.com/56344. |
-TEST_F(HttpNetworkTransactionTest, |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
MultipleContentLengthHeadersNoTransferEncoding) { |
MockRead data_reads[] = { |
MockRead("HTTP/1.1 200 OK\r\n"), |
@@ -571,7 +581,7 @@ |
EXPECT_EQ(ERR_RESPONSE_HEADERS_MULTIPLE_CONTENT_LENGTH, out.rv); |
} |
-TEST_F(HttpNetworkTransactionTest, |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
DuplicateContentLengthHeadersNoTransferEncoding) { |
MockRead data_reads[] = { |
MockRead("HTTP/1.1 200 OK\r\n"), |
@@ -586,7 +596,7 @@ |
EXPECT_EQ("Hello", out.response_data); |
} |
-TEST_F(HttpNetworkTransactionTest, |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
ComplexContentLengthHeadersNoTransferEncoding) { |
// More than 2 dupes. |
{ |
@@ -632,7 +642,7 @@ |
} |
} |
-TEST_F(HttpNetworkTransactionTest, |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
MultipleContentLengthHeadersTransferEncoding) { |
MockRead data_reads[] = { |
MockRead("HTTP/1.1 200 OK\r\n"), |
@@ -656,7 +666,7 @@ |
// Next tests deal with http://crbug.com/98895. |
// Checks that a single Content-Disposition header results in no error. |
-TEST_F(HttpNetworkTransactionTest, SingleContentDispositionHeader) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, SingleContentDispositionHeader) { |
MockRead data_reads[] = { |
MockRead("HTTP/1.1 200 OK\r\n"), |
MockRead("Content-Disposition: attachment;filename=\"salutations.txt\"r\n"), |
@@ -671,7 +681,7 @@ |
} |
// Checks that two identical Content-Disposition headers result in an error. |
-TEST_F(HttpNetworkTransactionTest, |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
DuplicateIdenticalContentDispositionHeaders) { |
MockRead data_reads[] = { |
MockRead("HTTP/1.1 200 OK\r\n"), |
@@ -686,7 +696,8 @@ |
} |
// Checks that two distinct Content-Disposition headers result in an error. |
-TEST_F(HttpNetworkTransactionTest, DuplicateDistinctContentDispositionHeaders) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
+ DuplicateDistinctContentDispositionHeaders) { |
MockRead data_reads[] = { |
MockRead("HTTP/1.1 200 OK\r\n"), |
MockRead("Content-Disposition: attachment;filename=\"greetings.txt\"r\n"), |
@@ -700,7 +711,7 @@ |
} |
// Checks the behavior of a single Location header. |
-TEST_F(HttpNetworkTransactionTest, SingleLocationHeader) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, SingleLocationHeader) { |
MockRead data_reads[] = { |
MockRead("HTTP/1.1 302 Redirect\r\n"), |
MockRead("Location: http://good.com/\r\n"), |
@@ -736,7 +747,7 @@ |
} |
// Checks that two identical Location headers result in an error. |
-TEST_F(HttpNetworkTransactionTest, DuplicateIdenticalLocationHeaders) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, DuplicateIdenticalLocationHeaders) { |
MockRead data_reads[] = { |
MockRead("HTTP/1.1 302 Redirect\r\n"), |
MockRead("Location: http://good.com/\r\n"), |
@@ -750,7 +761,7 @@ |
} |
// Checks that two distinct Location headers result in an error. |
-TEST_F(HttpNetworkTransactionTest, DuplicateDistinctLocationHeaders) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, DuplicateDistinctLocationHeaders) { |
MockRead data_reads[] = { |
MockRead("HTTP/1.1 302 Redirect\r\n"), |
MockRead("Location: http://good.com/\r\n"), |
@@ -765,7 +776,7 @@ |
// Do a request using the HEAD method. Verify that we don't try to read the |
// message body (since HEAD has none). |
-TEST_F(HttpNetworkTransactionTest, Head) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, Head) { |
HttpRequestInfo request; |
request.method = "HEAD"; |
request.url = GURL("http://www.google.com/"); |
@@ -825,7 +836,7 @@ |
EXPECT_EQ("", response_data); |
} |
-TEST_F(HttpNetworkTransactionTest, ReuseConnection) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ReuseConnection) { |
SessionDependencies session_deps; |
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); |
@@ -872,7 +883,7 @@ |
} |
} |
-TEST_F(HttpNetworkTransactionTest, Ignores100) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, Ignores100) { |
HttpRequestInfo request; |
request.method = "POST"; |
request.url = GURL("http://www.foo.com/"); |
@@ -916,7 +927,7 @@ |
// This test is almost the same as Ignores100 above, but the response contains |
// a 102 instead of a 100. Also, instead of HTTP/1.0 the response is |
// HTTP/1.1 and the two status headers are read in one read. |
-TEST_F(HttpNetworkTransactionTest, Ignores1xx) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, Ignores1xx) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.foo.com/"); |
@@ -955,7 +966,7 @@ |
EXPECT_EQ("hello world", response_data); |
} |
-TEST_F(HttpNetworkTransactionTest, Incomplete100ThenEOF) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, Incomplete100ThenEOF) { |
HttpRequestInfo request; |
request.method = "POST"; |
request.url = GURL("http://www.foo.com/"); |
@@ -986,7 +997,7 @@ |
EXPECT_EQ("", response_data); |
} |
-TEST_F(HttpNetworkTransactionTest, EmptyResponse) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, EmptyResponse) { |
HttpRequestInfo request; |
request.method = "POST"; |
request.url = GURL("http://www.foo.com/"); |
@@ -1011,7 +1022,7 @@ |
EXPECT_EQ(ERR_EMPTY_RESPONSE, rv); |
} |
-void HttpNetworkTransactionTest::KeepAliveConnectionResendRequestTest( |
+void HttpNetworkTransactionSpdy3Test::KeepAliveConnectionResendRequestTest( |
const MockWrite* write_failure, |
const MockRead* read_failure) { |
HttpRequestInfo request; |
@@ -1087,22 +1098,23 @@ |
} |
} |
-TEST_F(HttpNetworkTransactionTest, KeepAliveConnectionNotConnectedOnWrite) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
+ KeepAliveConnectionNotConnectedOnWrite) { |
MockWrite write_failure(ASYNC, ERR_SOCKET_NOT_CONNECTED); |
KeepAliveConnectionResendRequestTest(&write_failure, NULL); |
} |
-TEST_F(HttpNetworkTransactionTest, KeepAliveConnectionReset) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, KeepAliveConnectionReset) { |
MockRead read_failure(ASYNC, ERR_CONNECTION_RESET); |
KeepAliveConnectionResendRequestTest(NULL, &read_failure); |
} |
-TEST_F(HttpNetworkTransactionTest, KeepAliveConnectionEOF) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, KeepAliveConnectionEOF) { |
MockRead read_failure(SYNCHRONOUS, OK); // EOF |
KeepAliveConnectionResendRequestTest(NULL, &read_failure); |
} |
-TEST_F(HttpNetworkTransactionTest, NonKeepAliveConnectionReset) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, NonKeepAliveConnectionReset) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -1142,7 +1154,7 @@ |
// Opera 9.52: after five attempts, blank page |
// Us with WinHTTP: error page (ERR_INVALID_RESPONSE) |
// Us: error page (EMPTY_RESPONSE) |
-TEST_F(HttpNetworkTransactionTest, NonKeepAliveConnectionEOF) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, NonKeepAliveConnectionEOF) { |
MockRead data_reads[] = { |
MockRead(SYNCHRONOUS, OK), // EOF |
MockRead("HTTP/1.0 200 OK\r\n\r\n"), // Should not be used |
@@ -1156,7 +1168,7 @@ |
// Test that we correctly reuse a keep-alive connection after not explicitly |
// reading the body. |
-TEST_F(HttpNetworkTransactionTest, KeepAliveAfterUnreadBody) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, KeepAliveAfterUnreadBody) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.foo.com/"); |
@@ -1251,7 +1263,7 @@ |
// Test the request-challenge-retry sequence for basic auth. |
// (basic auth is the easiest to mock, because it has no randomness). |
-TEST_F(HttpNetworkTransactionTest, BasicAuth) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuth) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -1331,7 +1343,7 @@ |
EXPECT_EQ(100, response->headers->GetContentLength()); |
} |
-TEST_F(HttpNetworkTransactionTest, DoNotSendAuth) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, DoNotSendAuth) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -1374,7 +1386,7 @@ |
// Test the request-challenge-retry sequence for basic auth, over a keep-alive |
// connection. |
-TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAlive) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthKeepAlive) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -1453,7 +1465,7 @@ |
// Test the request-challenge-retry sequence for basic auth, over a keep-alive |
// connection and with no response body to drain. |
-TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveNoBody) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthKeepAliveNoBody) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -1529,7 +1541,7 @@ |
// Test the request-challenge-retry sequence for basic auth, over a keep-alive |
// connection and with a large response body to drain. |
-TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveLargeBody) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthKeepAliveLargeBody) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -1613,7 +1625,7 @@ |
// Test the request-challenge-retry sequence for basic auth, over a keep-alive |
// connection, but the server gets impatient and closes the connection. |
-TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveImpatientServer) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthKeepAliveImpatientServer) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -1699,7 +1711,7 @@ |
// Test the request-challenge-retry sequence for basic auth, over a connection |
// that requires a restart when setting up an SSL tunnel. |
-TEST_F(HttpNetworkTransactionTest, BasicAuthProxyNoKeepAlive) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthProxyNoKeepAlive) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("https://www.google.com/"); |
@@ -1804,7 +1816,7 @@ |
// Test the request-challenge-retry sequence for basic auth, over a keep-alive |
// proxy connection, when setting up an SSL tunnel. |
-TEST_F(HttpNetworkTransactionTest, BasicAuthProxyKeepAlive) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthProxyKeepAlive) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("https://www.google.com/"); |
@@ -1907,7 +1919,7 @@ |
// Test that we don't read the response body when we fail to establish a tunnel, |
// even if the user cancels the proxy's auth attempt. |
-TEST_F(HttpNetworkTransactionTest, BasicAuthProxyCancelTunnel) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthProxyCancelTunnel) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("https://www.google.com/"); |
@@ -1965,7 +1977,7 @@ |
// Test when a server (non-proxy) returns a 407 (proxy-authenticate). |
// The request should fail with ERR_UNEXPECTED_PROXY_AUTH. |
-TEST_F(HttpNetworkTransactionTest, UnexpectedProxyAuth) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, UnexpectedProxyAuth) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -2010,7 +2022,8 @@ |
// a non-authenticating proxy - there is nothing to indicate whether the |
// response came from the proxy or the server, so it is treated as if the proxy |
// issued the challenge. |
-TEST_F(HttpNetworkTransactionTest, HttpsServerRequestsProxyAuthThroughProxy) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
+ HttpsServerRequestsProxyAuthThroughProxy) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("https://www.google.com/"); |
@@ -2067,7 +2080,7 @@ |
} |
// Test a simple get through an HTTPS Proxy. |
-TEST_F(HttpNetworkTransactionTest, HttpsProxyGet) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxyGet) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -2122,7 +2135,7 @@ |
} |
// Test a SPDY get through an HTTPS Proxy. |
-TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyGet) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyGet) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -2176,11 +2189,11 @@ |
std::string response_data; |
ASSERT_EQ(OK, ReadTransaction(trans.get(), &response_data)); |
- EXPECT_EQ(net::kUploadData, response_data); |
+ EXPECT_EQ(kUploadData, response_data); |
} |
// Test a SPDY get through an HTTPS Proxy. |
-TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyGetWithProxyAuth) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyGetWithProxyAuth) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -2280,7 +2293,7 @@ |
} |
// Test a SPDY CONNECT through an HTTPS Proxy to an HTTPS (non-SPDY) Server. |
-TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyConnectHttps) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyConnectHttps) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("https://www.google.com/"); |
@@ -2361,7 +2374,7 @@ |
} |
// Test a SPDY CONNECT through an HTTPS Proxy to a SPDY server. |
-TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyConnectSpdy) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyConnectSpdy) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("https://www.google.com/"); |
@@ -2436,11 +2449,11 @@ |
std::string response_data; |
ASSERT_EQ(OK, ReadTransaction(trans.get(), &response_data)); |
- EXPECT_EQ(net::kUploadData, response_data); |
+ EXPECT_EQ(kUploadData, response_data); |
} |
// Test a SPDY CONNECT failure through an HTTPS Proxy. |
-TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyConnectFailure) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyConnectFailure) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("https://www.google.com/"); |
@@ -2498,7 +2511,7 @@ |
} |
// Test the challenge-response-retry sequence through an HTTPS Proxy |
-TEST_F(HttpNetworkTransactionTest, HttpsProxyAuthRetry) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxyAuthRetry) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -2585,7 +2598,7 @@ |
EXPECT_TRUE(response->auth_challenge.get() == NULL); |
} |
-void HttpNetworkTransactionTest::ConnectStatusHelperWithExpectedStatus( |
+void HttpNetworkTransactionSpdy3Test::ConnectStatusHelperWithExpectedStatus( |
const MockRead& status, int expected_status) { |
HttpRequestInfo request; |
request.method = "GET"; |
@@ -2626,179 +2639,180 @@ |
EXPECT_EQ(expected_status, rv); |
} |
-void HttpNetworkTransactionTest::ConnectStatusHelper(const MockRead& status) { |
+void HttpNetworkTransactionSpdy3Test::ConnectStatusHelper( |
+ const MockRead& status) { |
ConnectStatusHelperWithExpectedStatus( |
status, ERR_TUNNEL_CONNECTION_FAILED); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus100) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus100) { |
ConnectStatusHelper(MockRead("HTTP/1.1 100 Continue\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus101) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus101) { |
ConnectStatusHelper(MockRead("HTTP/1.1 101 Switching Protocols\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus201) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus201) { |
ConnectStatusHelper(MockRead("HTTP/1.1 201 Created\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus202) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus202) { |
ConnectStatusHelper(MockRead("HTTP/1.1 202 Accepted\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus203) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus203) { |
ConnectStatusHelper( |
MockRead("HTTP/1.1 203 Non-Authoritative Information\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus204) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus204) { |
ConnectStatusHelper(MockRead("HTTP/1.1 204 No Content\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus205) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus205) { |
ConnectStatusHelper(MockRead("HTTP/1.1 205 Reset Content\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus206) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus206) { |
ConnectStatusHelper(MockRead("HTTP/1.1 206 Partial Content\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus300) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus300) { |
ConnectStatusHelper(MockRead("HTTP/1.1 300 Multiple Choices\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus301) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus301) { |
ConnectStatusHelper(MockRead("HTTP/1.1 301 Moved Permanently\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus302) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus302) { |
ConnectStatusHelper(MockRead("HTTP/1.1 302 Found\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus303) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus303) { |
ConnectStatusHelper(MockRead("HTTP/1.1 303 See Other\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus304) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus304) { |
ConnectStatusHelper(MockRead("HTTP/1.1 304 Not Modified\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus305) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus305) { |
ConnectStatusHelper(MockRead("HTTP/1.1 305 Use Proxy\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus306) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus306) { |
ConnectStatusHelper(MockRead("HTTP/1.1 306\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus307) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus307) { |
ConnectStatusHelper(MockRead("HTTP/1.1 307 Temporary Redirect\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus400) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus400) { |
ConnectStatusHelper(MockRead("HTTP/1.1 400 Bad Request\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus401) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus401) { |
ConnectStatusHelper(MockRead("HTTP/1.1 401 Unauthorized\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus402) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus402) { |
ConnectStatusHelper(MockRead("HTTP/1.1 402 Payment Required\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus403) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus403) { |
ConnectStatusHelper(MockRead("HTTP/1.1 403 Forbidden\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus404) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus404) { |
ConnectStatusHelper(MockRead("HTTP/1.1 404 Not Found\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus405) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus405) { |
ConnectStatusHelper(MockRead("HTTP/1.1 405 Method Not Allowed\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus406) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus406) { |
ConnectStatusHelper(MockRead("HTTP/1.1 406 Not Acceptable\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus407) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus407) { |
ConnectStatusHelperWithExpectedStatus( |
MockRead("HTTP/1.1 407 Proxy Authentication Required\r\n"), |
ERR_PROXY_AUTH_UNSUPPORTED); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus408) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus408) { |
ConnectStatusHelper(MockRead("HTTP/1.1 408 Request Timeout\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus409) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus409) { |
ConnectStatusHelper(MockRead("HTTP/1.1 409 Conflict\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus410) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus410) { |
ConnectStatusHelper(MockRead("HTTP/1.1 410 Gone\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus411) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus411) { |
ConnectStatusHelper(MockRead("HTTP/1.1 411 Length Required\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus412) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus412) { |
ConnectStatusHelper(MockRead("HTTP/1.1 412 Precondition Failed\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus413) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus413) { |
ConnectStatusHelper(MockRead("HTTP/1.1 413 Request Entity Too Large\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus414) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus414) { |
ConnectStatusHelper(MockRead("HTTP/1.1 414 Request-URI Too Long\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus415) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus415) { |
ConnectStatusHelper(MockRead("HTTP/1.1 415 Unsupported Media Type\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus416) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus416) { |
ConnectStatusHelper( |
MockRead("HTTP/1.1 416 Requested Range Not Satisfiable\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus417) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus417) { |
ConnectStatusHelper(MockRead("HTTP/1.1 417 Expectation Failed\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus500) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus500) { |
ConnectStatusHelper(MockRead("HTTP/1.1 500 Internal Server Error\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus501) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus501) { |
ConnectStatusHelper(MockRead("HTTP/1.1 501 Not Implemented\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus502) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus502) { |
ConnectStatusHelper(MockRead("HTTP/1.1 502 Bad Gateway\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus503) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus503) { |
ConnectStatusHelper(MockRead("HTTP/1.1 503 Service Unavailable\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus504) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus504) { |
ConnectStatusHelper(MockRead("HTTP/1.1 504 Gateway Timeout\r\n")); |
} |
-TEST_F(HttpNetworkTransactionTest, ConnectStatus505) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectStatus505) { |
ConnectStatusHelper(MockRead("HTTP/1.1 505 HTTP Version Not Supported\r\n")); |
} |
// Test the flow when both the proxy server AND origin server require |
// authentication. Again, this uses basic auth for both since that is |
// the simplest to mock. |
-TEST_F(HttpNetworkTransactionTest, BasicAuthProxyThenServer) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthProxyThenServer) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -2927,7 +2941,7 @@ |
// bytes in the debugger. |
// Enter the correct password and authenticate successfully. |
-TEST_F(HttpNetworkTransactionTest, NTLMAuth1) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, NTLMAuth1) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://172.22.68.17/kids/login.aspx"); |
@@ -3056,7 +3070,7 @@ |
} |
// Enter a wrong password, and then the correct one. |
-TEST_F(HttpNetworkTransactionTest, NTLMAuth2) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, NTLMAuth2) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://172.22.68.17/kids/login.aspx"); |
@@ -3258,7 +3272,7 @@ |
// Test reading a server response which has only headers, and no body. |
// After some maximum number of bytes is consumed, the transaction should |
// fail with ERR_RESPONSE_HEADERS_TOO_BIG. |
-TEST_F(HttpNetworkTransactionTest, LargeHeadersNoBody) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, LargeHeadersNoBody) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -3296,7 +3310,8 @@ |
// Make sure that we don't try to reuse a TCPClientSocket when failing to |
// establish tunnel. |
// http://code.google.com/p/chromium/issues/detail?id=3772 |
-TEST_F(HttpNetworkTransactionTest, DontRecycleTransportSocketForSSLTunnel) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
+ DontRecycleTransportSocketForSSLTunnel) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("https://www.google.com/"); |
@@ -3354,7 +3369,7 @@ |
} |
// Make sure that we recycle a socket after reading all of the response body. |
-TEST_F(HttpNetworkTransactionTest, RecycleSocket) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, RecycleSocket) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -3410,7 +3425,7 @@ |
// Make sure that we recycle a SSL socket after reading all of the response |
// body. |
-TEST_F(HttpNetworkTransactionTest, RecycleSSLSocket) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, RecycleSSLSocket) { |
SessionDependencies session_deps; |
HttpRequestInfo request; |
request.method = "GET"; |
@@ -3469,7 +3484,7 @@ |
// Grab a SSL socket, use it, and put it back into the pool. Then, reuse it |
// from the pool and make sure that we recover okay. |
-TEST_F(HttpNetworkTransactionTest, RecycleDeadSSLSocket) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, RecycleDeadSSLSocket) { |
SessionDependencies session_deps; |
HttpRequestInfo request; |
request.method = "GET"; |
@@ -3564,7 +3579,7 @@ |
// Make sure that we recycle a socket after a zero-length response. |
// http://crbug.com/9880 |
-TEST_F(HttpNetworkTransactionTest, RecycleSocketAfterZeroContentLength) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, RecycleSocketAfterZeroContentLength) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/csi?v=3&s=web&action=&" |
@@ -3619,7 +3634,7 @@ |
EXPECT_EQ(1, session->GetTransportSocketPool()->IdleSocketCount()); |
} |
-TEST_F(HttpNetworkTransactionTest, ResendRequestOnWriteBodyError) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ResendRequestOnWriteBodyError) { |
HttpRequestInfo request[2]; |
// Transaction 1: a GET request that succeeds. The socket is recycled |
// after use. |
@@ -3709,7 +3724,7 @@ |
// Test the request-challenge-retry sequence for basic auth when there is |
// an identity in the URL. The request should be sent as normal, but when |
// it fails the identity from the URL is no longer used. |
-TEST_F(HttpNetworkTransactionTest, IgnoreAuthIdentityInURL) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, IgnoreAuthIdentityInURL) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://foo:b@r@www.google.com/"); |
@@ -3752,7 +3767,7 @@ |
} |
// Test that previously tried username/passwords for a realm get re-used. |
-TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthCacheAndPreauth) { |
SessionDependencies session_deps; |
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); |
@@ -4132,7 +4147,7 @@ |
// Tests that nonce count increments when multiple auth attempts |
// are started with the same nonce. |
-TEST_F(HttpNetworkTransactionTest, DigestPreAuthNonceCount) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, DigestPreAuthNonceCount) { |
SessionDependencies session_deps; |
HttpAuthHandlerDigest::Factory* digest_factory = |
new HttpAuthHandlerDigest::Factory(); |
@@ -4265,7 +4280,7 @@ |
} |
// Test the ResetStateForRestart() private method. |
-TEST_F(HttpNetworkTransactionTest, ResetStateForRestart) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ResetStateForRestart) { |
// Create a transaction (the dependencies aren't important). |
SessionDependencies session_deps; |
scoped_ptr<HttpNetworkTransaction> trans( |
@@ -4308,7 +4323,7 @@ |
} |
// Test HTTPS connections to a site with a bad certificate |
-TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificate) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, HTTPSBadCertificate) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("https://www.google.com/"); |
@@ -4364,7 +4379,7 @@ |
// Test HTTPS connections to a site with a bad certificate, going through a |
// proxy |
-TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaProxy) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, HTTPSBadCertificateViaProxy) { |
SessionDependencies session_deps(ProxyService::CreateFixed("myproxy:70")); |
HttpRequestInfo request; |
@@ -4442,7 +4457,7 @@ |
// Test HTTPS connections to a site, going through an HTTPS proxy |
-TEST_F(HttpNetworkTransactionTest, HTTPSViaHttpsProxy) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, HTTPSViaHttpsProxy) { |
SessionDependencies session_deps(ProxyService::CreateFixed( |
"https://proxy:70")); |
@@ -4498,7 +4513,7 @@ |
} |
// Test an HTTPS Proxy's ability to redirect a CONNECT request |
-TEST_F(HttpNetworkTransactionTest, RedirectOfHttpsConnectViaHttpsProxy) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, RedirectOfHttpsConnectViaHttpsProxy) { |
SessionDependencies session_deps( |
ProxyService::CreateFixed("https://proxy:70")); |
@@ -4548,7 +4563,7 @@ |
} |
// Test an HTTPS (SPDY) Proxy's ability to redirect a CONNECT request |
-TEST_F(HttpNetworkTransactionTest, RedirectOfHttpsConnectViaSpdyProxy) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, RedirectOfHttpsConnectViaSpdyProxy) { |
SessionDependencies session_deps( |
ProxyService::CreateFixed("https://proxy:70")); |
@@ -4607,7 +4622,8 @@ |
} |
// Test an HTTPS Proxy's ability to provide a response to a CONNECT request |
-TEST_F(HttpNetworkTransactionTest, ErrorResponseTofHttpsConnectViaHttpsProxy) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
+ ErrorResponseTofHttpsConnectViaHttpsProxy) { |
SessionDependencies session_deps( |
ProxyService::CreateFixed("https://proxy:70")); |
@@ -4662,7 +4678,8 @@ |
// Test an HTTPS (SPDY) Proxy's ability to provide a response to a CONNECT |
// request |
-TEST_F(HttpNetworkTransactionTest, ErrorResponseTofHttpsConnectViaSpdyProxy) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
+ ErrorResponseTofHttpsConnectViaSpdyProxy) { |
SessionDependencies session_deps( |
ProxyService::CreateFixed("https://proxy:70")); |
@@ -4727,7 +4744,7 @@ |
// Test the request-challenge-retry sequence for basic auth, through |
// a SPDY proxy over a single SPDY session. |
-TEST_F(HttpNetworkTransactionTest, BasicAuthSpdyProxy) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthSpdyProxy) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("https://www.google.com/"); |
@@ -4808,7 +4825,7 @@ |
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get()); |
// Negotiate SPDY to the proxy |
SSLSocketDataProvider proxy(ASYNC, OK); |
- proxy.SetNextProto(SSLClientSocket::kProtoSPDY2); |
+ proxy.SetNextProto(SSLClientSocket::kProtoSPDY21); |
session_deps.socket_factory.AddSSLSocketDataProvider(&proxy); |
// Vanilla SSL to the server |
SSLSocketDataProvider server(ASYNC, OK); |
@@ -4867,7 +4884,7 @@ |
// Test HTTPS connections to a site with a bad certificate, going through an |
// HTTPS proxy |
-TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaHttpsProxy) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, HTTPSBadCertificateViaHttpsProxy) { |
SessionDependencies session_deps(ProxyService::CreateFixed( |
"https://proxy:70")); |
@@ -4947,7 +4964,7 @@ |
EXPECT_EQ(100, response->headers->GetContentLength()); |
} |
-TEST_F(HttpNetworkTransactionTest, BuildRequest_UserAgent) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BuildRequest_UserAgent) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -4986,7 +5003,7 @@ |
EXPECT_EQ(OK, rv); |
} |
-TEST_F(HttpNetworkTransactionTest, BuildRequest_UserAgentOverTunnel) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BuildRequest_UserAgentOverTunnel) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("https://www.google.com/"); |
@@ -5024,7 +5041,7 @@ |
EXPECT_EQ(OK, rv); |
} |
-TEST_F(HttpNetworkTransactionTest, BuildRequest_Referer) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BuildRequest_Referer) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -5064,7 +5081,7 @@ |
EXPECT_EQ(OK, rv); |
} |
-TEST_F(HttpNetworkTransactionTest, BuildRequest_PostContentLengthZero) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BuildRequest_PostContentLengthZero) { |
HttpRequestInfo request; |
request.method = "POST"; |
request.url = GURL("http://www.google.com/"); |
@@ -5101,7 +5118,7 @@ |
EXPECT_EQ(OK, rv); |
} |
-TEST_F(HttpNetworkTransactionTest, BuildRequest_PutContentLengthZero) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BuildRequest_PutContentLengthZero) { |
HttpRequestInfo request; |
request.method = "PUT"; |
request.url = GURL("http://www.google.com/"); |
@@ -5138,7 +5155,7 @@ |
EXPECT_EQ(OK, rv); |
} |
-TEST_F(HttpNetworkTransactionTest, BuildRequest_HeadContentLengthZero) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BuildRequest_HeadContentLengthZero) { |
HttpRequestInfo request; |
request.method = "HEAD"; |
request.url = GURL("http://www.google.com/"); |
@@ -5175,7 +5192,7 @@ |
EXPECT_EQ(OK, rv); |
} |
-TEST_F(HttpNetworkTransactionTest, BuildRequest_CacheControlNoCache) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BuildRequest_CacheControlNoCache) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -5214,7 +5231,7 @@ |
EXPECT_EQ(OK, rv); |
} |
-TEST_F(HttpNetworkTransactionTest, |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
BuildRequest_CacheControlValidateCache) { |
HttpRequestInfo request; |
request.method = "GET"; |
@@ -5253,7 +5270,7 @@ |
EXPECT_EQ(OK, rv); |
} |
-TEST_F(HttpNetworkTransactionTest, BuildRequest_ExtraHeaders) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BuildRequest_ExtraHeaders) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -5291,7 +5308,7 @@ |
EXPECT_EQ(OK, rv); |
} |
-TEST_F(HttpNetworkTransactionTest, BuildRequest_ExtraHeadersStripped) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BuildRequest_ExtraHeadersStripped) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -5340,7 +5357,7 @@ |
#define MAYBE_SOCKS4_HTTP_GET SOCKS4_HTTP_GET |
#endif |
-TEST_F(HttpNetworkTransactionTest, MAYBE_SOCKS4_HTTP_GET) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, MAYBE_SOCKS4_HTTP_GET) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -5398,7 +5415,7 @@ |
#define MAYBE_SOCKS4_SSL_GET SOCKS4_SSL_GET |
#endif |
-TEST_F(HttpNetworkTransactionTest, MAYBE_SOCKS4_SSL_GET) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, MAYBE_SOCKS4_SSL_GET) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("https://www.google.com/"); |
@@ -5454,7 +5471,7 @@ |
EXPECT_EQ("Payload", response_text); |
} |
-TEST_F(HttpNetworkTransactionTest, SOCKS5_HTTP_GET) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, SOCKS5_HTTP_GET) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -5519,7 +5536,7 @@ |
EXPECT_EQ("Payload", response_text); |
} |
-TEST_F(HttpNetworkTransactionTest, SOCKS5_SSL_GET) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, SOCKS5_SSL_GET) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("https://www.google.com/"); |
@@ -5589,6 +5606,8 @@ |
EXPECT_EQ("Payload", response_text); |
} |
+namespace { |
+ |
// Tests that for connection endpoints the group names are correctly set. |
struct GroupNameTest { |
@@ -5627,7 +5646,9 @@ |
return trans->Start(&request, callback.callback(), BoundNetLog()); |
} |
-TEST_F(HttpNetworkTransactionTest, GroupNameForDirectConnections) { |
+} // namespace |
+ |
+TEST_F(HttpNetworkTransactionSpdy3Test, GroupNameForDirectConnections) { |
const GroupNameTest tests[] = { |
{ |
"", // unused |
@@ -5695,7 +5716,7 @@ |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
-TEST_F(HttpNetworkTransactionTest, GroupNameForHTTPProxyConnections) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, GroupNameForHTTPProxyConnections) { |
const GroupNameTest tests[] = { |
{ |
"http_proxy", |
@@ -5755,7 +5776,7 @@ |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
-TEST_F(HttpNetworkTransactionTest, GroupNameForSOCKSConnections) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, GroupNameForSOCKSConnections) { |
const GroupNameTest tests[] = { |
{ |
"socks4://socks_proxy:1080", |
@@ -5829,7 +5850,7 @@ |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
-TEST_F(HttpNetworkTransactionTest, ReconsiderProxyAfterFailedConnection) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ReconsiderProxyAfterFailedConnection) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -5853,6 +5874,8 @@ |
EXPECT_EQ(ERR_PROXY_CONNECTION_FAILED, rv); |
} |
+namespace { |
+ |
// Base test to make sure that when the load flags for a request specify to |
// bypass the cache, the DNS cache is not used. |
void BypassHostCacheOnRefreshHelper(int load_flags) { |
@@ -5908,22 +5931,24 @@ |
EXPECT_EQ(ERR_NAME_NOT_RESOLVED, rv); |
} |
+} // namespace |
+ |
// There are multiple load flags that should trigger the host cache bypass. |
// Test each in isolation: |
-TEST_F(HttpNetworkTransactionTest, BypassHostCacheOnRefresh1) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BypassHostCacheOnRefresh1) { |
BypassHostCacheOnRefreshHelper(LOAD_BYPASS_CACHE); |
} |
-TEST_F(HttpNetworkTransactionTest, BypassHostCacheOnRefresh2) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BypassHostCacheOnRefresh2) { |
BypassHostCacheOnRefreshHelper(LOAD_VALIDATE_CACHE); |
} |
-TEST_F(HttpNetworkTransactionTest, BypassHostCacheOnRefresh3) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, BypassHostCacheOnRefresh3) { |
BypassHostCacheOnRefreshHelper(LOAD_DISABLE_CACHE); |
} |
// Make sure we can handle an error when writing the request. |
-TEST_F(HttpNetworkTransactionTest, RequestWriteError) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, RequestWriteError) { |
SessionDependencies session_deps; |
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); |
@@ -5952,7 +5977,7 @@ |
} |
// Check that a connection closed after the start of the headers finishes ok. |
-TEST_F(HttpNetworkTransactionTest, ConnectionClosedAfterStartOfHeaders) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ConnectionClosedAfterStartOfHeaders) { |
SessionDependencies session_deps; |
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); |
@@ -5994,7 +6019,7 @@ |
// Make sure that a dropped connection while draining the body for auth |
// restart does the right thing. |
-TEST_F(HttpNetworkTransactionTest, DrainResetOK) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, DrainResetOK) { |
SessionDependencies session_deps; |
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); |
@@ -6073,7 +6098,7 @@ |
} |
// Test HTTPS connections going through a proxy that sends extra data. |
-TEST_F(HttpNetworkTransactionTest, HTTPSViaProxyWithExtraData) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, HTTPSViaProxyWithExtraData) { |
SessionDependencies session_deps(ProxyService::CreateFixed("myproxy:70")); |
HttpRequestInfo request; |
@@ -6106,7 +6131,7 @@ |
EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, rv); |
} |
-TEST_F(HttpNetworkTransactionTest, LargeContentLengthThenClose) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, LargeContentLengthThenClose) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("http://www.google.com/"); |
@@ -6142,7 +6167,7 @@ |
EXPECT_EQ(ERR_CONNECTION_CLOSED, rv); |
} |
-TEST_F(HttpNetworkTransactionTest, UploadFileSmallerThanLength) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, UploadFileSmallerThanLength) { |
HttpRequestInfo request; |
request.method = "POST"; |
request.url = GURL("http://www.google.com/upload"); |
@@ -6195,7 +6220,7 @@ |
file_util::Delete(temp_file_path, false); |
} |
-TEST_F(HttpNetworkTransactionTest, UploadUnreadableFile) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, UploadUnreadableFile) { |
HttpRequestInfo request; |
request.method = "POST"; |
request.url = GURL("http://www.google.com/upload"); |
@@ -6252,7 +6277,7 @@ |
file_util::Delete(temp_file, false); |
} |
-TEST_F(HttpNetworkTransactionTest, UnreadableUploadFileAfterAuthRestart) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, UnreadableUploadFileAfterAuthRestart) { |
HttpRequestInfo request; |
request.method = "POST"; |
request.url = GURL("http://www.google.com/upload"); |
@@ -6341,7 +6366,7 @@ |
} |
// Tests that changes to Auth realms are treated like auth rejections. |
-TEST_F(HttpNetworkTransactionTest, ChangeAuthRealms) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ChangeAuthRealms) { |
SessionDependencies session_deps; |
HttpRequestInfo request; |
@@ -6493,9 +6518,9 @@ |
EXPECT_TRUE(response->auth_challenge.get() == NULL); |
} |
-TEST_F(HttpNetworkTransactionTest, HonorAlternateProtocolHeader) { |
- HttpStreamFactory::set_next_protos(MakeNextProtos("foo", "bar", NULL)); |
+TEST_F(HttpNetworkTransactionSpdy3Test, HonorAlternateProtocolHeader) { |
HttpStreamFactory::set_use_alternate_protocols(true); |
+ HttpStreamFactory::SetNextProtos(SpdyNextProtos()); |
SessionDependencies session_deps; |
@@ -6551,10 +6576,11 @@ |
EXPECT_TRUE(expected_alternate.Equals(alternate)); |
HttpStreamFactory::set_use_alternate_protocols(false); |
- HttpStreamFactory::set_next_protos(std::vector<std::string>()); |
+ HttpStreamFactory::SetNextProtos(std::vector<std::string>()); |
} |
-TEST_F(HttpNetworkTransactionTest, MarkBrokenAlternateProtocolAndFallback) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
+ MarkBrokenAlternateProtocolAndFallback) { |
HttpStreamFactory::set_use_alternate_protocols(true); |
SessionDependencies session_deps; |
@@ -6613,7 +6639,8 @@ |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
-TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortRestrictedBlocked) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
+ AlternateProtocolPortRestrictedBlocked) { |
// Ensure that we're not allowed to redirect traffic via an alternate |
// protocol to an unrestricted (port >= 1024) when the original traffic was |
// on a restricted port (port < 1024). Ensure that we can redirect in all |
@@ -6662,7 +6689,8 @@ |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
-TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortRestrictedAllowed) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
+ AlternateProtocolPortRestrictedAllowed) { |
// Ensure that we're not allowed to redirect traffic via an alternate |
// protocol to an unrestricted (port >= 1024) when the original traffic was |
// on a restricted port (port < 1024). Ensure that we can redirect in all |
@@ -6711,7 +6739,8 @@ |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
-TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortUnrestrictedAllowed1) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
+ AlternateProtocolPortUnrestrictedAllowed1) { |
// Ensure that we're not allowed to redirect traffic via an alternate |
// protocol to an unrestricted (port >= 1024) when the original traffic was |
// on a restricted port (port < 1024). Ensure that we can redirect in all |
@@ -6760,7 +6789,8 @@ |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
-TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortUnrestrictedAllowed2) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
+ AlternateProtocolPortUnrestrictedAllowed2) { |
// Ensure that we're not allowed to redirect traffic via an alternate |
// protocol to an unrestricted (port >= 1024) when the original traffic was |
// on a restricted port (port < 1024). Ensure that we can redirect in all |
@@ -6809,7 +6839,7 @@ |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
-TEST_F(HttpNetworkTransactionTest, AlternateProtocolUnsafeBlocked) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, AlternateProtocolUnsafeBlocked) { |
// Ensure that we're not allowed to redirect traffic via an alternate |
// protocol to an unsafe port, and that we resume the second |
// HttpStreamFactoryImpl::Job once the alternate protocol request fails. |
@@ -6863,9 +6893,9 @@ |
EXPECT_EQ("hello world", response_data); |
} |
-TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForNpnSpdy) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, UseAlternateProtocolForNpnSpdy) { |
HttpStreamFactory::set_use_alternate_protocols(true); |
- HttpStreamFactory::set_next_protos(SpdyNextProtos()); |
+ HttpStreamFactory::SetNextProtos(SpdyNextProtos()); |
SessionDependencies session_deps; |
HttpRequestInfo request; |
@@ -6948,13 +6978,13 @@ |
ASSERT_EQ(OK, ReadTransaction(trans.get(), &response_data)); |
EXPECT_EQ("hello!", response_data); |
- HttpStreamFactory::set_next_protos(std::vector<std::string>()); |
+ HttpStreamFactory::SetNextProtos(std::vector<std::string>()); |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
-TEST_F(HttpNetworkTransactionTest, AlternateProtocolWithSpdyLateBinding) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, AlternateProtocolWithSpdyLateBinding) { |
HttpStreamFactory::set_use_alternate_protocols(true); |
- HttpStreamFactory::set_next_protos(SpdyNextProtos()); |
+ HttpStreamFactory::SetNextProtos(SpdyNextProtos()); |
SessionDependencies session_deps; |
HttpRequestInfo request; |
@@ -7064,13 +7094,13 @@ |
ASSERT_EQ(OK, ReadTransaction(&trans3, &response_data)); |
EXPECT_EQ("hello!", response_data); |
- HttpStreamFactory::set_next_protos(std::vector<std::string>()); |
+ HttpStreamFactory::SetNextProtos(std::vector<std::string>()); |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
-TEST_F(HttpNetworkTransactionTest, StallAlternateProtocolForNpnSpdy) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, StallAlternateProtocolForNpnSpdy) { |
HttpStreamFactory::set_use_alternate_protocols(true); |
- HttpStreamFactory::set_next_protos(SpdyNextProtos()); |
+ HttpStreamFactory::SetNextProtos(SpdyNextProtos()); |
SessionDependencies session_deps; |
HttpRequestInfo request; |
@@ -7138,7 +7168,7 @@ |
ASSERT_EQ(OK, ReadTransaction(trans.get(), &response_data)); |
EXPECT_EQ("hello world", response_data); |
- HttpStreamFactory::set_next_protos(std::vector<std::string>()); |
+ HttpStreamFactory::SetNextProtos(std::vector<std::string>()); |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
@@ -7191,9 +7221,10 @@ |
DISALLOW_COPY_AND_ASSIGN(CapturingProxyResolver); |
}; |
-TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForTunneledNpnSpdy) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
+ UseAlternateProtocolForTunneledNpnSpdy) { |
HttpStreamFactory::set_use_alternate_protocols(true); |
- HttpStreamFactory::set_next_protos(SpdyNextProtos()); |
+ HttpStreamFactory::SetNextProtos(SpdyNextProtos()); |
ProxyConfig proxy_config; |
proxy_config.set_auto_detect(true); |
@@ -7299,14 +7330,14 @@ |
EXPECT_EQ("https://www.google.com/", |
capturing_proxy_resolver->resolved()[1].spec()); |
- HttpStreamFactory::set_next_protos(std::vector<std::string>()); |
+ HttpStreamFactory::SetNextProtos(std::vector<std::string>()); |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
-TEST_F(HttpNetworkTransactionTest, |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
UseAlternateProtocolForNpnSpdyWithExistingSpdySession) { |
HttpStreamFactory::set_use_alternate_protocols(true); |
- HttpStreamFactory::set_next_protos(SpdyNextProtos()); |
+ HttpStreamFactory::SetNextProtos(SpdyNextProtos()); |
SessionDependencies session_deps; |
HttpRequestInfo request; |
@@ -7417,7 +7448,7 @@ |
ASSERT_EQ(OK, ReadTransaction(trans.get(), &response_data)); |
EXPECT_EQ("hello!", response_data); |
- HttpStreamFactory::set_next_protos(std::vector<std::string>()); |
+ HttpStreamFactory::SetNextProtos(std::vector<std::string>()); |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
@@ -7437,7 +7468,7 @@ |
// potentially running up to three rounds in each of the tests. The TestConfig |
// specifies both the configuration for the test as well as the expectations |
// for the results. |
-TEST_F(HttpNetworkTransactionTest, GenerateAuthToken) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, GenerateAuthToken) { |
static const char kServer[] = "http://www.example.com"; |
static const char kSecureServer[] = "https://www.example.com"; |
static const char kProxy[] = "myproxy:70"; |
@@ -7835,7 +7866,7 @@ |
} |
} |
-TEST_F(HttpNetworkTransactionTest, MultiRoundAuth) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, MultiRoundAuth) { |
// Do multi-round authentication and make sure it works correctly. |
SessionDependencies session_deps; |
HttpAuthHandlerMock::Factory* auth_factory( |
@@ -8049,7 +8080,7 @@ |
// Test that we restart a connection when we see a decompression failure from |
// the peer during the handshake. (In the real world we'll restart with SSLv3 |
// and we won't offer DEFLATE in that case.) |
-TEST_F(HttpNetworkTransactionTest, RestartAfterTLSDecompressionFailure) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, RestartAfterTLSDecompressionFailure) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("https://tlsdecompressionfailure.example.com/"); |
@@ -8096,7 +8127,7 @@ |
// peer while reading the first bytes from the connection. This occurs when the |
// peer cannot handle DEFLATE but we're using False Start, so we don't notice |
// in the handshake. |
-TEST_F(HttpNetworkTransactionTest, |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
RestartAfterTLSDecompressionFailureWithFalseStart) { |
HttpRequestInfo request; |
request.method = "GET"; |
@@ -8136,9 +8167,9 @@ |
// This tests the case that a request is issued via http instead of spdy after |
// npn is negotiated. |
-TEST_F(HttpNetworkTransactionTest, NpnWithHttpOverSSL) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, NpnWithHttpOverSSL) { |
HttpStreamFactory::set_use_alternate_protocols(true); |
- HttpStreamFactory::set_next_protos( |
+ HttpStreamFactory::SetNextProtos( |
MakeNextProtos("http/1.1", "http1.1", NULL)); |
SessionDependencies session_deps; |
HttpRequestInfo request; |
@@ -8192,16 +8223,16 @@ |
EXPECT_FALSE(response->was_fetched_via_spdy); |
EXPECT_TRUE(response->was_npn_negotiated); |
- HttpStreamFactory::set_next_protos(std::vector<std::string>()); |
+ HttpStreamFactory::SetNextProtos(std::vector<std::string>()); |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
-TEST_F(HttpNetworkTransactionTest, SpdyPostNPNServerHangup) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, SpdyPostNPNServerHangup) { |
// Simulate the SSL handshake completing with an NPN negotiation |
// followed by an immediate server closing of the socket. |
// Fix crash: http://crbug.com/46369 |
HttpStreamFactory::set_use_alternate_protocols(true); |
- HttpStreamFactory::set_next_protos(SpdyNextProtos()); |
+ HttpStreamFactory::SetNextProtos(SpdyNextProtos()); |
SessionDependencies session_deps; |
HttpRequestInfo request; |
@@ -8236,15 +8267,15 @@ |
EXPECT_EQ(ERR_IO_PENDING, rv); |
EXPECT_EQ(ERR_CONNECTION_CLOSED, callback.WaitForResult()); |
- HttpStreamFactory::set_next_protos(std::vector<std::string>()); |
+ HttpStreamFactory::SetNextProtos(std::vector<std::string>()); |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
-TEST_F(HttpNetworkTransactionTest, SpdyAlternateProtocolThroughProxy) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, SpdyAlternateProtocolThroughProxy) { |
// This test ensures that the URL passed into the proxy is upgraded |
// to https when doing an Alternate Protocol upgrade. |
HttpStreamFactory::set_use_alternate_protocols(true); |
- HttpStreamFactory::set_next_protos( |
+ HttpStreamFactory::SetNextProtos( |
MakeNextProtos( |
"http/1.1", "http1.1", "spdy/2.1", "spdy/2", "spdy", NULL)); |
@@ -8386,13 +8417,13 @@ |
EXPECT_EQ("https", request_url.scheme()); |
EXPECT_EQ("www.google.com", request_url.host()); |
- HttpStreamFactory::set_next_protos(std::vector<std::string>()); |
+ HttpStreamFactory::SetNextProtos(std::vector<std::string>()); |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
// Test that if we cancel the transaction as the connection is completing, that |
// everything tears down correctly. |
-TEST_F(HttpNetworkTransactionTest, SimpleCancel) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, SimpleCancel) { |
// Setup everything about the connection to complete synchronously, so that |
// after calling HttpNetworkTransaction::Start, the only thing we're waiting |
// for is the callback from the HttpStreamRequest. |
@@ -8430,7 +8461,7 @@ |
} |
// Test a basic GET request through a proxy. |
-TEST_F(HttpNetworkTransactionTest, ProxyGet) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ProxyGet) { |
SessionDependencies session_deps(ProxyService::CreateFixed("myproxy:70")); |
CapturingBoundNetLog log(CapturingNetLog::kUnbounded); |
session_deps.net_log = log.bound().net_log(); |
@@ -8478,7 +8509,7 @@ |
} |
// Test a basic HTTPS GET request through a proxy. |
-TEST_F(HttpNetworkTransactionTest, ProxyTunnelGet) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ProxyTunnelGet) { |
SessionDependencies session_deps(ProxyService::CreateFixed("myproxy:70")); |
CapturingBoundNetLog log(CapturingNetLog::kUnbounded); |
session_deps.net_log = log.bound().net_log(); |
@@ -8545,7 +8576,7 @@ |
// Test a basic HTTPS GET request through a proxy, but the server hangs up |
// while establishing the tunnel. |
-TEST_F(HttpNetworkTransactionTest, ProxyTunnelGetHangup) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ProxyTunnelGetHangup) { |
SessionDependencies session_deps(ProxyService::CreateFixed("myproxy:70")); |
CapturingBoundNetLog log(CapturingNetLog::kUnbounded); |
session_deps.net_log = log.bound().net_log(); |
@@ -8599,7 +8630,7 @@ |
} |
// Test for crbug.com/55424. |
-TEST_F(HttpNetworkTransactionTest, PreconnectWithExistingSpdySession) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, PreconnectWithExistingSpdySession) { |
SessionDependencies session_deps; |
scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyGet( |
@@ -8688,7 +8719,7 @@ |
ASSERT_EQ(error, rv); |
} |
-TEST_F(HttpNetworkTransactionTest, SSLWriteCertError) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, SSLWriteCertError) { |
// Just check a grab bag of cert errors. |
static const int kErrors[] = { |
ERR_CERT_COMMON_NAME_INVALID, |
@@ -8707,7 +8738,8 @@ |
// 2) TLS False Start is disabled. |
// 3) The initial TLS handshake requests a client certificate. |
// 4) The client supplies an invalid/unacceptable certificate. |
-TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Direct_NoFalseStart) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
+ ClientAuthCertCache_Direct_NoFalseStart) { |
net::HttpRequestInfo request_info; |
request_info.url = GURL("https://www.example.com/"); |
request_info.method = "GET"; |
@@ -8797,7 +8829,7 @@ |
// 2) TLS False Start is enabled. |
// 3) The initial TLS handshake requests a client certificate. |
// 4) The client supplies an invalid/unacceptable certificate. |
-TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Direct_FalseStart) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ClientAuthCertCache_Direct_FalseStart) { |
net::HttpRequestInfo request_info; |
request_info.url = GURL("https://www.example.com/"); |
request_info.method = "GET"; |
@@ -8904,7 +8936,7 @@ |
// proxy. |
// The test is repeated twice, first for connecting to an HTTPS endpoint, |
// then for connecting to an HTTP endpoint. |
-TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Proxy_Fail) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ClientAuthCertCache_Proxy_Fail) { |
SessionDependencies session_deps( |
ProxyService::CreateFixed("https://proxy:70")); |
CapturingBoundNetLog log(CapturingNetLog::kUnbounded); |
@@ -8994,6 +9026,8 @@ |
} |
} |
+namespace { |
+ |
void IPPoolingAddAlias(MockCachingHostResolver* host_resolver, |
SpdySessionPoolPeer* pool_peer, |
std::string host, |
@@ -9027,9 +9061,11 @@ |
pool_peer->AddAlias(address, pair); |
} |
-TEST_F(HttpNetworkTransactionTest, UseIPConnectionPooling) { |
+} // namespace |
+ |
+TEST_F(HttpNetworkTransactionSpdy3Test, UseIPConnectionPooling) { |
HttpStreamFactory::set_use_alternate_protocols(true); |
- HttpStreamFactory::set_next_protos(SpdyNextProtos()); |
+ HttpStreamFactory::SetNextProtos(SpdyNextProtos()); |
// Set up a special HttpNetworkSession with a MockCachingHostResolver. |
SessionDependencies session_deps; |
@@ -9133,7 +9169,7 @@ |
ASSERT_EQ(OK, ReadTransaction(&trans2, &response_data)); |
EXPECT_EQ("hello!", response_data); |
- HttpStreamFactory::set_next_protos(std::vector<std::string>()); |
+ HttpStreamFactory::SetNextProtos(std::vector<std::string>()); |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
@@ -9177,10 +9213,10 @@ |
const HostPortPair host_port_; |
}; |
-TEST_F(HttpNetworkTransactionTest, |
+TEST_F(HttpNetworkTransactionSpdy3Test, |
UseIPConnectionPoolingWithHostCacheExpiration) { |
HttpStreamFactory::set_use_alternate_protocols(true); |
- HttpStreamFactory::set_next_protos(SpdyNextProtos()); |
+ HttpStreamFactory::SetNextProtos(SpdyNextProtos()); |
// Set up a special HttpNetworkSession with a OneTimeCachingHostResolver. |
SessionDependencies session_deps; |
@@ -9283,11 +9319,11 @@ |
ASSERT_EQ(OK, ReadTransaction(&trans2, &response_data)); |
EXPECT_EQ("hello!", response_data); |
- HttpStreamFactory::set_next_protos(std::vector<std::string>()); |
+ HttpStreamFactory::SetNextProtos(std::vector<std::string>()); |
HttpStreamFactory::set_use_alternate_protocols(false); |
} |
-TEST_F(HttpNetworkTransactionTest, ReadPipelineEvictionFallback) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, ReadPipelineEvictionFallback) { |
MockRead data_reads1[] = { |
MockRead(SYNCHRONOUS, ERR_PIPELINE_EVICTION), |
}; |
@@ -9307,7 +9343,7 @@ |
EXPECT_EQ("hello world", out.response_data); |
} |
-TEST_F(HttpNetworkTransactionTest, SendPipelineEvictionFallback) { |
+TEST_F(HttpNetworkTransactionSpdy3Test, SendPipelineEvictionFallback) { |
MockWrite data_writes1[] = { |
MockWrite(SYNCHRONOUS, ERR_PIPELINE_EVICTION), |
}; |