net/spdy/spdy_network_transaction_unittest.cc - Issue 1783008: Cleanup: Remove the implicit constructor for BoundNetLog that allowed passing...

Unified Diff: net/spdy/spdy_network_transaction_unittest.cc

Issue 1783008: Cleanup: Remove the implicit constructor for BoundNetLog that allowed passing... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Sync Created 10 years, 8 months 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

Index: net/spdy/spdy_network_transaction_unittest.cc

===================================================================

--- net/spdy/spdy_network_transaction_unittest.cc (revision 45843)

+++ net/spdy/spdy_network_transaction_unittest.cc (working copy)

@@ -731,7 +731,8 @@

scoped_refptr<DelayedSocketData> data(

new DelayedSocketData(1, reads, arraysize(reads),

writes, arraysize(writes)));

- TransactionHelperResult out = TransactionHelper(request, data.get(), NULL);

+ TransactionHelperResult out = TransactionHelper(request, data.get(),

+ BoundNetLog());

EXPECT_EQ(OK, out.rv);

EXPECT_EQ("HTTP/1.1 200 OK", out.status_line);

EXPECT_EQ("hello!", out.response_data);

@@ -766,7 +767,8 @@

scoped_refptr<DelayedSocketData> data(

new DelayedSocketData(2, reads, arraysize(reads),

writes, arraysize(writes)));

- TransactionHelperResult out = TransactionHelper(request, data.get(), NULL);

+ TransactionHelperResult out = TransactionHelper(request, data.get(),

+ BoundNetLog());

EXPECT_EQ(OK, out.rv);

EXPECT_EQ("HTTP/1.1 200 OK", out.status_line);

EXPECT_EQ("hello!", out.response_data);

@@ -814,7 +816,7 @@

new DelayedSocketData(1, reads, arraysize(reads),

writes, arraysize(writes)));

- TransactionHelperResult out = TransactionHelper(request, data, NULL);

+ TransactionHelperResult out = TransactionHelper(request, data, BoundNetLog());

EXPECT_EQ(OK, out.rv);

EXPECT_EQ("HTTP/1.1 200 OK", out.status_line);

EXPECT_EQ("hello!", out.response_data);

@@ -834,7 +836,8 @@

request.load_flags = 0;

scoped_refptr<DelayedSocketData> data(

new DelayedSocketData(1, reads, arraysize(reads), NULL, 0));

- TransactionHelperResult out = TransactionHelper(request, data.get(), NULL);

+ TransactionHelperResult out = TransactionHelper(request, data.get(),

+ BoundNetLog());

EXPECT_EQ(ERR_SYN_REPLY_NOT_RECEIVED, out.rv);

}

@@ -873,7 +876,7 @@

TestCompletionCallback callback;

- int rv = trans->Start(&request, &callback, NULL);

+ int rv = trans->Start(&request, &callback, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

trans.reset(); // Cancel the transaction.

@@ -983,7 +986,8 @@

scoped_refptr<DelayedSocketData> data(

new DelayedSocketData(1, reads, arraysize(reads),

writes, arraysize(writes)));

- TransactionHelperResult out = TransactionHelper(request, data.get(), NULL);

+ TransactionHelperResult out = TransactionHelper(request, data.get(),

+ BoundNetLog());

EXPECT_EQ(OK, out.rv);

EXPECT_EQ("HTTP/1.1 200 OK", out.status_line);

EXPECT_EQ("hello!", out.response_data);

@@ -1136,7 +1140,8 @@

scoped_refptr<DelayedSocketData> data(

new DelayedSocketData(1, reads, arraysize(reads),

writes, arraysize(writes)));

- TransactionHelperResult out = TransactionHelper(request, data.get(), NULL);

+ TransactionHelperResult out = TransactionHelper(request, data.get(),

+ BoundNetLog());

EXPECT_EQ(OK, out.rv) << i;

EXPECT_EQ("HTTP/1.1 200 OK", out.status_line) << i;

EXPECT_EQ("hello!", out.response_data) << i;

@@ -1233,7 +1238,8 @@

scoped_refptr<DelayedSocketData> data(

new DelayedSocketData(1, reads, arraysize(reads),

writes, arraysize(writes)));

- TransactionHelperResult out = TransactionHelper(request, data.get(), NULL);

+ TransactionHelperResult out = TransactionHelper(request, data.get(),

+ BoundNetLog());

EXPECT_EQ(ERR_INVALID_RESPONSE, out.rv);

}

