Index: net/base/chunked_upload_data_stream_unittest.cc |
diff --git a/net/base/chunked_upload_data_stream_unittest.cc b/net/base/chunked_upload_data_stream_unittest.cc |
index 926e927e78bac0461fc8e9bbbfd6ae80759e699c..67a35c36c688f6544bb15db9f1d01ff3aa028ab2 100644 |
--- a/net/base/chunked_upload_data_stream_unittest.cc |
+++ b/net/base/chunked_upload_data_stream_unittest.cc |
@@ -43,7 +43,8 @@ std::string ReadSync(UploadDataStream* stream, int buffer_size) { |
TEST(ChunkedUploadDataStreamTest, AppendOnce) { |
ChunkedUploadDataStream stream(0); |
- ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk()); |
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback(), BoundNetLog()), |
+ IsOk()); |
EXPECT_FALSE(stream.IsInMemory()); |
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data. |
EXPECT_EQ(0u, stream.position()); |
@@ -66,7 +67,8 @@ TEST(ChunkedUploadDataStreamTest, AppendOnce) { |
TEST(ChunkedUploadDataStreamTest, AppendOnceBeforeRead) { |
ChunkedUploadDataStream stream(0); |
- ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk()); |
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback(), BoundNetLog()), |
+ IsOk()); |
EXPECT_FALSE(stream.IsInMemory()); |
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data. |
EXPECT_EQ(0u, stream.position()); |
@@ -88,7 +90,8 @@ TEST(ChunkedUploadDataStreamTest, AppendOnceBeforeInit) { |
ChunkedUploadDataStream stream(0); |
stream.AppendData(kTestData, kTestDataSize, true); |
- ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk()); |
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback(), BoundNetLog()), |
+ IsOk()); |
EXPECT_FALSE(stream.IsInMemory()); |
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data. |
EXPECT_EQ(0u, stream.position()); |
@@ -104,7 +107,8 @@ TEST(ChunkedUploadDataStreamTest, AppendOnceBeforeInit) { |
TEST(ChunkedUploadDataStreamTest, MultipleAppends) { |
ChunkedUploadDataStream stream(0); |
- ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk()); |
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback(), BoundNetLog()), |
+ IsOk()); |
EXPECT_FALSE(stream.IsInMemory()); |
EXPECT_EQ(0u, stream.size()); |
EXPECT_EQ(0u, stream.position()); |
@@ -133,7 +137,8 @@ TEST(ChunkedUploadDataStreamTest, MultipleAppends) { |
TEST(ChunkedUploadDataStreamTest, MultipleAppendsBetweenReads) { |
ChunkedUploadDataStream stream(0); |
- ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk()); |
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback(), BoundNetLog()), |
+ IsOk()); |
EXPECT_FALSE(stream.IsInMemory()); |
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data. |
EXPECT_EQ(0u, stream.position()); |
@@ -162,7 +167,8 @@ TEST(ChunkedUploadDataStreamTest, MultipleAppendsBeforeInit) { |
stream.AppendData(kTestData + 1, 1, false); |
stream.AppendData(kTestData + 2, kTestDataSize - 2, true); |
- ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk()); |
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback(), BoundNetLog()), |
+ IsOk()); |
EXPECT_FALSE(stream.IsInMemory()); |
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data. |
EXPECT_EQ(0u, stream.position()); |
@@ -184,7 +190,8 @@ TEST(ChunkedUploadDataStreamTest, MultipleReads) { |
stream.AppendData(kTestData, kTestDataSize, false); |
stream.AppendData(kTestData, kTestDataSize, true); |
- ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk()); |
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback(), BoundNetLog()), |
+ IsOk()); |
EXPECT_FALSE(stream.IsInMemory()); |
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data. |
EXPECT_EQ(0u, stream.position()); |
@@ -214,7 +221,8 @@ TEST(ChunkedUploadDataStreamTest, MultipleReads) { |
TEST(ChunkedUploadDataStreamTest, EmptyUpload) { |
ChunkedUploadDataStream stream(0); |
- ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk()); |
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback(), BoundNetLog()), |
+ IsOk()); |
EXPECT_FALSE(stream.IsInMemory()); |
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data. |
EXPECT_EQ(0u, stream.position()); |
@@ -236,7 +244,8 @@ TEST(ChunkedUploadDataStreamTest, EmptyUploadEndedBeforeInit) { |
ChunkedUploadDataStream stream(0); |
stream.AppendData(NULL, 0, true); |
- ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk()); |
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback(), BoundNetLog()), |
+ IsOk()); |
EXPECT_FALSE(stream.IsInMemory()); |
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data. |
EXPECT_EQ(0u, stream.position()); |
@@ -253,7 +262,8 @@ TEST(ChunkedUploadDataStreamTest, RewindAfterComplete) { |
stream.AppendData(kTestData, 1, false); |
stream.AppendData(kTestData + 1, kTestDataSize - 1, true); |
- ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk()); |
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback(), BoundNetLog()), |
+ IsOk()); |
EXPECT_FALSE(stream.IsInMemory()); |
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data. |
EXPECT_EQ(0u, stream.position()); |
@@ -265,7 +275,8 @@ TEST(ChunkedUploadDataStreamTest, RewindAfterComplete) { |
ASSERT_TRUE(stream.IsEOF()); |
// Rewind stream and repeat. |
- ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk()); |
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback(), BoundNetLog()), |
+ IsOk()); |
EXPECT_FALSE(stream.IsInMemory()); |
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data. |
EXPECT_EQ(0u, stream.position()); |
@@ -280,7 +291,8 @@ TEST(ChunkedUploadDataStreamTest, RewindAfterComplete) { |
TEST(ChunkedUploadDataStreamTest, RewindWhileReading) { |
ChunkedUploadDataStream stream(0); |
- ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk()); |
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback(), BoundNetLog()), |
+ IsOk()); |
EXPECT_FALSE(stream.IsInMemory()); |
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data. |
EXPECT_EQ(0u, stream.position()); |
@@ -291,7 +303,8 @@ TEST(ChunkedUploadDataStreamTest, RewindWhileReading) { |
int result = stream.Read(buf.get(), kTestBufferSize, callback.callback()); |
ASSERT_THAT(result, IsError(ERR_IO_PENDING)); |
- ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk()); |
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback(), BoundNetLog()), |
+ IsOk()); |
EXPECT_FALSE(stream.IsInMemory()); |
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data. |
EXPECT_EQ(0u, stream.position()); |
@@ -319,7 +332,8 @@ TEST(ChunkedUploadDataStreamTest, ChunkedUploadDataStreamWriter) { |
// Write before Init. |
ASSERT_TRUE(writer->AppendData(kTestData, 1, false)); |
- ASSERT_THAT(stream->Init(TestCompletionCallback().callback()), IsOk()); |
+ ASSERT_THAT(stream->Init(TestCompletionCallback().callback(), BoundNetLog()), |
+ IsOk()); |
// Write after Init. |
ASSERT_TRUE(writer->AppendData(kTestData + 1, kTestDataSize - 1, false)); |