summaryrefslogtreecommitdiffstats
path: root/net/http/http_network_transaction_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/http/http_network_transaction_unittest.cc')
-rw-r--r--net/http/http_network_transaction_unittest.cc106
1 files changed, 53 insertions, 53 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 28465b3..91c0d0b 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -96,7 +96,7 @@ class HttpNetworkTransactionTest : public PlatformTest {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
out.rv = callback.WaitForResult();
@@ -169,12 +169,12 @@ class CaptureGroupNameSocketPool : public ClientSocketPool {
public:
CaptureGroupNameSocketPool() {
}
- virtual int RequestSocket(LoadLog* load_log,
- const std::string& group_name,
+ virtual int RequestSocket(const std::string& group_name,
const HostResolver::RequestInfo& resolve_info,
int priority,
ClientSocketHandle* handle,
- CompletionCallback* callback) {
+ CompletionCallback* callback,
+ LoadLog* load_log) {
last_group_name_ = group_name;
return ERR_IO_PENDING;
}
@@ -352,7 +352,7 @@ TEST_F(HttpNetworkTransactionTest, Head) {
TestCompletionCallback callback1;
- int rv = trans->Start(NULL, &request, &callback1);
+ int rv = trans->Start(&request, &callback1, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -410,7 +410,7 @@ TEST_F(HttpNetworkTransactionTest, ReuseConnection) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -454,7 +454,7 @@ TEST_F(HttpNetworkTransactionTest, Ignores100) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -498,7 +498,7 @@ TEST_F(HttpNetworkTransactionTest, Ignores1xx) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -554,7 +554,7 @@ void HttpNetworkTransactionTest::KeepAliveConnectionResendRequestTest(
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(session, &session_deps.socket_factory));
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -606,7 +606,7 @@ TEST_F(HttpNetworkTransactionTest, NonKeepAliveConnectionReset) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -693,7 +693,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuth) {
TestCompletionCallback callback1;
- int rv = trans->Start(NULL, &request, &callback1);
+ int rv = trans->Start(&request, &callback1, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -769,7 +769,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAlive) {
TestCompletionCallback callback1;
- int rv = trans->Start(NULL, &request, &callback1);
+ int rv = trans->Start(&request, &callback1, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -848,7 +848,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveNoBody) {
TestCompletionCallback callback1;
- int rv = trans->Start(NULL, &request, &callback1);
+ int rv = trans->Start(&request, &callback1, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -930,7 +930,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveLargeBody) {
TestCompletionCallback callback1;
- int rv = trans->Start(NULL, &request, &callback1);
+ int rv = trans->Start(&request, &callback1, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -1011,7 +1011,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyKeepAlive) {
TestCompletionCallback callback1;
- int rv = trans->Start(NULL, &request, &callback1);
+ int rv = trans->Start(&request, &callback1, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -1093,7 +1093,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyCancelTunnel) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -1146,7 +1146,7 @@ void HttpNetworkTransactionTest::ConnectStatusHelperWithExpectedStatus(
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -1406,7 +1406,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyThenServer) {
TestCompletionCallback callback1;
- int rv = trans->Start(NULL, &request, &callback1);
+ int rv = trans->Start(&request, &callback1, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -1541,7 +1541,7 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth1) {
TestCompletionCallback callback1;
- int rv = trans->Start(NULL, &request, &callback1);
+ int rv = trans->Start(&request, &callback1, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -1715,7 +1715,7 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth2) {
TestCompletionCallback callback1;
- int rv = trans->Start(NULL, &request, &callback1);
+ int rv = trans->Start(&request, &callback1, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -1810,7 +1810,7 @@ TEST_F(HttpNetworkTransactionTest, LargeHeadersNoBody) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -1858,7 +1858,7 @@ TEST_F(HttpNetworkTransactionTest, DontRecycleTCPSocketForSSLTunnel) {
TestCompletionCallback callback1;
- int rv = trans->Start(NULL, &request, &callback1);
+ int rv = trans->Start(&request, &callback1, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -1908,7 +1908,7 @@ TEST_F(HttpNetworkTransactionTest, RecycleSocket) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -1966,7 +1966,7 @@ TEST_F(HttpNetworkTransactionTest, RecycleSocketAfterZeroContentLength) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -2060,7 +2060,7 @@ TEST_F(HttpNetworkTransactionTest, ResendRequestOnWriteBodyError) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request[i], &callback);
+ int rv = trans->Start(&request[i], &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -2135,7 +2135,7 @@ TEST_F(HttpNetworkTransactionTest, AuthIdentityInUrl) {
TestCompletionCallback callback1;
- int rv = trans->Start(NULL, &request, &callback1);
+ int rv = trans->Start(&request, &callback1, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -2211,7 +2211,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
TestCompletionCallback callback1;
- int rv = trans->Start(NULL, &request, &callback1);
+ int rv = trans->Start(&request, &callback1, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -2295,7 +2295,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
TestCompletionCallback callback1;
- int rv = trans->Start(NULL, &request, &callback1);
+ int rv = trans->Start(&request, &callback1, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -2360,7 +2360,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
TestCompletionCallback callback1;
- int rv = trans->Start(NULL, &request, &callback1);
+ int rv = trans->Start(&request, &callback1, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -2421,7 +2421,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
TestCompletionCallback callback1;
- int rv = trans->Start(NULL, &request, &callback1);
+ int rv = trans->Start(&request, &callback1, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -2508,7 +2508,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
TestCompletionCallback callback1;
- int rv = trans->Start(NULL, &request, &callback1);
+ int rv = trans->Start(&request, &callback1, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -2645,7 +2645,7 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificate) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -2721,7 +2721,7 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaProxy) {
CreateSession(&session_deps),
&session_deps.socket_factory));
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -2772,7 +2772,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_UserAgent) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -2812,7 +2812,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_Referer) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -2850,7 +2850,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_PostContentLengthZero) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -2888,7 +2888,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_PutContentLengthZero) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -2926,7 +2926,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_HeadContentLengthZero) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -2966,7 +2966,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_CacheControlNoCache) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3006,7 +3006,7 @@ TEST_F(HttpNetworkTransactionTest,
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3045,7 +3045,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_ExtraHeaders) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3090,7 +3090,7 @@ TEST_F(HttpNetworkTransactionTest, SOCKS4_HTTP_GET) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3148,7 +3148,7 @@ TEST_F(HttpNetworkTransactionTest, SOCKS4_SSL_GET) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3207,7 +3207,7 @@ TEST_F(HttpNetworkTransactionTest, SOCKS5_HTTP_GET) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3270,7 +3270,7 @@ TEST_F(HttpNetworkTransactionTest, SOCKS5_SSL_GET) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3350,7 +3350,7 @@ TEST_F(HttpNetworkTransactionTest, GroupNameForProxyConnections) {
TestCompletionCallback callback;
// We do not complete this request, the dtor will clean the transaction up.
- EXPECT_EQ(ERR_IO_PENDING, trans->Start(NULL, &request, &callback));
+ EXPECT_EQ(ERR_IO_PENDING, trans->Start(&request, &callback, NULL));
EXPECT_EQ(tests[i].expected_group_name,
conn_pool->last_group_name_received());
}
@@ -3373,7 +3373,7 @@ TEST_F(HttpNetworkTransactionTest, ReconsiderProxyAfterFailedConnection) {
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3449,7 +3449,7 @@ TEST_F(HttpNetworkTransactionTest, ResolveMadeWithReferrer) {
// Run the request until it fails reading from the socket.
TestCompletionCallback callback;
- int rv = trans->Start(NULL, &request, &callback);
+ int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
EXPECT_EQ(ERR_FAILED, rv);
@@ -3473,16 +3473,16 @@ TEST_F(HttpNetworkTransactionTest, BypassHostCacheOnRefresh) {
// a synchronous lookup.)
AddressList addrlist;
int rv = session_deps.host_resolver->Resolve(
- NULL, HostResolver::RequestInfo("www.google.com", 80), &addrlist,
- NULL, NULL);
+ HostResolver::RequestInfo("www.google.com", 80), &addrlist,
+ NULL, NULL, NULL);
EXPECT_EQ(OK, rv);
// Verify that it was added to host cache, by doing a subsequent async lookup
// and confirming it completes synchronously.
TestCompletionCallback resolve_callback;
- rv = session_deps.host_resolver->Resolve(NULL,
+ rv = session_deps.host_resolver->Resolve(
HostResolver::RequestInfo("www.google.com", 80), &addrlist,
- &resolve_callback, NULL);
+ &resolve_callback, NULL, NULL);
ASSERT_EQ(OK, rv);
// Inject a failure the next time that "www.google.com" is resolved. This way
@@ -3504,7 +3504,7 @@ TEST_F(HttpNetworkTransactionTest, BypassHostCacheOnRefresh) {
// Run the request.
TestCompletionCallback callback;
- rv = trans->Start(NULL, &request, &callback);
+ rv = trans->Start(&request, &callback, NULL);
ASSERT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
generated by cgit v1.1 at 2025-02-01 14:37:38 +0000