@@ -1280,7 +1286,8 @@

scoped_refptr<DelayedSocketData> data(

new DelayedSocketData(1, reads, arraysize(reads),

writes, arraysize(writes)));

- TransactionHelperResult out = TransactionHelper(request, data.get(), NULL);

+ TransactionHelperResult out = TransactionHelper(request, data.get(),

+ BoundNetLog());

EXPECT_EQ(ERR_SPDY_PROTOCOL_ERROR, out.rv);

}

@@ -1351,7 +1358,7 @@

data->SetCompletionCallback(&callback);

// Sends a request. In pass 1, this goes on the wire; in pass 2, it is

// preempted by the push data.

- int rv = trans.Start(&request, &callback, NULL);

+ int rv = trans.Start(&request, &callback, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

// In the case where we are pushing beforehand, complete the next read now.

@@ -1625,7 +1632,8 @@

scoped_refptr<DelayedSocketData> data(

new DelayedSocketData(2, reads, arraysize(reads),

writes, arraysize(writes)));

- TransactionHelperResult out = TransactionHelper(request, data.get(), NULL);

+ TransactionHelperResult out = TransactionHelper(request, data.get(),

+ BoundNetLog());

EXPECT_EQ(ERR_FAILED, out.rv);

data->Reset();

}

@@ -1652,7 +1660,8 @@

scoped_refptr<DelayedSocketData> data(

new DelayedSocketData(kChunks, reads, arraysize(reads),

writes.get(), kChunks));

- TransactionHelperResult out = TransactionHelper(request, data.get(), NULL);

+ TransactionHelperResult out = TransactionHelper(request, data.get(),

+ BoundNetLog());

EXPECT_EQ(OK, out.rv);

EXPECT_EQ("HTTP/1.1 200 OK", out.status_line);

EXPECT_EQ("hello!", out.response_data);

@@ -1688,7 +1697,8 @@

scoped_refptr<DelayedSocketData> data(

new DelayedSocketData(connects[index], 1, reads, arraysize(reads),

writes, arraysize(writes)));

- TransactionHelperResult out = TransactionHelper(request, data.get(), NULL);

+ TransactionHelperResult out = TransactionHelper(request, data.get(),

+ BoundNetLog());

EXPECT_EQ(connects[index].result, out.rv);

}

@@ -1720,7 +1730,8 @@

scoped_refptr<DelayedSocketData> data(

new DelayedSocketData(1, reads, arraysize(reads),

writes, arraysize(writes)));

- TransactionHelperResult out = TransactionHelper(request, data.get(), NULL);

+ TransactionHelperResult out = TransactionHelper(request, data.get(),

+ BoundNetLog());

EXPECT_EQ(ERR_SYN_REPLY_NOT_RECEIVED, out.rv);

data->Reset();

@@ -1851,7 +1862,7 @@

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();

@@ -1957,7 +1968,7 @@

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();

@@ -2074,7 +2085,7 @@

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();

@@ -2179,7 +2190,7 @@

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();

@@ -2274,7 +2285,7 @@

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();

@@ -2397,7 +2408,7 @@

writes, arraysize(writes)));

TransactionHelperResult out = TransactionHelperWithSession(request,

data.get(),

- NULL,

+ BoundNetLog(),

&session_deps,

session.get());

EXPECT_EQ(OK, out.rv);

@@ -2514,7 +2525,7 @@

writes, arraysize(writes)));

TransactionHelperResult out = TransactionHelperWithSession(request,

data.get(),

- NULL,

+ BoundNetLog(),

&session_deps,

session.get());

EXPECT_EQ(OK, out.rv);

@@ -2562,7 +2573,8 @@

scoped_refptr<DelayedSocketData> data(

new DelayedSocketData(1, reads, arraysize(reads),

writes, arraysize(writes)));

- TransactionHelperResult out = TransactionHelper(request, data.get(), NULL);

+ TransactionHelperResult out = TransactionHelper(request, data.get(),

+ BoundNetLog());

EXPECT_EQ(ERR_CONNECTION_CLOSED, out.rv);

}

« no previous file with comments | « net/socket/tcp_pinger_unittest.cc ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »