net: Make UploadDataStream::Init() asynchronous.

net/base/upload_data_stream_unittest.cc

Index: net/base/upload_data_stream_unittest.cc
diff --git a/net/base/upload_data_stream_unittest.cc b/net/base/upload_data_stream_unittest.cc
index 2715e73d18d04e1bb03a53159a183fdca0d818c0..1e29873232e4011615b8c612b6f21b180901b833 100644
--- a/net/base/upload_data_stream_unittest.cc
+++ b/net/base/upload_data_stream_unittest.cc
@@ -54,7 +54,7 @@ class UploadDataStreamTest : public PlatformTest {
 TEST_F(UploadDataStreamTest, EmptyUploadData) {
   upload_data_->AppendBytes("", 0);
   scoped_ptr<UploadDataStream> stream(new UploadDataStream(upload_data_));
-  ASSERT_EQ(OK, stream->Init());
+  ASSERT_EQ(OK, stream->InitSync());
   ASSERT_TRUE(stream.get());
   EXPECT_EQ(0U, stream->size());
   EXPECT_EQ(0U, stream->position());
@@ -64,7 +64,7 @@ TEST_F(UploadDataStreamTest, EmptyUploadData) {
 TEST_F(UploadDataStreamTest, ConsumeAll) {
   upload_data_->AppendBytes(kTestData, kTestDataSize);
   scoped_ptr<UploadDataStream> stream(new UploadDataStream(upload_data_));
-  ASSERT_EQ(OK, stream->Init());
+  ASSERT_EQ(OK, stream->InitSync());
   ASSERT_TRUE(stream.get());
   EXPECT_EQ(kTestDataSize, stream->size());
   EXPECT_EQ(0U, stream->position());
@@ -94,7 +94,7 @@ TEST_F(UploadDataStreamTest, FileSmallerThanLength) {
   EXPECT_EQ(kFakeSize, upload_data_->GetContentLengthSync());
 
   scoped_ptr<UploadDataStream> stream(new UploadDataStream(upload_data_));
-  ASSERT_EQ(OK, stream->Init());
+  ASSERT_EQ(OK, stream->InitSync());
   ASSERT_TRUE(stream.get());
   EXPECT_EQ(kFakeSize, stream->size());
   EXPECT_EQ(0U, stream->position());
@@ -128,7 +128,7 @@ void UploadDataStreamTest::FileChangedHelper(const FilePath& file_path,
   upload_data->SetElements(elements);
 
   scoped_ptr<UploadDataStream> stream(new UploadDataStream(upload_data));
-  int error_code = stream->Init();
+  int error_code = stream->InitSync();
   if (error_expected)
     ASSERT_EQ(ERR_UPLOAD_FILE_CHANGED, error_code);
   else
@@ -172,7 +172,7 @@ TEST_F(UploadDataStreamTest, UploadDataReused) {
   // Confirm that the file is read properly.
   {
     UploadDataStream stream(upload_data_);
-    ASSERT_EQ(OK, stream.Init());
+    ASSERT_EQ(OK, stream.InitSync());
     EXPECT_EQ(kTestData, ReadFromUploadDataStream(&stream));
   }
 
@@ -180,7 +180,7 @@ TEST_F(UploadDataStreamTest, UploadDataReused) {
   // file is read properly.
   {
     UploadDataStream stream(upload_data_);
-    ASSERT_EQ(OK, stream.Init());
+    ASSERT_EQ(OK, stream.InitSync());
     EXPECT_EQ(kTestData, ReadFromUploadDataStream(&stream));
   }