commit 819ba85927138d71e488fb7a006d10e7abeec01b
author maksim.sisov <maksim.sisov@intel.com> Wed Aug 17 08:22:52 2016
committer Commit bot <commit-bot@chromium.org> Wed Aug 17 08:24:54 2016
tree 32f7156570c5c44f7bbd15a2f7cfccc80b7089b0
parent de23c50488c2558ba2633c0e4a2b09924bdd3704

Add net log to UploadDataStream.

Improve the granularity of net-internals logging for upload
to be able to discover where the hang is occurring in
situations like in the issue 611436.

BUG=613337

Review-Url: https://codereview.chromium.org/2227503003
Cr-Commit-Position: refs/heads/master@{#412474}

net/spdy/spdy_http_stream_unittest.cc

diff --git a/net/spdy/spdy_http_stream_unittest.cc b/net/spdy/spdy_http_stream_unittest.cc
index 7afb332..1c5fb345 100644
--- a/net/spdy/spdy_http_stream_unittest.cc
+++ b/net/spdy/spdy_http_stream_unittest.cc
@@ -76,7 +76,7 @@
   void CompleteRead() { UploadDataStream::OnReadCompleted(ERR_FAILED); }
 
   // UploadDataStream implementation:
-  int InitInternal() override { return OK; }
+  int InitInternal(const BoundNetLog& net_log) override { return OK; }
 
   int ReadInternal(IOBuffer* buf, int buf_len) override {
     if (async_ == FailureMode::ASYNC) {
@@ -364,7 +364,9 @@
   request.url = GURL("http://www.example.org/");
   request.upload_data_stream = &upload_stream;
 
-  ASSERT_THAT(upload_stream.Init(TestCompletionCallback().callback()), IsOk());
+  ASSERT_THAT(
+      upload_stream.Init(TestCompletionCallback().callback(), BoundNetLog()),
+      IsOk());
 
   TestCompletionCallback callback;
   HttpResponseInfo response;
@@ -418,7 +420,9 @@
   request.url = GURL("http://www.example.org/");
   request.upload_data_stream = &upload_stream;
 
-  ASSERT_THAT(upload_stream.Init(TestCompletionCallback().callback()), IsOk());
+  ASSERT_THAT(
+      upload_stream.Init(TestCompletionCallback().callback(), BoundNetLog()),
+      IsOk());
 
   TestCompletionCallback callback;
   HttpResponseInfo response;
@@ -469,7 +473,9 @@
   request.url = GURL("http://www.example.org/");
   request.upload_data_stream = &upload_stream;
 
-  ASSERT_THAT(upload_stream.Init(TestCompletionCallback().callback()), IsOk());
+  ASSERT_THAT(
+      upload_stream.Init(TestCompletionCallback().callback(), BoundNetLog()),
+      IsOk());
 
   TestCompletionCallback callback;
   HttpResponseInfo response;
@@ -536,7 +542,9 @@
   request.url = GURL("http://www.example.org/");
   request.upload_data_stream = &upload_stream;
 
-  ASSERT_THAT(upload_stream.Init(TestCompletionCallback().callback()), IsOk());
+  ASSERT_THAT(
+      upload_stream.Init(TestCompletionCallback().callback(), BoundNetLog()),
+      IsOk());
   upload_stream.AppendData(kUploadData, kUploadDataSize, false);
 
   BoundNetLog net_log;
@@ -628,7 +636,9 @@
   request.url = GURL("http://www.example.org/");
   request.upload_data_stream = &upload_stream;
 
-  ASSERT_THAT(upload_stream.Init(TestCompletionCallback().callback()), IsOk());
+  ASSERT_THAT(
+      upload_stream.Init(TestCompletionCallback().callback(), BoundNetLog()),
+      IsOk());
   upload_stream.AppendData(kUploadData, kUploadDataSize, false);
 
   BoundNetLog net_log;
@@ -709,7 +719,9 @@
   request.url = GURL("http://www.example.org/");
   request.upload_data_stream = &upload_stream;
 
-  ASSERT_THAT(upload_stream.Init(TestCompletionCallback().callback()), IsOk());
+  ASSERT_THAT(
+      upload_stream.Init(TestCompletionCallback().callback(), BoundNetLog()),
+      IsOk());
   upload_stream.AppendData("", 0, true);
 
   BoundNetLog net_log;
@@ -820,7 +832,9 @@
   request.url = GURL("http://www.example.org/");
   request.upload_data_stream = &upload_stream;
 
-  ASSERT_THAT(upload_stream.Init(TestCompletionCallback().callback()), IsOk());
+  ASSERT_THAT(
+      upload_stream.Init(TestCompletionCallback().callback(), BoundNetLog()),
+      IsOk());
 
   BoundNetLog net_log;
   std::unique_ptr<SpdyHttpStream> http_stream(
@@ -914,7 +928,8 @@
 
   ReadErrorUploadDataStream upload_data_stream(
       ReadErrorUploadDataStream::FailureMode::SYNC);
-  ASSERT_THAT(upload_data_stream.Init(TestCompletionCallback().callback()),
+  ASSERT_THAT(upload_data_stream.Init(TestCompletionCallback().callback(),
+                                      BoundNetLog()),
               IsOk());
 
   HttpRequestInfo request;
@@ -962,7 +977,8 @@
 
   ReadErrorUploadDataStream upload_data_stream(
       ReadErrorUploadDataStream::FailureMode::ASYNC);
-  ASSERT_THAT(upload_data_stream.Init(TestCompletionCallback().callback()),
+  ASSERT_THAT(upload_data_stream.Init(TestCompletionCallback().callback(),
+                                      BoundNetLog()),
               IsOk());
 
   HttpRequestInfo request;
@@ -1006,7 +1022,8 @@
   request.upload_data_stream = &upload_stream;
 
   TestCompletionCallback upload_callback;
-  ASSERT_THAT(upload_stream.Init(upload_callback.callback()), IsOk());
+  ASSERT_THAT(upload_stream.Init(upload_callback.callback(), BoundNetLog()),
+              IsOk());
   upload_stream.AppendData("", 0, true);
 
   BoundNetLog net_log;