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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_network_transaction_unittest.cc

Issue 8990001: base::Bind: Convert most of net/http. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Clang. Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_network_transaction.cc ('k') | net/http/http_pipelined_connection_impl.h » ('j') | net/socket/socket_test_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_transaction_unittest.cc
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 04308ab98abc76da9b61443322aa211b49f83a95..cecb3620edfc6a6dbefd9d29ece0374828620d84 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();
@@ -2154,11 +2161,11 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyGet) {
ssl.was_npn_negotiated = true;
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();
@@ -2240,11 +2247,11 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyGetWithProxyAuth) {
ssl.was_npn_negotiated = true;
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();
@@ -2258,9 +2265,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();
@@ -2336,9 +2344,9 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyConnectHttps) {
ssl2.was_npn_negotiated = false;
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();
@@ -2411,9 +2419,9 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyConnectSpdy) {
ssl2.was_npn_negotiated = true;
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();
@@ -2478,9 +2486,9 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyConnectFailure) {
ssl2.was_npn_negotiated = true;
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();
@@ -2541,11 +2549,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();
@@ -2558,9 +2566,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();
@@ -2608,11 +2617,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();
@@ -2872,9 +2881,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();
@@ -2884,9 +2893,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();
@@ -2896,9 +2906,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();
@@ -3001,11 +3012,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();
@@ -3017,10 +3028,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();
@@ -3032,9 +3043,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();
@@ -3181,11 +3192,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();
@@ -3197,19 +3208,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);
@@ -3219,11 +3230,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();
@@ -3231,10 +3242,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();
@@ -3272,9 +3283,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();
@@ -3320,9 +3331,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();
@@ -3369,9 +3380,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();
@@ -3428,12 +3439,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());
@@ -3496,12 +3507,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());
@@ -3529,7 +3540,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());
@@ -3580,9 +3591,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();
@@ -3676,9 +3687,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();
@@ -3751,17 +3762,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);
@@ -3849,17 +3860,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);
@@ -3869,8 +3880,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);
@@ -3937,9 +3949,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();
@@ -3949,9 +3961,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();
@@ -4015,9 +4028,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();
@@ -4032,9 +4045,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();
@@ -4078,9 +4092,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();
@@ -4140,17 +4154,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);
@@ -4229,17 +4243,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);
@@ -4249,9 +4263,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();
@@ -4322,9 +4337,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();
@@ -4334,9 +4349,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();
@@ -4383,9 +4399,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();
@@ -4475,15 +4491,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();
@@ -4546,7 +4562,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();
@@ -4554,13 +4570,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();
@@ -4610,12 +4626,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();
@@ -4660,12 +4676,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();
@@ -4721,12 +4737,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();
@@ -4771,12 +4787,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();
@@ -4840,12 +4856,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();
@@ -4921,18 +4937,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();
@@ -4974,9 +4990,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();
@@ -5012,9 +5028,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();
@@ -5052,9 +5068,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();
@@ -5089,9 +5105,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();
@@ -5126,9 +5142,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();
@@ -5163,9 +5179,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();
@@ -5202,9 +5218,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();
@@ -5241,9 +5257,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();
@@ -5279,9 +5295,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();
@@ -5321,9 +5337,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();
@@ -5364,9 +5380,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();
@@ -5420,9 +5436,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();
@@ -5485,9 +5501,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();
@@ -5555,9 +5571,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();
@@ -5604,10 +5620,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) {
@@ -5827,9 +5843,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();
@@ -5856,7 +5872,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());
@@ -5883,9 +5898,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".
@@ -5923,12 +5938,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();
@@ -5953,12 +5968,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();
@@ -6027,11 +6042,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();
@@ -6041,9 +6056,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();
@@ -6075,14 +6091,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();
@@ -6107,9 +6123,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());
@@ -6156,9 +6172,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();
@@ -6219,9 +6235,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();
@@ -6287,9 +6303,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();
@@ -6304,9 +6320,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();
@@ -6404,7 +6421,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)));
@@ -6412,7 +6429,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);
@@ -6428,8 +6445,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);
@@ -6446,8 +6464,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);
@@ -6461,8 +6480,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);
@@ -6493,12 +6513,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);
@@ -6567,9 +6587,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());
@@ -6629,9 +6649,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());
@@ -6677,9 +6698,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());
@@ -6725,9 +6747,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());
@@ -6773,9 +6796,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());
@@ -6836,12 +6860,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());
@@ -6856,7 +6880,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());
@@ -6941,10 +6965,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());
@@ -6957,14 +6981,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());
@@ -7030,12 +7054,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());
@@ -7050,7 +7074,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());
@@ -7186,12 +7210,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());
@@ -7208,7 +7232,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());
@@ -7279,16 +7303,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);
@@ -7334,9 +7357,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);
@@ -7736,12 +7759,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();
@@ -7812,7 +7836,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"
@@ -7868,7 +7892,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);
@@ -7882,8 +7906,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
@@ -7891,7 +7916,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);
@@ -7902,7 +7927,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);
@@ -7913,7 +7938,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);
@@ -7925,11 +7950,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.
@@ -7939,11 +7964,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.
@@ -8005,9 +8030,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());
@@ -8047,9 +8072,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());
@@ -8098,12 +8123,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());
@@ -8157,12 +8182,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());
@@ -8289,16 +8314,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();
@@ -8306,8 +8331,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());
@@ -8350,10 +8376,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.
@@ -8388,11 +8414,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();
@@ -8445,11 +8471,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();
@@ -8509,11 +8535,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();
@@ -8567,7 +8593,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);
@@ -8588,9 +8613,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()
@@ -8615,8 +8640,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);
@@ -8693,8 +8718,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
@@ -8706,7 +8731,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
@@ -8798,8 +8823,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
@@ -8811,7 +8836,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
@@ -8892,8 +8917,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
@@ -8905,7 +8931,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
@@ -9021,16 +9047,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);
@@ -9063,9 +9088,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);
@@ -9181,10 +9206,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);
@@ -9216,9 +9240,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);
@@ -9370,14 +9394,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());
@@ -9406,7 +9430,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());
@@ -9434,7 +9458,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());
« no previous file with comments | « net/http/http_network_transaction.cc ('k') | net/http/http_pipelined_connection_impl.h » ('j') | net/socket/socket_test_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698