diff options
Diffstat (limited to 'net/http/http_network_transaction_unittest.cc')
-rw-r--r-- | net/http/http_network_transaction_unittest.cc | 688 |
1 files changed, 356 insertions, 332 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index c86033a..cca2f8e 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -198,11 +198,11 @@ class HttpNetworkTransactionTest : public PlatformTest { session_deps.socket_factory.AddSocketDataProvider(data[i]); } - TestOldCompletionCallback callback; + TestCompletionCallback callback; CapturingBoundNetLog log(CapturingNetLog::kUnbounded); EXPECT_TRUE(log.bound().IsLoggingAllEvents()); - int rv = trans->Start(&request, &callback, log.bound()); + int rv = trans->Start(&request, callback.callback(), log.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); out.rv = callback.WaitForResult(); @@ -316,7 +316,7 @@ class CaptureGroupNameSocketPool : public ParentPool { const void* socket_params, RequestPriority priority, ClientSocketHandle* handle, - OldCompletionCallback* callback, + const CompletionCallback& callback, const BoundNetLog& net_log) { last_group_name_ = group_name; return ERR_IO_PENDING; @@ -720,9 +720,9 @@ TEST_F(HttpNetworkTransactionTest, SingleLocationHeader) { StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -794,9 +794,9 @@ TEST_F(HttpNetworkTransactionTest, Head) { data_writes1, arraysize(data_writes1)); session_deps.socket_factory.AddSocketDataProvider(&data1); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -851,9 +851,9 @@ TEST_F(HttpNetworkTransactionTest, ReuseConnection) { scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -893,9 +893,9 @@ TEST_F(HttpNetworkTransactionTest, Ignores100) { StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -935,9 +935,9 @@ TEST_F(HttpNetworkTransactionTest, Ignores1xx) { StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -972,9 +972,9 @@ TEST_F(HttpNetworkTransactionTest, Incomplete100ThenEOF) { StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -1002,9 +1002,9 @@ TEST_F(HttpNetworkTransactionTest, EmptyResponse) { StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -1064,11 +1064,11 @@ void HttpNetworkTransactionTest::KeepAliveConnectionResendRequestTest( }; for (int i = 0; i < 2; ++i) { - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -1121,9 +1121,9 @@ TEST_F(HttpNetworkTransactionTest, NonKeepAliveConnectionReset) { StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -1198,11 +1198,11 @@ TEST_F(HttpNetworkTransactionTest, KeepAliveAfterUnreadBody) { std::string response_lines[kNumUnreadBodies]; for (size_t i = 0; i < arraysize(data1_reads) - 2; ++i) { - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -1233,9 +1233,9 @@ TEST_F(HttpNetworkTransactionTest, KeepAliveAfterUnreadBody) { for (int i = 0; i < kNumUnreadBodies; ++i) EXPECT_EQ(kStatusLines[i], response_lines[i]); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); EXPECT_EQ(OK, rv); @@ -1304,9 +1304,9 @@ TEST_F(HttpNetworkTransactionTest, BasicAuth) { session_deps.socket_factory.AddSocketDataProvider(&data1); session_deps.socket_factory.AddSocketDataProvider(&data2); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -1316,9 +1316,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuth) { ASSERT_TRUE(response != NULL); EXPECT_TRUE(CheckBasicServerAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBar), &callback2); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo, kBar), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); @@ -1358,9 +1359,9 @@ TEST_F(HttpNetworkTransactionTest, DoNotSendAuth) { StaticSocketDataProvider data(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -1422,10 +1423,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAlive) { session_deps.socket_factory.AddSocketDataProvider(&data1); session_deps.socket_factory.AddSocketDataProvider(&data2); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -1435,9 +1436,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAlive) { ASSERT_TRUE(response != NULL); EXPECT_TRUE(CheckBasicServerAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBar), &callback2); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo, kBar), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); @@ -1497,10 +1499,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveNoBody) { session_deps.socket_factory.AddSocketDataProvider(&data1); session_deps.socket_factory.AddSocketDataProvider(&data2); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -1510,9 +1512,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveNoBody) { ASSERT_TRUE(response != NULL); EXPECT_TRUE(CheckBasicServerAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBar), &callback2); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo, kBar), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); @@ -1580,10 +1583,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveLargeBody) { session_deps.socket_factory.AddSocketDataProvider(&data1); session_deps.socket_factory.AddSocketDataProvider(&data2); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -1593,9 +1596,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveLargeBody) { ASSERT_TRUE(response != NULL); EXPECT_TRUE(CheckBasicServerAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBar), &callback2); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo, kBar), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); @@ -1665,10 +1669,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveImpatientServer) { session_deps.socket_factory.AddSocketDataProvider(&data1); session_deps.socket_factory.AddSocketDataProvider(&data2); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -1678,9 +1682,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveImpatientServer) { ASSERT_TRUE(response != NULL); EXPECT_TRUE(CheckBasicServerAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBar), &callback2); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo, kBar), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); @@ -1747,11 +1752,11 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyNoKeepAlive) { SSLSocketDataProvider ssl(true, OK); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback1, log.bound()); + int rv = trans->Start(&request, callback1.callback(), log.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -1773,9 +1778,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyNoKeepAlive) { EXPECT_TRUE(HttpVersion(1, 1) == response->headers->GetHttpVersion()); EXPECT_TRUE(CheckBasicProxyAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBar), &callback2); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo, kBar), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); @@ -1849,9 +1855,9 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyKeepAlive) { data_writes1, arraysize(data_writes1)); session_deps.socket_factory.AddSocketDataProvider(&data1); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, log.bound()); + int rv = trans->Start(&request, callback1.callback(), log.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -1875,10 +1881,11 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyKeepAlive) { EXPECT_TRUE(HttpVersion(1, 1) == response->headers->GetHttpVersion()); EXPECT_TRUE(CheckBasicProxyAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; // Wrong password (should be "bar"). - rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBaz), &callback2); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo, kBaz), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); @@ -1932,9 +1939,9 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyCancelTunnel) { data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -1987,9 +1994,9 @@ TEST_F(HttpNetworkTransactionTest, UnexpectedProxyAuth) { data_writes1, arraysize(data_writes1)); session_deps.socket_factory.AddSocketDataProvider(&data1); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -2039,11 +2046,11 @@ TEST_F(HttpNetworkTransactionTest, HttpsServerRequestsProxyAuthThroughProxy) { SSLSocketDataProvider ssl(true, OK); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback1, log.bound()); + int rv = trans->Start(&request, callback1.callback(), log.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -2092,11 +2099,11 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxyGet) { SSLSocketDataProvider ssl(true, OK); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback1, log.bound()); + int rv = trans->Start(&request, callback1.callback(), log.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -2155,11 +2162,11 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyGet) { ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2; session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback1, log.bound()); + int rv = trans->Start(&request, callback1.callback(), log.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -2242,11 +2249,11 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyGetWithProxyAuth) { ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2; session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback1, log.bound()); + int rv = trans->Start(&request, callback1.callback(), log.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -2260,9 +2267,10 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyGetWithProxyAuth) { EXPECT_TRUE(response->was_fetched_via_spdy); EXPECT_TRUE(CheckBasicProxyAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBar), &callback2); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo, kBar), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); @@ -2340,9 +2348,9 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyConnectHttps) { ssl2.protocol_negotiated = SSLClientSocket::kProtoUnknown; session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, log.bound()); + int rv = trans->Start(&request, callback1.callback(), log.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -2417,9 +2425,9 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyConnectSpdy) { ssl2.protocol_negotiated = SSLClientSocket::kProtoSPDY2; session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, log.bound()); + int rv = trans->Start(&request, callback1.callback(), log.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -2486,9 +2494,9 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyConnectFailure) { ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2; session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, log.bound()); + int rv = trans->Start(&request, callback1.callback(), log.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -2549,11 +2557,11 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxyAuthRetry) { SSLSocketDataProvider ssl(true, OK); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback1, log.bound()); + int rv = trans->Start(&request, callback1.callback(), log.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -2566,9 +2574,10 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxyAuthRetry) { EXPECT_TRUE(HttpVersion(1, 1) == response->headers->GetHttpVersion()); EXPECT_TRUE(CheckBasicProxyAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBar), &callback2); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo, kBar), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); @@ -2616,11 +2625,11 @@ void HttpNetworkTransactionTest::ConnectStatusHelperWithExpectedStatus( data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -2880,9 +2889,9 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyThenServer) { session_deps.socket_factory.AddSocketDataProvider(&data2); session_deps.socket_factory.AddSocketDataProvider(&data3); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -2892,9 +2901,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyThenServer) { ASSERT_TRUE(response != NULL); EXPECT_TRUE(CheckBasicProxyAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBar), &callback2); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo, kBar), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); @@ -2904,9 +2914,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyThenServer) { ASSERT_TRUE(response != NULL); EXPECT_TRUE(CheckBasicServerAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback3; + TestCompletionCallback callback3; - rv = trans->RestartWithAuth(AuthCredentials(kFoo2, kBar2), &callback3); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo2, kBar2), callback3.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback3.WaitForResult(); @@ -3009,11 +3020,11 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth1) { session_deps.socket_factory.AddSocketDataProvider(&data1); session_deps.socket_factory.AddSocketDataProvider(&data2); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -3025,10 +3036,10 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth1) { ASSERT_FALSE(response == NULL); EXPECT_TRUE(CheckNTLMServerAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; rv = trans->RestartWithAuth(AuthCredentials(kTestingNTLM, kTestingNTLM), - &callback2); + callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); @@ -3040,9 +3051,9 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth1) { ASSERT_TRUE(response != NULL); EXPECT_TRUE(response->auth_challenge.get() == NULL); - TestOldCompletionCallback callback3; + TestCompletionCallback callback3; - rv = trans->RestartWithAuth(AuthCredentials(), &callback3); + rv = trans->RestartWithAuth(AuthCredentials(), callback3.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback3.WaitForResult(); @@ -3189,11 +3200,11 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth2) { session_deps.socket_factory.AddSocketDataProvider(&data2); session_deps.socket_factory.AddSocketDataProvider(&data3); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -3205,19 +3216,19 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth2) { ASSERT_TRUE(response != NULL); EXPECT_TRUE(CheckNTLMServerAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; // Enter the wrong password. rv = trans->RestartWithAuth(AuthCredentials(kTestingNTLM, kWrongPassword), - &callback2); + callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); EXPECT_EQ(OK, rv); EXPECT_TRUE(trans->IsReadyToRestartForAuth()); - TestOldCompletionCallback callback3; - rv = trans->RestartWithAuth(AuthCredentials(), &callback3); + TestCompletionCallback callback3; + rv = trans->RestartWithAuth(AuthCredentials(), callback3.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback3.WaitForResult(); EXPECT_EQ(OK, rv); @@ -3227,11 +3238,11 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth2) { ASSERT_FALSE(response == NULL); EXPECT_TRUE(CheckNTLMServerAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback4; + TestCompletionCallback callback4; // Now enter the right password. rv = trans->RestartWithAuth(AuthCredentials(kTestingNTLM, kTestingNTLM), - &callback4); + callback4.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback4.WaitForResult(); @@ -3239,10 +3250,10 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth2) { EXPECT_TRUE(trans->IsReadyToRestartForAuth()); - TestOldCompletionCallback callback5; + TestCompletionCallback callback5; // One more roundtrip - rv = trans->RestartWithAuth(AuthCredentials(), &callback5); + rv = trans->RestartWithAuth(AuthCredentials(), callback5.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback5.WaitForResult(); @@ -3280,9 +3291,9 @@ TEST_F(HttpNetworkTransactionTest, LargeHeadersNoBody) { StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -3328,9 +3339,9 @@ TEST_F(HttpNetworkTransactionTest, DontRecycleTransportSocketForSSLTunnel) { data_writes1, arraysize(data_writes1)); session_deps.socket_factory.AddSocketDataProvider(&data1); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -3377,9 +3388,9 @@ TEST_F(HttpNetworkTransactionTest, RecycleSocket) { StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -3436,12 +3447,12 @@ TEST_F(HttpNetworkTransactionTest, RecycleSSLSocket) { data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -3504,12 +3515,12 @@ TEST_F(HttpNetworkTransactionTest, RecycleDeadSSLSocket) { session_deps.socket_factory.AddSocketDataProvider(&data); session_deps.socket_factory.AddSocketDataProvider(&data2); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -3537,7 +3548,7 @@ TEST_F(HttpNetworkTransactionTest, RecycleDeadSSLSocket) { trans.reset(new HttpNetworkTransaction(session)); - rv = trans->Start(&request, &callback, BoundNetLog()); + rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -3588,9 +3599,9 @@ TEST_F(HttpNetworkTransactionTest, RecycleSocketAfterZeroContentLength) { StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -3684,9 +3695,9 @@ TEST_F(HttpNetworkTransactionTest, ResendRequestOnWriteBodyError) { scoped_ptr<HttpTransaction> trans( new HttpNetworkTransaction(session)); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request[i], &callback, BoundNetLog()); + int rv = trans->Start(&request[i], callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -3759,17 +3770,17 @@ TEST_F(HttpNetworkTransactionTest, AuthIdentityInURL) { session_deps.socket_factory.AddSocketDataProvider(&data1); session_deps.socket_factory.AddSocketDataProvider(&data2); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); EXPECT_EQ(OK, rv); EXPECT_TRUE(trans->IsReadyToRestartForAuth()); - TestOldCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(), &callback2); + TestCompletionCallback callback2; + rv = trans->RestartWithAuth(AuthCredentials(), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); EXPECT_EQ(OK, rv); @@ -3857,17 +3868,17 @@ TEST_F(HttpNetworkTransactionTest, WrongAuthIdentityInURL) { session_deps.socket_factory.AddSocketDataProvider(&data2); session_deps.socket_factory.AddSocketDataProvider(&data3); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); EXPECT_EQ(OK, rv); EXPECT_TRUE(trans->IsReadyToRestartForAuth()); - TestOldCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(), &callback2); + TestCompletionCallback callback2; + rv = trans->RestartWithAuth(AuthCredentials(), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); EXPECT_EQ(OK, rv); @@ -3877,8 +3888,9 @@ TEST_F(HttpNetworkTransactionTest, WrongAuthIdentityInURL) { ASSERT_TRUE(response != NULL); EXPECT_TRUE(CheckBasicServerAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback3; - rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBar), &callback3); + TestCompletionCallback callback3; + rv = trans->RestartWithAuth( + AuthCredentials(kFoo, kBar), callback3.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback3.WaitForResult(); EXPECT_EQ(OK, rv); @@ -3945,9 +3957,9 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { session_deps.socket_factory.AddSocketDataProvider(&data1); session_deps.socket_factory.AddSocketDataProvider(&data2); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -3957,9 +3969,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { ASSERT_TRUE(response != NULL); EXPECT_TRUE(CheckBasicServerAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBar), &callback2); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo, kBar), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); @@ -4023,9 +4036,9 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { session_deps.socket_factory.AddSocketDataProvider(&data1); session_deps.socket_factory.AddSocketDataProvider(&data2); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -4040,9 +4053,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { EXPECT_EQ("MyRealm2", response->auth_challenge->realm); EXPECT_EQ("basic", response->auth_challenge->scheme); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(kFoo2, kBar2), &callback2); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo2, kBar2), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); @@ -4086,9 +4100,9 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { data_writes1, arraysize(data_writes1)); session_deps.socket_factory.AddSocketDataProvider(&data1); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -4148,17 +4162,17 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { session_deps.socket_factory.AddSocketDataProvider(&data1); session_deps.socket_factory.AddSocketDataProvider(&data2); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); EXPECT_EQ(OK, rv); EXPECT_TRUE(trans->IsReadyToRestartForAuth()); - TestOldCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(), &callback2); + TestCompletionCallback callback2; + rv = trans->RestartWithAuth(AuthCredentials(), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); EXPECT_EQ(OK, rv); @@ -4237,17 +4251,17 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { session_deps.socket_factory.AddSocketDataProvider(&data2); session_deps.socket_factory.AddSocketDataProvider(&data3); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); EXPECT_EQ(OK, rv); EXPECT_TRUE(trans->IsReadyToRestartForAuth()); - TestOldCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(), &callback2); + TestCompletionCallback callback2; + rv = trans->RestartWithAuth(AuthCredentials(), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); EXPECT_EQ(OK, rv); @@ -4257,9 +4271,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { ASSERT_TRUE(response != NULL); EXPECT_TRUE(CheckBasicServerAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback3; + TestCompletionCallback callback3; - rv = trans->RestartWithAuth(AuthCredentials(kFoo3, kBar3), &callback3); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo3, kBar3), callback3.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback3.WaitForResult(); @@ -4330,9 +4345,9 @@ TEST_F(HttpNetworkTransactionTest, DigestPreAuthNonceCount) { session_deps.socket_factory.AddSocketDataProvider(&data1); session_deps.socket_factory.AddSocketDataProvider(&data2); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -4342,9 +4357,10 @@ TEST_F(HttpNetworkTransactionTest, DigestPreAuthNonceCount) { ASSERT_TRUE(response != NULL); EXPECT_TRUE(CheckDigestServerAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBar), &callback2); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo, kBar), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); @@ -4391,9 +4407,9 @@ TEST_F(HttpNetworkTransactionTest, DigestPreAuthNonceCount) { data_writes1, arraysize(data_writes1)); session_deps.socket_factory.AddSocketDataProvider(&data1); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -4483,15 +4499,15 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificate) { session_deps.socket_factory.AddSSLSocketDataProvider(&ssl_bad); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, rv); - rv = trans->RestartIgnoringLastError(&callback); + rv = trans->RestartIgnoringLastError(callback.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -4554,7 +4570,7 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaProxy) { session_deps.socket_factory.AddSSLSocketDataProvider(&ssl_bad); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); - TestOldCompletionCallback callback; + TestCompletionCallback callback; for (int i = 0; i < 2; i++) { session_deps.socket_factory.ResetNextMockIndexes(); @@ -4562,13 +4578,13 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaProxy) { scoped_ptr<HttpTransaction> trans( new HttpNetworkTransaction(CreateSession(&session_deps))); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, rv); - rv = trans->RestartIgnoringLastError(&callback); + rv = trans->RestartIgnoringLastError(callback.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -4618,12 +4634,12 @@ TEST_F(HttpNetworkTransactionTest, HTTPSViaHttpsProxy) { session_deps.socket_factory.AddSSLSocketDataProvider(&proxy_ssl); session_deps.socket_factory.AddSSLSocketDataProvider(&tunnel_ssl); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_ptr<HttpTransaction> trans( new HttpNetworkTransaction(CreateSession(&session_deps))); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -4668,12 +4684,12 @@ TEST_F(HttpNetworkTransactionTest, RedirectOfHttpsConnectViaHttpsProxy) { session_deps.socket_factory.AddSocketDataProvider(&data); session_deps.socket_factory.AddSSLSocketDataProvider(&proxy_ssl); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_ptr<HttpTransaction> trans( new HttpNetworkTransaction(CreateSession(&session_deps))); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -4730,12 +4746,12 @@ TEST_F(HttpNetworkTransactionTest, RedirectOfHttpsConnectViaSpdyProxy) { session_deps.socket_factory.AddSocketDataProvider(data.get()); session_deps.socket_factory.AddSSLSocketDataProvider(&proxy_ssl); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_ptr<HttpTransaction> trans( new HttpNetworkTransaction(CreateSession(&session_deps))); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -4780,12 +4796,12 @@ TEST_F(HttpNetworkTransactionTest, ErrorResponseTofHttpsConnectViaHttpsProxy) { session_deps.socket_factory.AddSocketDataProvider(&data); session_deps.socket_factory.AddSSLSocketDataProvider(&proxy_ssl); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_ptr<HttpTransaction> trans( new HttpNetworkTransaction(CreateSession(&session_deps))); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -4850,12 +4866,12 @@ TEST_F(HttpNetworkTransactionTest, ErrorResponseTofHttpsConnectViaSpdyProxy) { session_deps.socket_factory.AddSocketDataProvider(data.get()); session_deps.socket_factory.AddSSLSocketDataProvider(&proxy_ssl); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_ptr<HttpTransaction> trans( new HttpNetworkTransaction(CreateSession(&session_deps))); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -4931,18 +4947,18 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaHttpsProxy) { session_deps.socket_factory.AddSocketDataProvider(&data); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_ptr<HttpTransaction> trans( new HttpNetworkTransaction(CreateSession(&session_deps))); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, rv); - rv = trans->RestartIgnoringLastError(&callback); + rv = trans->RestartIgnoringLastError(callback.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -4984,9 +5000,9 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_UserAgent) { data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -5022,9 +5038,9 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_UserAgentOverTunnel) { data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -5062,9 +5078,9 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_Referer) { data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -5099,9 +5115,9 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_PostContentLengthZero) { data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -5136,9 +5152,9 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_PutContentLengthZero) { data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -5173,9 +5189,9 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_HeadContentLengthZero) { data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -5212,9 +5228,9 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_CacheControlNoCache) { data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -5251,9 +5267,9 @@ TEST_F(HttpNetworkTransactionTest, data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -5289,9 +5305,9 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_ExtraHeaders) { data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -5331,9 +5347,9 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_ExtraHeadersStripped) { data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -5374,9 +5390,9 @@ TEST_F(HttpNetworkTransactionTest, SOCKS4_HTTP_GET) { data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -5430,9 +5446,9 @@ TEST_F(HttpNetworkTransactionTest, SOCKS4_SSL_GET) { SSLSocketDataProvider ssl(true, OK); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -5495,9 +5511,9 @@ TEST_F(HttpNetworkTransactionTest, SOCKS5_HTTP_GET) { data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -5565,9 +5581,9 @@ TEST_F(HttpNetworkTransactionTest, SOCKS5_SSL_GET) { SSLSocketDataProvider ssl(true, OK); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -5614,10 +5630,10 @@ int GroupNameTransactionHelper( scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - TestOldCompletionCallback callback; + TestCompletionCallback callback; // We do not complete this request, the dtor will clean the transaction up. - return trans->Start(&request, &callback, BoundNetLog()); + return trans->Start(&request, callback.callback(), BoundNetLog()); } TEST_F(HttpNetworkTransactionTest, GroupNameForDirectConnections) { @@ -5837,9 +5853,9 @@ TEST_F(HttpNetworkTransactionTest, ReconsiderProxyAfterFailedConnection) { scoped_ptr<HttpTransaction> trans( new HttpNetworkTransaction(CreateSession(&session_deps))); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -5866,7 +5882,6 @@ void BypassHostCacheOnRefreshHelper(int load_flags) { // Warm up the host cache so it has an entry for "www.google.com". AddressList addrlist; TestCompletionCallback callback; - TestOldCompletionCallback old_callback; int rv = session_deps.host_resolver->Resolve( HostResolver::RequestInfo(HostPortPair("www.google.com", 80)), &addrlist, callback.callback(), NULL, BoundNetLog()); @@ -5893,9 +5908,9 @@ void BypassHostCacheOnRefreshHelper(int load_flags) { session_deps.socket_factory.AddSocketDataProvider(&data); // Run the request. - rv = trans->Start(&request, &old_callback, BoundNetLog()); + rv = trans->Start(&request, callback.callback(), BoundNetLog()); ASSERT_EQ(ERR_IO_PENDING, rv); - rv = old_callback.WaitForResult(); + rv = callback.WaitForResult(); // If we bypassed the cache, we would have gotten a failure while resolving // "www.google.com". @@ -5933,12 +5948,12 @@ TEST_F(HttpNetworkTransactionTest, RequestWriteError) { write_failure, arraysize(write_failure)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_ptr<HttpTransaction> trans( new HttpNetworkTransaction(CreateSession(&session_deps))); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -5963,12 +5978,12 @@ TEST_F(HttpNetworkTransactionTest, ConnectionClosedAfterStartOfHeaders) { StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_ptr<HttpTransaction> trans( new HttpNetworkTransaction(CreateSession(&session_deps))); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -6037,11 +6052,11 @@ TEST_F(HttpNetworkTransactionTest, DrainResetOK) { data_writes2, arraysize(data_writes2)); session_deps.socket_factory.AddSocketDataProvider(&data2); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -6051,9 +6066,10 @@ TEST_F(HttpNetworkTransactionTest, DrainResetOK) { ASSERT_TRUE(response != NULL); EXPECT_TRUE(CheckBasicServerAuth(response->auth_challenge.get())); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBar), &callback2); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo, kBar), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); @@ -6085,14 +6101,14 @@ TEST_F(HttpNetworkTransactionTest, HTTPSViaProxyWithExtraData) { session_deps.socket_factory.AddSocketDataProvider(&data); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); - TestOldCompletionCallback callback; + TestCompletionCallback callback; session_deps.socket_factory.ResetNextMockIndexes(); scoped_ptr<HttpTransaction> trans( new HttpNetworkTransaction(CreateSession(&session_deps))); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -6117,9 +6133,9 @@ TEST_F(HttpNetworkTransactionTest, LargeContentLengthThenClose) { StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -6166,9 +6182,9 @@ TEST_F(HttpNetworkTransactionTest, UploadFileSmallerThanLength) { StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -6229,9 +6245,9 @@ TEST_F(HttpNetworkTransactionTest, UploadUnreadableFile) { arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback.WaitForResult(); @@ -6297,9 +6313,9 @@ TEST_F(HttpNetworkTransactionTest, UnreadableUploadFileAfterAuthRestart) { arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -6314,9 +6330,10 @@ TEST_F(HttpNetworkTransactionTest, UnreadableUploadFileAfterAuthRestart) { // Now make the file unreadable and try again. ASSERT_TRUE(file_util::MakeFileUnreadable(temp_file)); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBar), &callback2); + rv = trans->RestartWithAuth( + AuthCredentials(kFoo, kBar), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); @@ -6414,7 +6431,7 @@ TEST_F(HttpNetworkTransactionTest, ChangeAuthRealms) { session_deps.socket_factory.AddSocketDataProvider(&data3); session_deps.socket_factory.AddSocketDataProvider(&data4); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans( new HttpNetworkTransaction(CreateSession(&session_deps))); @@ -6422,7 +6439,7 @@ TEST_F(HttpNetworkTransactionTest, ChangeAuthRealms) { // Issue the first request with Authorize headers. There should be a // password prompt for first_realm waiting to be filled in after the // transaction completes. - int rv = trans->Start(&request, &callback1, BoundNetLog()); + int rv = trans->Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); EXPECT_EQ(OK, rv); @@ -6438,8 +6455,9 @@ TEST_F(HttpNetworkTransactionTest, ChangeAuthRealms) { // Issue the second request with an incorrect password. There should be a // password prompt for second_realm waiting to be filled in after the // transaction completes. - TestOldCompletionCallback callback2; - rv = trans->RestartWithAuth(AuthCredentials(kFirst, kBaz), &callback2); + TestCompletionCallback callback2; + rv = trans->RestartWithAuth( + AuthCredentials(kFirst, kBaz), callback2.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback2.WaitForResult(); EXPECT_EQ(OK, rv); @@ -6456,8 +6474,9 @@ TEST_F(HttpNetworkTransactionTest, ChangeAuthRealms) { // a password prompt for first_realm waiting to be filled in. If the password // prompt is not present, it indicates that the HttpAuthCacheEntry for // first_realm was not correctly removed. - TestOldCompletionCallback callback3; - rv = trans->RestartWithAuth(AuthCredentials(kSecond, kFou), &callback3); + TestCompletionCallback callback3; + rv = trans->RestartWithAuth( + AuthCredentials(kSecond, kFou), callback3.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback3.WaitForResult(); EXPECT_EQ(OK, rv); @@ -6471,8 +6490,9 @@ TEST_F(HttpNetworkTransactionTest, ChangeAuthRealms) { EXPECT_EQ("basic", challenge->scheme); // Issue the fourth request with the correct password and username. - TestOldCompletionCallback callback4; - rv = trans->RestartWithAuth(AuthCredentials(kFirst, kBar), &callback4); + TestCompletionCallback callback4; + rv = trans->RestartWithAuth( + AuthCredentials(kFirst, kBar), callback4.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback4.WaitForResult(); EXPECT_EQ(OK, rv); @@ -6503,12 +6523,12 @@ TEST_F(HttpNetworkTransactionTest, HonorAlternateProtocolHeader) { session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); HostPortPair http_host_port_pair("www.google.com", 80); @@ -6577,9 +6597,9 @@ TEST_F(HttpNetworkTransactionTest, MarkBrokenAlternateProtocolAndFallback) { NPN_SPDY_2); scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -6639,9 +6659,10 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortRestrictedBlocked) { NPN_SPDY_2); scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&restricted_port_request, &callback, BoundNetLog()); + int rv = trans->Start( + &restricted_port_request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // Invalid change to unrestricted port should fail. EXPECT_EQ(ERR_CONNECTION_REFUSED, callback.WaitForResult()); @@ -6687,9 +6708,10 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortRestrictedAllowed) { NPN_SPDY_2); scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&restricted_port_request, &callback, BoundNetLog()); + int rv = trans->Start( + &restricted_port_request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // Valid change to restricted port should pass. EXPECT_EQ(OK, callback.WaitForResult()); @@ -6735,9 +6757,10 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortUnrestrictedAllowed1) { NPN_SPDY_2); scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&unrestricted_port_request, &callback, BoundNetLog()); + int rv = trans->Start( + &unrestricted_port_request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // Valid change to restricted port should pass. EXPECT_EQ(OK, callback.WaitForResult()); @@ -6783,9 +6806,10 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortUnrestrictedAllowed2) { NPN_SPDY_2); scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&unrestricted_port_request, &callback, BoundNetLog()); + int rv = trans->Start( + &unrestricted_port_request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // Valid change to an unrestricted port should pass. EXPECT_EQ(OK, callback.WaitForResult()); @@ -6847,12 +6871,12 @@ TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForNpnSpdy) { session_deps.socket_factory.AddSocketDataProvider( &hanging_non_alternate_protocol_socket); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -6867,7 +6891,7 @@ TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForNpnSpdy) { trans.reset(new HttpNetworkTransaction(session)); - rv = trans->Start(&request, &callback, BoundNetLog()); + rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -6953,10 +6977,10 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolWithSpdyLateBinding) { session_deps.socket_factory.AddSocketDataProvider(&hanging_socket); scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; HttpNetworkTransaction trans1(session); - int rv = trans1.Start(&request, &callback1, BoundNetLog()); + int rv = trans1.Start(&request, callback1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback1.WaitForResult()); @@ -6969,14 +6993,14 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolWithSpdyLateBinding) { ASSERT_EQ(OK, ReadTransaction(&trans1, &response_data)); EXPECT_EQ("hello world", response_data); - TestOldCompletionCallback callback2; + TestCompletionCallback callback2; HttpNetworkTransaction trans2(session); - rv = trans2.Start(&request, &callback2, BoundNetLog()); + rv = trans2.Start(&request, callback2.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); - TestOldCompletionCallback callback3; + TestCompletionCallback callback3; HttpNetworkTransaction trans3(session); - rv = trans3.Start(&request, &callback3, BoundNetLog()); + rv = trans3.Start(&request, callback3.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback2.WaitForResult()); @@ -7043,12 +7067,12 @@ TEST_F(HttpNetworkTransactionTest, StallAlternateProtocolForNpnSpdy) { // 2nd request is just a copy of the first one, over HTTP again. session_deps.socket_factory.AddSocketDataProvider(&first_transaction); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -7063,7 +7087,7 @@ TEST_F(HttpNetworkTransactionTest, StallAlternateProtocolForNpnSpdy) { trans.reset(new HttpNetworkTransaction(session)); - rv = trans->Start(&request, &callback, BoundNetLog()); + rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -7200,12 +7224,12 @@ TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForTunneledNpnSpdy) { session_deps.socket_factory.AddSocketDataProvider( &hanging_non_alternate_protocol_socket); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -7222,7 +7246,7 @@ TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForTunneledNpnSpdy) { trans.reset(new HttpNetworkTransaction(session)); - rv = trans->Start(&request, &callback, BoundNetLog()); + rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -7294,16 +7318,15 @@ TEST_F(HttpNetworkTransactionTest, spdy_writes, arraysize(spdy_writes))); session_deps.socket_factory.AddSocketDataProvider(spdy_data); - TestOldCompletionCallback callback_old; TestCompletionCallback callback; scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback_old, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); - EXPECT_EQ(OK, callback_old.WaitForResult()); + EXPECT_EQ(OK, callback.WaitForResult()); const HttpResponseInfo* response = trans->GetResponseInfo(); ASSERT_TRUE(response != NULL); @@ -7349,9 +7372,9 @@ TEST_F(HttpNetworkTransactionTest, trans.reset(new HttpNetworkTransaction(session)); - rv = trans->Start(&request, &callback_old, BoundNetLog()); + rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); - EXPECT_EQ(OK, callback_old.WaitForResult()); + EXPECT_EQ(OK, callback.WaitForResult()); response = trans->GetResponseInfo(); ASSERT_TRUE(response != NULL); @@ -7751,12 +7774,13 @@ TEST_F(HttpNetworkTransactionTest, GenerateAuthToken) { &ssl_socket_data_provider); // Start or restart the transaction. - TestOldCompletionCallback callback; + TestCompletionCallback callback; int rv; if (round == 0) { - rv = trans.Start(&request, &callback, BoundNetLog()); + rv = trans.Start(&request, callback.callback(), BoundNetLog()); } else { - rv = trans.RestartWithAuth(AuthCredentials(kFoo, kBar), &callback); + rv = trans.RestartWithAuth( + AuthCredentials(kFoo, kBar), callback.callback()); } if (rv == ERR_IO_PENDING) rv = callback.WaitForResult(); @@ -7827,7 +7851,7 @@ TEST_F(HttpNetworkTransactionTest, MultiRoundAuth) { session_peer.SetClientSocketPoolManager(mock_pool_manager); scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - TestOldCompletionCallback callback; + TestCompletionCallback callback; const MockWrite kGet( "GET / HTTP/1.1\r\n" @@ -7883,7 +7907,7 @@ TEST_F(HttpNetworkTransactionTest, MultiRoundAuth) { // First round of authentication. auth_handler->SetGenerateExpectation(false, OK); - rv = trans->Start(&request, &callback, BoundNetLog()); + rv = trans->Start(&request, callback.callback(), BoundNetLog()); if (rv == ERR_IO_PENDING) rv = callback.WaitForResult(); EXPECT_EQ(OK, rv); @@ -7897,8 +7921,9 @@ TEST_F(HttpNetworkTransactionTest, MultiRoundAuth) { // claimed. scoped_ptr<HttpTransaction> trans_compete( new HttpNetworkTransaction(session)); - TestOldCompletionCallback callback_compete; - rv = trans_compete->Start(&request, &callback_compete, BoundNetLog()); + TestCompletionCallback callback_compete; + rv = trans_compete->Start( + &request, callback_compete.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // callback_compete.WaitForResult at this point would stall forever, // since the HttpNetworkTransaction does not release the request back to @@ -7906,7 +7931,7 @@ TEST_F(HttpNetworkTransactionTest, MultiRoundAuth) { // Second round of authentication. auth_handler->SetGenerateExpectation(false, OK); - rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBar), &callback); + rv = trans->RestartWithAuth(AuthCredentials(kFoo, kBar), callback.callback()); if (rv == ERR_IO_PENDING) rv = callback.WaitForResult(); EXPECT_EQ(OK, rv); @@ -7917,7 +7942,7 @@ TEST_F(HttpNetworkTransactionTest, MultiRoundAuth) { // Third round of authentication. auth_handler->SetGenerateExpectation(false, OK); - rv = trans->RestartWithAuth(AuthCredentials(), &callback); + rv = trans->RestartWithAuth(AuthCredentials(), callback.callback()); if (rv == ERR_IO_PENDING) rv = callback.WaitForResult(); EXPECT_EQ(OK, rv); @@ -7928,7 +7953,7 @@ TEST_F(HttpNetworkTransactionTest, MultiRoundAuth) { // Fourth round of authentication, which completes successfully. auth_handler->SetGenerateExpectation(false, OK); - rv = trans->RestartWithAuth(AuthCredentials(), &callback); + rv = trans->RestartWithAuth(AuthCredentials(), callback.callback()); if (rv == ERR_IO_PENDING) rv = callback.WaitForResult(); EXPECT_EQ(OK, rv); @@ -7940,11 +7965,11 @@ TEST_F(HttpNetworkTransactionTest, MultiRoundAuth) { // Read the body since the fourth round was successful. This will also // release the socket back to the pool. scoped_refptr<IOBufferWithSize> io_buf(new IOBufferWithSize(50)); - rv = trans->Read(io_buf, io_buf->size(), &callback); + rv = trans->Read(io_buf, io_buf->size(), callback.callback()); if (rv == ERR_IO_PENDING) rv = callback.WaitForResult(); EXPECT_EQ(3, rv); - rv = trans->Read(io_buf, io_buf->size(), &callback); + rv = trans->Read(io_buf, io_buf->size(), callback.callback()); EXPECT_EQ(0, rv); // There are still 0 idle sockets, since the trans_compete transaction // will be handed it immediately after trans releases it to the group. @@ -7954,11 +7979,11 @@ TEST_F(HttpNetworkTransactionTest, MultiRoundAuth) { // read the body. rv = callback_compete.WaitForResult(); EXPECT_EQ(OK, rv); - rv = trans_compete->Read(io_buf, io_buf->size(), &callback); + rv = trans_compete->Read(io_buf, io_buf->size(), callback.callback()); if (rv == ERR_IO_PENDING) rv = callback.WaitForResult(); EXPECT_EQ(3, rv); - rv = trans_compete->Read(io_buf, io_buf->size(), &callback); + rv = trans_compete->Read(io_buf, io_buf->size(), callback.callback()); EXPECT_EQ(0, rv); // Finally, the socket is released to the group. @@ -8020,9 +8045,9 @@ TEST_F(HttpNetworkTransactionTest, RestartAfterTLSDecompressionFailure) { scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -8062,9 +8087,9 @@ TEST_F(HttpNetworkTransactionTest, scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - TestOldCompletionCallback callback; + TestCompletionCallback callback; - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -8114,12 +8139,12 @@ TEST_F(HttpNetworkTransactionTest, NpnWithHttpOverSSL) { data_writes, arraysize(data_writes)); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -8174,12 +8199,12 @@ TEST_F(HttpNetworkTransactionTest, SpdyPostNPNServerHangup) { spdy_writes, arraysize(spdy_writes))); session_deps.socket_factory.AddSocketDataProvider(spdy_data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(ERR_CONNECTION_CLOSED, callback.WaitForResult()); @@ -8307,16 +8332,16 @@ TEST_F(HttpNetworkTransactionTest, SpdyAlternateProtocolThroughProxy) { scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); // First round should work and provide the Alternate-Protocol state. - TestOldCompletionCallback callback_1; + TestCompletionCallback callback_1; scoped_ptr<HttpTransaction> trans_1(new HttpNetworkTransaction(session)); - int rv = trans_1->Start(&request, &callback_1, BoundNetLog()); + int rv = trans_1->Start(&request, callback_1.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback_1.WaitForResult()); // Second round should attempt a tunnel connect and get an auth challenge. - TestOldCompletionCallback callback_2; + TestCompletionCallback callback_2; scoped_ptr<HttpTransaction> trans_2(new HttpNetworkTransaction(session)); - rv = trans_2->Start(&request, &callback_2, BoundNetLog()); + rv = trans_2->Start(&request, callback_2.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback_2.WaitForResult()); const HttpResponseInfo* response = trans_2->GetResponseInfo(); @@ -8324,8 +8349,9 @@ TEST_F(HttpNetworkTransactionTest, SpdyAlternateProtocolThroughProxy) { ASSERT_FALSE(response->auth_challenge.get() == NULL); // Restart with auth. Tunnel should work and response received. - TestOldCompletionCallback callback_3; - rv = trans_2->RestartWithAuth(AuthCredentials(kFoo, kBar), &callback_3); + TestCompletionCallback callback_3; + rv = trans_2->RestartWithAuth( + AuthCredentials(kFoo, kBar), callback_3.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback_3.WaitForResult()); @@ -8368,10 +8394,10 @@ TEST_F(HttpNetworkTransactionTest, SimpleCancel) { data.set_connect_data(mock_connect); session_deps.socket_factory.AddSocketDataProvider(&data); - TestOldCompletionCallback callback; + TestCompletionCallback callback; CapturingBoundNetLog log(CapturingNetLog::kUnbounded); - int rv = trans->Start(&request, &callback, log.bound()); + int rv = trans->Start(&request, callback.callback(), log.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); trans.reset(); // Cancel the transaction here. @@ -8406,11 +8432,11 @@ TEST_F(HttpNetworkTransactionTest, ProxyGet) { data_writes1, arraysize(data_writes1)); session_deps.socket_factory.AddSocketDataProvider(&data1); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback1, log.bound()); + int rv = trans->Start(&request, callback1.callback(), log.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -8463,11 +8489,11 @@ TEST_F(HttpNetworkTransactionTest, ProxyTunnelGet) { SSLSocketDataProvider ssl(true, OK); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback1, log.bound()); + int rv = trans->Start(&request, callback1.callback(), log.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -8527,11 +8553,11 @@ TEST_F(HttpNetworkTransactionTest, ProxyTunnelGetHangup) { SSLSocketDataProvider ssl(true, OK); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); - TestOldCompletionCallback callback1; + TestCompletionCallback callback1; scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &callback1, log.bound()); + int rv = trans->Start(&request, callback1.callback(), log.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); rv = callback1.WaitForResult(); @@ -8586,7 +8612,6 @@ TEST_F(HttpNetworkTransactionTest, PreconnectWithExistingSpdySession) { session->spdy_session_pool()->Get(pair, BoundNetLog()); scoped_refptr<TransportSocketParams> transport_params( new TransportSocketParams(host_port_pair, MEDIUM, false, false)); - TestOldCompletionCallback old_callback; TestCompletionCallback callback; scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle); @@ -8607,9 +8632,9 @@ TEST_F(HttpNetworkTransactionTest, PreconnectWithExistingSpdySession) { scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request, &old_callback, BoundNetLog()); + int rv = trans->Start(&request, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); - EXPECT_EQ(OK, old_callback.WaitForResult()); + EXPECT_EQ(OK, callback.WaitForResult()); } // Given a net error, cause that error to be returned from the first Write() @@ -8634,8 +8659,8 @@ static void CheckErrorIsPassedBack(int error, bool async) { scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session)); - TestOldCompletionCallback callback; - int rv = trans->Start(&request_info, &callback, net::BoundNetLog()); + TestCompletionCallback callback; + int rv = trans->Start(&request_info, callback.callback(), net::BoundNetLog()); if (rv == net::ERR_IO_PENDING) rv = callback.WaitForResult(); ASSERT_EQ(error, rv); @@ -8712,8 +8737,8 @@ TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Direct_NoFalseStart) { scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session)); // Begin the SSL handshake with the peer. This consumes ssl_data1. - TestOldCompletionCallback callback; - int rv = trans->Start(&request_info, &callback, net::BoundNetLog()); + TestCompletionCallback callback; + int rv = trans->Start(&request_info, callback.callback(), net::BoundNetLog()); ASSERT_EQ(net::ERR_IO_PENDING, rv); // Complete the SSL handshake, which should abort due to requiring a @@ -8725,7 +8750,7 @@ TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Direct_NoFalseStart) { // of SSLClientCertCache, NULL is just as meaningful as a real // certificate, so this is the same as supply a // legitimate-but-unacceptable certificate. - rv = trans->RestartWithCertificate(NULL, &callback); + rv = trans->RestartWithCertificate(NULL, callback.callback()); ASSERT_EQ(net::ERR_IO_PENDING, rv); // Ensure the certificate was added to the client auth cache before @@ -8817,8 +8842,8 @@ TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Direct_FalseStart) { scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session)); // Begin the initial SSL handshake. - TestOldCompletionCallback callback; - int rv = trans->Start(&request_info, &callback, net::BoundNetLog()); + TestCompletionCallback callback; + int rv = trans->Start(&request_info, callback.callback(), net::BoundNetLog()); ASSERT_EQ(net::ERR_IO_PENDING, rv); // Complete the SSL handshake, which should abort due to requiring a @@ -8830,7 +8855,7 @@ TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Direct_FalseStart) { // of SSLClientCertCache, NULL is just as meaningful as a real // certificate, so this is the same as supply a // legitimate-but-unacceptable certificate. - rv = trans->RestartWithCertificate(NULL, &callback); + rv = trans->RestartWithCertificate(NULL, callback.callback()); ASSERT_EQ(net::ERR_IO_PENDING, rv); // Ensure the certificate was added to the client auth cache before @@ -8911,8 +8936,9 @@ TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Proxy_Fail) { new HttpNetworkTransaction(session)); // Begin the SSL handshake with the proxy. - TestOldCompletionCallback callback; - int rv = trans->Start(&requests[i], &callback, net::BoundNetLog()); + TestCompletionCallback callback; + int rv = trans->Start( + &requests[i], callback.callback(), net::BoundNetLog()); ASSERT_EQ(net::ERR_IO_PENDING, rv); // Complete the SSL handshake, which should abort due to requiring a @@ -8924,7 +8950,7 @@ TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Proxy_Fail) { // of SSLClientCertCache, NULL is just as meaningful as a real // certificate, so this is the same as supply a // legitimate-but-unacceptable certificate. - rv = trans->RestartWithCertificate(NULL, &callback); + rv = trans->RestartWithCertificate(NULL, callback.callback()); ASSERT_EQ(net::ERR_IO_PENDING, rv); // Ensure the certificate was added to the client auth cache before @@ -9041,16 +9067,15 @@ TEST_F(HttpNetworkTransactionTest, UseIPConnectionPooling) { session_deps.socket_factory.AddSocketDataProvider(spdy_data); TestCompletionCallback callback; - TestOldCompletionCallback old_callback; HttpRequestInfo request1; request1.method = "GET"; request1.url = GURL("https://www.google.com/"); request1.load_flags = 0; HttpNetworkTransaction trans1(session); - int rv = trans1.Start(&request1, &old_callback, BoundNetLog()); + int rv = trans1.Start(&request1, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); - EXPECT_EQ(OK, old_callback.WaitForResult()); + EXPECT_EQ(OK, callback.WaitForResult()); const HttpResponseInfo* response = trans1.GetResponseInfo(); ASSERT_TRUE(response != NULL); @@ -9083,9 +9108,9 @@ TEST_F(HttpNetworkTransactionTest, UseIPConnectionPooling) { request2.load_flags = 0; HttpNetworkTransaction trans2(session); - rv = trans2.Start(&request2, &old_callback, BoundNetLog()); + rv = trans2.Start(&request2, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); - EXPECT_EQ(OK, old_callback.WaitForResult()); + EXPECT_EQ(OK, callback.WaitForResult()); response = trans2.GetResponseInfo(); ASSERT_TRUE(response != NULL); @@ -9202,10 +9227,9 @@ TEST_F(HttpNetworkTransactionTest, request1.load_flags = 0; HttpNetworkTransaction trans1(session); - TestOldCompletionCallback old_callback; - int rv = trans1.Start(&request1, &old_callback, BoundNetLog()); + int rv = trans1.Start(&request1, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); - EXPECT_EQ(OK, old_callback.WaitForResult()); + EXPECT_EQ(OK, callback.WaitForResult()); const HttpResponseInfo* response = trans1.GetResponseInfo(); ASSERT_TRUE(response != NULL); @@ -9237,9 +9261,9 @@ TEST_F(HttpNetworkTransactionTest, IPPoolingAddAlias(host_resolver.GetMockHostResolver(), &pool_peer, "www.google.com", 443, "127.0.0.1"); - rv = trans2.Start(&request2, &old_callback, BoundNetLog()); + rv = trans2.Start(&request2, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); - EXPECT_EQ(OK, old_callback.WaitForResult()); + EXPECT_EQ(OK, callback.WaitForResult()); response = trans2.GetResponseInfo(); ASSERT_TRUE(response != NULL); @@ -9393,14 +9417,14 @@ TEST_F(HttpNetworkTransactionTest, CloseOldSpdySessionToOpenNewOne) { EXPECT_FALSE( session->spdy_session_pool()->HasSession(host_port_proxy_pair_a)); - TestOldCompletionCallback callback; + TestCompletionCallback callback; HttpRequestInfo request1; request1.method = "GET"; request1.url = GURL("https://www.a.com/"); request1.load_flags = 0; scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session)); - int rv = trans->Start(&request1, &callback, BoundNetLog()); + int rv = trans->Start(&request1, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -9429,7 +9453,7 @@ TEST_F(HttpNetworkTransactionTest, CloseOldSpdySessionToOpenNewOne) { request2.load_flags = 0; trans.reset(new HttpNetworkTransaction(session)); - rv = trans->Start(&request2, &callback, BoundNetLog()); + rv = trans->Start(&request2, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); @@ -9457,7 +9481,7 @@ TEST_F(HttpNetworkTransactionTest, CloseOldSpdySessionToOpenNewOne) { request3.load_flags = 0; trans.reset(new HttpNetworkTransaction(session)); - rv = trans->Start(&request3, &callback, BoundNetLog()); + rv = trans->Start(&request3, callback.callback(), BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(OK, callback.WaitForResult()); |