net: Make UploadDataStream::Init() asynchronous.

net/http/http_stream_parser_unittest.cc

Index: net/http/http_stream_parser_unittest.cc
diff --git a/net/http/http_stream_parser_unittest.cc b/net/http/http_stream_parser_unittest.cc
index 7f9df56e118e7c411d629e31298c4b10c34a4eaa..0b19019c6afca1cac6cf7b2a202e1845945ae18f 100644
--- a/net/http/http_stream_parser_unittest.cc
+++ b/net/http/http_stream_parser_unittest.cc
@@ -88,7 +88,7 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_NoBody) {
 TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_EmptyBody) {
   scoped_refptr<UploadData> upload_data = new UploadData;
   scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data));
-  ASSERT_EQ(OK, body->Init());
+  ASSERT_EQ(OK, body->InitSync());
   // Shouldn't be merged if upload data is empty.
   ASSERT_FALSE(HttpStreamParser::ShouldMergeRequestHeadersAndBody(
       "some header", body.get()));
@@ -101,7 +101,7 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_ChunkedBody) {
   upload_data->AppendChunk(payload.data(), payload.size(), true);
 
   scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data));
-  ASSERT_EQ(OK, body->Init());
+  ASSERT_EQ(OK, body->InitSync());
   // Shouldn't be merged if upload data carries chunked data.
   ASSERT_FALSE(HttpStreamParser::ShouldMergeRequestHeadersAndBody(
       "some header", body.get()));
@@ -120,7 +120,7 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_FileBody) {
   upload_data->AppendFileRange(temp_file_path, 0, 0, base::Time());
 
   scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data));
-  ASSERT_EQ(OK, body->Init());
+  ASSERT_EQ(OK, body->InitSync());
   // Shouldn't be merged if upload data carries a file, as it's not in-memory.
   ASSERT_FALSE(HttpStreamParser::ShouldMergeRequestHeadersAndBody(
       "some header", body.get()));
@@ -132,7 +132,7 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_SmallBodyInMemory) {
   upload_data->AppendBytes(payload.data(), payload.size());
 
   scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data));
-  ASSERT_EQ(OK, body->Init());
+  ASSERT_EQ(OK, body->InitSync());
   // Yes, should be merged if the in-memory body is small here.
   ASSERT_TRUE(HttpStreamParser::ShouldMergeRequestHeadersAndBody(
       "some header", body.get()));
@@ -144,7 +144,7 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_LargeBodyInMemory) {
   upload_data->AppendBytes(payload.data(), payload.size());
 
   scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data));
-  ASSERT_EQ(OK, body->Init());
+  ASSERT_EQ(OK, body->InitSync());
   // Shouldn't be merged if the in-memory body is large here.
   ASSERT_FALSE(HttpStreamParser::ShouldMergeRequestHeadersAndBody(
       "some header", body.get()));