| Index: net/quic/chromium/quic_http_stream_test.cc
|
| diff --git a/net/quic/chromium/quic_http_stream_test.cc b/net/quic/chromium/quic_http_stream_test.cc
|
| index aa9739d594b74cfab84555672d73f6c8029cae77..447dfa1b84f3928bd6c3ad5aaa90e4bf5cd53a3a 100644
|
| --- a/net/quic/chromium/quic_http_stream_test.cc
|
| +++ b/net/quic/chromium/quic_http_stream_test.cc
|
| @@ -127,7 +127,7 @@ class ReadErrorUploadDataStream : public UploadDataStream {
|
| void CompleteRead() { UploadDataStream::OnReadCompleted(ERR_FAILED); }
|
|
|
| // UploadDataStream implementation:
|
| - int InitInternal(const BoundNetLog& net_log) override { return OK; }
|
| + int InitInternal(const NetLogWithSource& net_log) override { return OK; }
|
|
|
| int ReadInternal(IOBuffer* buf, int buf_len) override {
|
| if (async_ == FailureMode::ASYNC) {
|
| @@ -1070,9 +1070,9 @@ TEST_P(QuicHttpStreamTest, SendPostRequest) {
|
| request_.method = "POST";
|
| request_.url = GURL("http://www.example.org/");
|
| request_.upload_data_stream = &upload_data_stream;
|
| - ASSERT_THAT(
|
| - request_.upload_data_stream->Init(CompletionCallback(), BoundNetLog()),
|
| - IsOk());
|
| + ASSERT_THAT(request_.upload_data_stream->Init(CompletionCallback(),
|
| + NetLogWithSource()),
|
| + IsOk());
|
|
|
| EXPECT_EQ(OK,
|
| stream_->InitializeStream(&request_, DEFAULT_PRIORITY,
|
| @@ -1138,7 +1138,7 @@ TEST_P(QuicHttpStreamTest, SendChunkedPostRequest) {
|
| request_.url = GURL("http://www.example.org/");
|
| request_.upload_data_stream = &upload_data_stream;
|
| ASSERT_EQ(OK, request_.upload_data_stream->Init(
|
| - TestCompletionCallback().callback(), BoundNetLog()));
|
| + TestCompletionCallback().callback(), NetLogWithSource()));
|
|
|
| ASSERT_EQ(OK,
|
| stream_->InitializeStream(&request_, DEFAULT_PRIORITY,
|
| @@ -1208,7 +1208,7 @@ TEST_P(QuicHttpStreamTest, SendChunkedPostRequestWithFinalEmptyDataPacket) {
|
| request_.url = GURL("http://www.example.org/");
|
| request_.upload_data_stream = &upload_data_stream;
|
| ASSERT_EQ(OK, request_.upload_data_stream->Init(
|
| - TestCompletionCallback().callback(), BoundNetLog()));
|
| + TestCompletionCallback().callback(), NetLogWithSource()));
|
|
|
| ASSERT_EQ(OK,
|
| stream_->InitializeStream(&request_, DEFAULT_PRIORITY,
|
| @@ -1272,7 +1272,7 @@ TEST_P(QuicHttpStreamTest, SendChunkedPostRequestWithOneEmptyDataPacket) {
|
| request_.url = GURL("http://www.example.org/");
|
| request_.upload_data_stream = &upload_data_stream;
|
| ASSERT_EQ(OK, request_.upload_data_stream->Init(
|
| - TestCompletionCallback().callback(), BoundNetLog()));
|
| + TestCompletionCallback().callback(), NetLogWithSource()));
|
|
|
| ASSERT_EQ(OK,
|
| stream_->InitializeStream(&request_, DEFAULT_PRIORITY,
|
| @@ -1462,7 +1462,7 @@ TEST_P(QuicHttpStreamTest, SessionClosedDuringDoLoop) {
|
| request_.url = GURL("http://www.example.org/");
|
| request_.upload_data_stream = &upload_data_stream;
|
| ASSERT_EQ(OK, request_.upload_data_stream->Init(
|
| - TestCompletionCallback().callback(), BoundNetLog()));
|
| + TestCompletionCallback().callback(), NetLogWithSource()));
|
|
|
| size_t chunk_size = strlen(kUploadData);
|
| upload_data_stream.AppendData(kUploadData, chunk_size, false);
|
| @@ -1490,7 +1490,7 @@ TEST_P(QuicHttpStreamTest, SessionClosedBeforeSendHeadersComplete) {
|
| request_.url = GURL("http://www.example.org/");
|
| request_.upload_data_stream = &upload_data_stream;
|
| ASSERT_EQ(OK, request_.upload_data_stream->Init(
|
| - TestCompletionCallback().callback(), BoundNetLog()));
|
| + TestCompletionCallback().callback(), NetLogWithSource()));
|
|
|
| ASSERT_EQ(OK,
|
| stream_->InitializeStream(&request_, DEFAULT_PRIORITY,
|
| @@ -1515,7 +1515,7 @@ TEST_P(QuicHttpStreamTest, SessionClosedBeforeSendBodyComplete) {
|
| request_.url = GURL("http://www.example.org/");
|
| request_.upload_data_stream = &upload_data_stream;
|
| ASSERT_EQ(OK, request_.upload_data_stream->Init(
|
| - TestCompletionCallback().callback(), BoundNetLog()));
|
| + TestCompletionCallback().callback(), NetLogWithSource()));
|
|
|
| ASSERT_EQ(OK,
|
| stream_->InitializeStream(&request_, DEFAULT_PRIORITY,
|
| @@ -2013,7 +2013,7 @@ TEST_P(QuicHttpStreamTest, DataReadErrorSynchronous) {
|
| request_.url = GURL("http://www.example.org/");
|
| request_.upload_data_stream = &upload_data_stream;
|
| ASSERT_EQ(OK, request_.upload_data_stream->Init(
|
| - TestCompletionCallback().callback(), BoundNetLog()));
|
| + TestCompletionCallback().callback(), NetLogWithSource()));
|
|
|
| EXPECT_EQ(OK,
|
| stream_->InitializeStream(&request_, DEFAULT_PRIORITY,
|
| @@ -2045,7 +2045,7 @@ TEST_P(QuicHttpStreamTest, DataReadErrorAsynchronous) {
|
| request_.url = GURL("http://www.example.org/");
|
| request_.upload_data_stream = &upload_data_stream;
|
| ASSERT_EQ(OK, request_.upload_data_stream->Init(
|
| - TestCompletionCallback().callback(), BoundNetLog()));
|
| + TestCompletionCallback().callback(), NetLogWithSource()));
|
|
|
| EXPECT_EQ(OK,
|
| stream_->InitializeStream(&request_, DEFAULT_PRIORITY,
|
|
|