From 5a1d7ca44e2d11095828ec35d63fc87bd2c3dbef Mon Sep 17 00:00:00 2001
From: "eroman@chromium.org"
<eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 28 Apr 2010 20:12:27 +0000
Subject: Cleanup: Remove the implicit constructor for BoundNetLog that allowed
passing NULL in place of a const BoundNetLog&.
BUG=37421
Review URL: http://codereview.chromium.org/1783008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45851 0039d316-1c4b-4281-b951-d872f2087c98
---
net/http/http_auth_handler_negotiate_unittest.cc | 4 +-
net/http/http_cache.cc | 2 +-
net/http/http_cache_unittest.cc | 56 ++++-----
net/http/http_network_transaction_unittest.cc | 148 +++++++++++------------
4 files changed, 105 insertions(+), 105 deletions(-)
(limited to 'net/http')
diff --git a/net/http/http_auth_handler_negotiate_unittest.cc b/net/http/http_auth_handler_negotiate_unittest.cc
index 6ed882f..ffb7ba4 100644
--- a/net/http/http_auth_handler_negotiate_unittest.cc
+++ b/net/http/http_auth_handler_negotiate_unittest.cc
@@ -70,7 +70,7 @@ TEST(HttpAuthHandlerNegotiateTest, CnameSync) {
"canonical.example.com");
TestCompletionCallback callback;
EXPECT_EQ(OK, auth_handler->ResolveCanonicalName(mock_resolver, &callback,
- NULL));
+ BoundNetLog()));
EXPECT_EQ(L"HTTP/canonical.example.com", auth_handler->spn());
}
@@ -87,7 +87,7 @@ TEST(HttpAuthHandlerNegotiateTest, CnameAsync) {
TestCompletionCallback callback;
EXPECT_EQ(ERR_IO_PENDING, auth_handler->ResolveCanonicalName(mock_resolver,
&callback,
- NULL));
+ BoundNetLog()));
EXPECT_EQ(OK, callback.WaitForResult());
EXPECT_EQ(L"HTTP/canonical.example.com", auth_handler->spn());
}
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index 3a816f7..2cb4fa1 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -163,7 +163,7 @@ void HttpCache::MetadataWriter::Write(const GURL& url,
buf_len_ = buf_len;
verified_ = false;
- int rv = transaction_->Start(&request_info_, &callback_, NULL);
+ int rv = transaction_->Start(&request_info_, &callback_, BoundNetLog());
if (rv != ERR_IO_PENDING)
VerifyResponse(rv);
}
diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc
index 48e61e7..346927d 100644
--- a/net/http/http_cache_unittest.cc
+++ b/net/http/http_cache_unittest.cc
@@ -617,7 +617,7 @@ void RunTransactionTestWithRequest(net::HttpCache* cache,
const MockHttpRequest& request,
net::HttpResponseInfo* response_info) {
RunTransactionTestWithRequestAndLog(cache, trans_info, request,
- response_info, NULL);
+ response_info, net::BoundNetLog());
}
void RunTransactionTestWithLog(net::HttpCache* cache,
@@ -629,7 +629,7 @@ void RunTransactionTestWithLog(net::HttpCache* cache,
void RunTransactionTest(net::HttpCache* cache,
const MockTransaction& trans_info) {
- RunTransactionTestWithLog(cache, trans_info, NULL);
+ RunTransactionTestWithLog(cache, trans_info, net::BoundNetLog());
}
void RunTransactionTestWithResponseInfo(net::HttpCache* cache,
@@ -958,7 +958,7 @@ TEST(HttpCache, SimpleGETWithDiskFailures2) {
int rv = cache.http_cache()->CreateTransaction(&c->trans);
EXPECT_EQ(net::OK, rv);
- rv = c->trans->Start(&request, &c->callback, NULL);
+ rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
EXPECT_EQ(net::ERR_IO_PENDING, rv);
rv = c->callback.WaitForResult();
@@ -1053,7 +1053,7 @@ TEST(HttpCache, SimpleGET_LoadOnlyFromCache_Miss) {
EXPECT_EQ(net::OK, rv);
ASSERT_TRUE(trans.get());
- rv = trans->Start(&request, &callback, NULL);
+ rv = trans->Start(&request, &callback, net::BoundNetLog());
if (rv == net::ERR_IO_PENDING)
rv = callback.WaitForResult();
ASSERT_EQ(net::ERR_CACHE_MISS, rv);
@@ -1268,7 +1268,7 @@ TEST(HttpCache, SimpleGET_ManyReaders) {
c->result = cache.http_cache()->CreateTransaction(&c->trans);
EXPECT_EQ(net::OK, c->result);
- c->result = c->trans->Start(&request, &c->callback, NULL);
+ c->result = c->trans->Start(&request, &c->callback, net::BoundNetLog());
}
// Allow all requests to move from the Create queue to the active entry.
@@ -1325,7 +1325,7 @@ TEST(HttpCache, SimpleGET_RacingReaders) {
if (i == 1 || i == 2)
this_request = &reader_request;
- c->result = c->trans->Start(this_request, &c->callback, NULL);
+ c->result = c->trans->Start(this_request, &c->callback, net::BoundNetLog());
}
// Allow all requests to move from the Create queue to the active entry.
@@ -1406,7 +1406,7 @@ TEST(HttpCache, SimpleGET_DoomWithPending) {
if (i == 3)
this_request = &writer_request;
- c->result = c->trans->Start(this_request, &c->callback, NULL);
+ c->result = c->trans->Start(this_request, &c->callback, net::BoundNetLog());
}
// The first request should be a writer at this point, and the two subsequent
@@ -1449,7 +1449,7 @@ TEST(HttpCache, FastNoStoreGET_DoneWithPending) {
c->result = cache.http_cache()->CreateTransaction(&c->trans);
EXPECT_EQ(net::OK, c->result);
- c->result = c->trans->Start(&request, &c->callback, NULL);
+ c->result = c->trans->Start(&request, &c->callback, net::BoundNetLog());
}
// Allow all requests to move from the Create queue to the active entry.
@@ -1495,7 +1495,7 @@ TEST(HttpCache, SimpleGET_ManyWriters_CancelFirst) {
c->result = cache.http_cache()->CreateTransaction(&c->trans);
EXPECT_EQ(net::OK, c->result);
- c->result = c->trans->Start(&request, &c->callback, NULL);
+ c->result = c->trans->Start(&request, &c->callback, net::BoundNetLog());
}
// Allow all requests to move from the Create queue to the active entry.
@@ -1554,7 +1554,7 @@ TEST(HttpCache, SimpleGET_ManyWriters_CancelCreate) {
c->result = cache.http_cache()->CreateTransaction(&c->trans);
EXPECT_EQ(net::OK, c->result);
- c->result = c->trans->Start(&request, &c->callback, NULL);
+ c->result = c->trans->Start(&request, &c->callback, net::BoundNetLog());
}
// The first request should be creating the disk cache entry and the others
@@ -1610,7 +1610,7 @@ TEST(HttpCache, SimpleGET_ManyWriters_BypassCache) {
c->result = cache.http_cache()->CreateTransaction(&c->trans);
EXPECT_EQ(net::OK, c->result);
- c->result = c->trans->Start(&request, &c->callback, NULL);
+ c->result = c->trans->Start(&request, &c->callback, net::BoundNetLog());
}
// The first request should be deleting the disk cache entry and the others
@@ -1650,7 +1650,7 @@ TEST(HttpCache, SimpleGET_AbandonedCacheRead) {
scoped_ptr<net::HttpTransaction> trans;
int rv = cache.http_cache()->CreateTransaction(&trans);
EXPECT_EQ(net::OK, rv);
- rv = trans->Start(&request, &callback, NULL);
+ rv = trans->Start(&request, &callback, net::BoundNetLog());
if (rv == net::ERR_IO_PENDING)
rv = callback.WaitForResult();
ASSERT_EQ(net::OK, rv);
@@ -2281,7 +2281,7 @@ TEST(HttpCache, SimplePOST_LoadOnlyFromCache_Miss) {
EXPECT_EQ(net::OK, rv);
ASSERT_TRUE(trans.get());
- rv = trans->Start(&request, &callback, NULL);
+ rv = trans->Start(&request, &callback, net::BoundNetLog());
if (rv == net::ERR_IO_PENDING)
rv = callback.WaitForResult();
ASSERT_EQ(net::ERR_CACHE_MISS, rv);
@@ -3025,7 +3025,7 @@ TEST(HttpCache, RangeGET_Cancel) {
int rv = cache.http_cache()->CreateTransaction(&c->trans);
EXPECT_EQ(net::OK, rv);
- rv = c->trans->Start(&request, &c->callback, NULL);
+ rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
if (rv == net::ERR_IO_PENDING)
rv = c->callback.WaitForResult();
@@ -3065,7 +3065,7 @@ TEST(HttpCache, RangeGET_Cancel2) {
int rv = cache.http_cache()->CreateTransaction(&c->trans);
EXPECT_EQ(net::OK, rv);
- rv = c->trans->Start(&request, &c->callback, NULL);
+ rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
if (rv == net::ERR_IO_PENDING)
rv = c->callback.WaitForResult();
@@ -3110,7 +3110,7 @@ TEST(HttpCache, RangeGET_Cancel3) {
int rv = cache.http_cache()->CreateTransaction(&c->trans);
EXPECT_EQ(net::OK, rv);
- rv = c->trans->Start(&request, &c->callback, NULL);
+ rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
EXPECT_EQ(net::ERR_IO_PENDING, rv);
rv = c->callback.WaitForResult();
@@ -3137,7 +3137,7 @@ TEST(HttpCache, RangeGET_Cancel3) {
rv = cache.http_cache()->CreateTransaction(&c->trans);
EXPECT_EQ(net::OK, rv);
- rv = c->trans->Start(&request, &c->callback, NULL);
+ rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
EXPECT_EQ(net::ERR_IO_PENDING, rv);
MockDiskEntry::IgnoreCallbacks(true);
@@ -3476,7 +3476,7 @@ TEST(HttpCache, DoomOnDestruction) {
int rv = cache.http_cache()->CreateTransaction(&c->trans);
EXPECT_EQ(net::OK, rv);
- rv = c->trans->Start(&request, &c->callback, NULL);
+ rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
if (rv == net::ERR_IO_PENDING)
c->result = c->callback.WaitForResult();
@@ -3507,7 +3507,7 @@ TEST(HttpCache, DoomOnDestruction2) {
int rv = cache.http_cache()->CreateTransaction(&c->trans);
EXPECT_EQ(net::OK, rv);
- rv = c->trans->Start(&request, &c->callback, NULL);
+ rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
if (rv == net::ERR_IO_PENDING)
rv = c->callback.WaitForResult();
@@ -3551,7 +3551,7 @@ TEST(HttpCache, DoomOnDestruction3) {
int rv = cache.http_cache()->CreateTransaction(&c->trans);
EXPECT_EQ(net::OK, rv);
- rv = c->trans->Start(&request, &c->callback, NULL);
+ rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
if (rv == net::ERR_IO_PENDING)
rv = c->callback.WaitForResult();
@@ -3595,7 +3595,7 @@ TEST(HttpCache, Set_Truncated_Flag) {
int rv = cache.http_cache()->CreateTransaction(&c->trans);
EXPECT_EQ(net::OK, rv);
- rv = c->trans->Start(&request, &c->callback, NULL);
+ rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
if (rv == net::ERR_IO_PENDING)
rv = c->callback.WaitForResult();
@@ -3801,7 +3801,7 @@ TEST(HttpCache, GET_CancelIncompleteResource) {
Context* c = new Context();
EXPECT_EQ(net::OK, cache.http_cache()->CreateTransaction(&c->trans));
- int rv = c->trans->Start(&request, &c->callback, NULL);
+ int rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
EXPECT_EQ(net::OK, c->callback.GetResult(rv));
// Read 20 bytes from the cache, and 10 from the net.
@@ -3892,13 +3892,13 @@ TEST(HttpCache, SyncRead) {
c2(cache.http_cache()),
c3(cache.http_cache());
- c1.Start(&r1, NULL);
+ c1.Start(&r1, net::BoundNetLog());
r2.load_flags |= net::LOAD_ONLY_FROM_CACHE;
- c2.Start(&r2, NULL);
+ c2.Start(&r2, net::BoundNetLog());
r3.load_flags |= net::LOAD_ONLY_FROM_CACHE;
- c3.Start(&r3, NULL);
+ c3.Start(&r3, net::BoundNetLog());
MessageLoop::current()->Run();
@@ -3946,7 +3946,7 @@ TEST(HttpCache, CachedRedirect) {
EXPECT_EQ(net::OK, rv);
ASSERT_TRUE(trans.get());
- rv = trans->Start(&request, &callback, NULL);
+ rv = trans->Start(&request, &callback, net::BoundNetLog());
if (rv == net::ERR_IO_PENDING)
rv = callback.WaitForResult();
ASSERT_EQ(net::OK, rv);
@@ -3974,7 +3974,7 @@ TEST(HttpCache, CachedRedirect) {
EXPECT_EQ(net::OK, rv);
ASSERT_TRUE(trans.get());
- rv = trans->Start(&request, &callback, NULL);
+ rv = trans->Start(&request, &callback, net::BoundNetLog());
if (rv == net::ERR_IO_PENDING)
rv = callback.WaitForResult();
ASSERT_EQ(net::OK, rv);
@@ -4102,7 +4102,7 @@ TEST(HttpCache, SimpleGET_SSLError) {
EXPECT_EQ(net::OK, rv);
ASSERT_TRUE(trans.get());
- rv = trans->Start(&request, &callback, NULL);
+ rv = trans->Start(&request, &callback, net::BoundNetLog());
if (rv == net::ERR_IO_PENDING)
rv = callback.WaitForResult();
ASSERT_EQ(net::ERR_CACHE_MISS, rv);
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 4742122..6058d8f 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -121,7 +121,7 @@ class HttpNetworkTransactionTest : public PlatformTest {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
out.rv = callback.WaitForResult();
@@ -412,7 +412,7 @@ TEST_F(HttpNetworkTransactionTest, Head) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -469,7 +469,7 @@ TEST_F(HttpNetworkTransactionTest, ReuseConnection) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -511,7 +511,7 @@ TEST_F(HttpNetworkTransactionTest, Ignores100) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -553,7 +553,7 @@ TEST_F(HttpNetworkTransactionTest, Ignores1xx) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -590,7 +590,7 @@ TEST_F(HttpNetworkTransactionTest, Incomplete100ThenEOF) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -620,7 +620,7 @@ TEST_F(HttpNetworkTransactionTest, EmptyResponse) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -664,7 +664,7 @@ void HttpNetworkTransactionTest::KeepAliveConnectionResendRequestTest(
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -714,7 +714,7 @@ TEST_F(HttpNetworkTransactionTest, NonKeepAliveConnectionReset) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -802,7 +802,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuth) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -862,7 +862,7 @@ TEST_F(HttpNetworkTransactionTest, DoNotSendAuth) {
session_deps.socket_factory.AddSocketDataProvider(&data);
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -918,7 +918,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAlive) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -991,7 +991,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveNoBody) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -1072,7 +1072,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveLargeBody) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -1163,7 +1163,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveImpatientServer) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -1246,7 +1246,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyKeepAlive) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -1328,7 +1328,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyCancelTunnel) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -1381,7 +1381,7 @@ void HttpNetworkTransactionTest::ConnectStatusHelperWithExpectedStatus(
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -1643,7 +1643,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyThenServer) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -1782,7 +1782,7 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth1) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -1957,7 +1957,7 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth2) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -2051,7 +2051,7 @@ TEST_F(HttpNetworkTransactionTest, LargeHeadersNoBody) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -2099,7 +2099,7 @@ TEST_F(HttpNetworkTransactionTest, DontRecycleTCPSocketForSSLTunnel) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -2148,7 +2148,7 @@ TEST_F(HttpNetworkTransactionTest, RecycleSocket) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -2205,7 +2205,7 @@ TEST_F(HttpNetworkTransactionTest, RecycleSocketAfterZeroContentLength) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -2301,7 +2301,7 @@ TEST_F(HttpNetworkTransactionTest, ResendRequestOnWriteBodyError) {
TestCompletionCallback callback;
- int rv = trans->Start(&request[i], &callback, NULL);
+ int rv = trans->Start(&request[i], &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -2376,7 +2376,7 @@ TEST_F(HttpNetworkTransactionTest, AuthIdentityInURL) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -2474,7 +2474,7 @@ TEST_F(HttpNetworkTransactionTest, WrongAuthIdentityInURL) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -2567,7 +2567,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -2652,7 +2652,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -2717,7 +2717,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -2779,7 +2779,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -2868,7 +2868,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -2988,7 +2988,7 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificate) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3065,7 +3065,7 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaProxy) {
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(CreateSession(&session_deps)));
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3116,7 +3116,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_UserAgent) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3155,7 +3155,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_Referer) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3192,7 +3192,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_PostContentLengthZero) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3229,7 +3229,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_PutContentLengthZero) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3266,7 +3266,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_HeadContentLengthZero) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3305,7 +3305,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_CacheControlNoCache) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3344,7 +3344,7 @@ TEST_F(HttpNetworkTransactionTest,
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3382,7 +3382,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_ExtraHeaders) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3423,7 +3423,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_ExtraHeadersStripped) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3466,7 +3466,7 @@ TEST_F(HttpNetworkTransactionTest, SOCKS4_HTTP_GET) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3522,7 +3522,7 @@ TEST_F(HttpNetworkTransactionTest, SOCKS4_SSL_GET) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3587,7 +3587,7 @@ TEST_F(HttpNetworkTransactionTest, SOCKS5_HTTP_GET) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3657,7 +3657,7 @@ TEST_F(HttpNetworkTransactionTest, SOCKS5_SSL_GET) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3768,7 +3768,7 @@ TEST_F(HttpNetworkTransactionTest, GroupNameForProxyConnections) {
TestCompletionCallback callback;
// We do not complete this request, the dtor will clean the transaction up.
- EXPECT_EQ(ERR_IO_PENDING, trans->Start(&request, &callback, NULL));
+ EXPECT_EQ(ERR_IO_PENDING, trans->Start(&request, &callback, BoundNetLog()));
std::string allgroups = tcp_conn_pool->last_group_name_received() +
socks_conn_pool->last_group_name_received();
EXPECT_EQ(tests[i].expected_group_name, allgroups);
@@ -3794,7 +3794,7 @@ TEST_F(HttpNetworkTransactionTest, ReconsiderProxyAfterFailedConnection) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3870,7 +3870,7 @@ TEST_F(HttpNetworkTransactionTest, ResolveMadeWithReferrer) {
// Run the request until it fails reading from the socket.
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
EXPECT_EQ(ERR_FAILED, rv);
@@ -3895,7 +3895,7 @@ TEST_F(HttpNetworkTransactionTest, BypassHostCacheOnRefresh) {
AddressList addrlist;
int rv = session_deps.host_resolver->Resolve(
HostResolver::RequestInfo("www.google.com", 80), &addrlist,
- NULL, NULL, NULL);
+ NULL, NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
// Verify that it was added to host cache, by doing a subsequent async lookup
@@ -3903,7 +3903,7 @@ TEST_F(HttpNetworkTransactionTest, BypassHostCacheOnRefresh) {
TestCompletionCallback resolve_callback;
rv = session_deps.host_resolver->Resolve(
HostResolver::RequestInfo("www.google.com", 80), &addrlist,
- &resolve_callback, NULL, NULL);
+ &resolve_callback, NULL, BoundNetLog());
ASSERT_EQ(OK, rv);
// Inject a failure the next time that "www.google.com" is resolved. This way
@@ -3925,7 +3925,7 @@ TEST_F(HttpNetworkTransactionTest, BypassHostCacheOnRefresh) {
// Run the request.
TestCompletionCallback callback;
- rv = trans->Start(&request, &callback, NULL);
+ rv = trans->Start(&request, &callback, BoundNetLog());
ASSERT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3956,7 +3956,7 @@ TEST_F(HttpNetworkTransactionTest, RequestWriteError) {
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(CreateSession(&session_deps)));
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3986,7 +3986,7 @@ TEST_F(HttpNetworkTransactionTest, ConnectionClosedAfterStartOfHeaders) {
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(CreateSession(&session_deps)));
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -4058,7 +4058,7 @@ TEST_F(HttpNetworkTransactionTest, DrainResetOK) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -4115,7 +4115,7 @@ TEST_F(HttpNetworkTransactionTest, HTTPSViaProxyWithExtraData) {
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(CreateSession(&session_deps)));
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -4142,7 +4142,7 @@ TEST_F(HttpNetworkTransactionTest, LargeContentLengthThenClose) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(OK, callback.WaitForResult());
@@ -4191,7 +4191,7 @@ TEST_F(HttpNetworkTransactionTest, UploadFileSmallerThanLength) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -4254,7 +4254,7 @@ TEST_F(HttpNetworkTransactionTest, UploadUnreadableFile) {
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -4322,7 +4322,7 @@ TEST_F(HttpNetworkTransactionTest, UnreadableUploadFileAfterAuthRestart) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -4448,7 +4448,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, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
EXPECT_EQ(OK, rv);
@@ -4528,7 +4528,7 @@ TEST_F(HttpNetworkTransactionTest, HonorAlternateProtocolHeader) {
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
HostPortPair http_host_port_pair;
@@ -4605,7 +4605,7 @@ TEST_F(HttpNetworkTransactionTest, MarkBrokenAlternateProtocol) {
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(OK, callback.WaitForResult());
@@ -4665,7 +4665,7 @@ TEST_F(HttpNetworkTransactionTest, MarkBrokenAlternateProtocol) {
//
// scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
//
-// int rv = trans->Start(&request, &callback, NULL);
+// int rv = trans->Start(&request, &callback, BoundNetLog());
// EXPECT_EQ(ERR_IO_PENDING, rv);
// EXPECT_EQ(OK, callback.WaitForResult());
//
@@ -4720,7 +4720,7 @@ TEST_F(HttpNetworkTransactionTest, FailNpnSpdyAndFallback) {
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(OK, callback.WaitForResult());
@@ -4788,7 +4788,7 @@ TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForNpnSpdy) {
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session));
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(OK, callback.WaitForResult());
@@ -4803,7 +4803,7 @@ TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForNpnSpdy) {
trans.reset(new HttpNetworkTransaction(session));
- rv = trans->Start(&request, &callback, NULL);
+ rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(OK, callback.WaitForResult());
@@ -4873,7 +4873,7 @@ TEST_F(HttpNetworkTransactionTest,
scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session));
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(OK, callback.WaitForResult());
@@ -4896,7 +4896,7 @@ TEST_F(HttpNetworkTransactionTest,
trans.reset(new HttpNetworkTransaction(session));
- rv = trans->Start(&request, &callback, NULL);
+ rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(OK, callback.WaitForResult());
@@ -5088,7 +5088,7 @@ TEST_F(HttpNetworkTransactionTest, ResolveCanonicalName) {
TestCompletionCallback callback1;
- int rv = trans->Start(&request, &callback1, NULL);
+ int rv = trans->Start(&request, &callback1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback1.WaitForResult();
@@ -5161,7 +5161,7 @@ TEST_F(HttpNetworkTransactionTest, RestartAfterTLSDecompressionFailure) {
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(OK, callback.WaitForResult());
@@ -5203,7 +5203,7 @@ TEST_F(HttpNetworkTransactionTest,
scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
TestCompletionCallback callback;
- int rv = trans->Start(&request, &callback, NULL);
+ int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(OK, callback.WaitForResult());
--
cgit v1.1