net: Make UploadDataStream::Read() asynchronous

net/base/upload_bytes_element_reader_unittest.cc

Index: net/base/upload_bytes_element_reader_unittest.cc
diff --git a/net/base/upload_bytes_element_reader_unittest.cc b/net/base/upload_bytes_element_reader_unittest.cc
index 9e68febd493aa58f4157041e2f52241bb1422643..1a3c5d4ebe21c8a4aecaaed9c08737f5925ee68a 100644
--- a/net/base/upload_bytes_element_reader_unittest.cc
+++ b/net/base/upload_bytes_element_reader_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
@@ -31,8 +32,9 @@ class UploadBytesElementReaderTest : public PlatformTest {
 TEST_F(UploadBytesElementReaderTest, ReadPartially) {
   const size_t kHalfSize = bytes_.size() / 2;
   std::vector<char> buf(kHalfSize);
+  scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
   EXPECT_EQ(static_cast<int>(buf.size()),
-            reader_->ReadSync(&buf[0], buf.size()));
+            reader_->ReadSync(wrapped_buffer, buf.size()));
   EXPECT_EQ(bytes_.size() - buf.size(), reader_->BytesRemaining());
   bytes_.resize(kHalfSize);  // Resize to compare.
   EXPECT_EQ(bytes_, buf);
@@ -40,19 +42,21 @@ TEST_F(UploadBytesElementReaderTest, ReadPartially) {
 
 TEST_F(UploadBytesElementReaderTest, ReadAll) {
   std::vector<char> buf(bytes_.size());
+  scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
   EXPECT_EQ(static_cast<int>(buf.size()),
-            reader_->ReadSync(&buf[0], buf.size()));
+            reader_->ReadSync(wrapped_buffer, buf.size()));
   EXPECT_EQ(0U, reader_->BytesRemaining());
   EXPECT_EQ(bytes_, buf);
   // Try to read again.
-  EXPECT_EQ(0, reader_->ReadSync(&buf[0], buf.size()));
+  EXPECT_EQ(0, reader_->ReadSync(wrapped_buffer, buf.size()));
 }
 
 TEST_F(UploadBytesElementReaderTest, ReadTooMuch) {
   const size_t kTooLargeSize = bytes_.size() * 2;
   std::vector<char> buf(kTooLargeSize);
+  scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
   EXPECT_EQ(static_cast<int>(bytes_.size()),
-            reader_->ReadSync(&buf[0], buf.size()));
+            reader_->ReadSync(wrapped_buffer, buf.size()));
   EXPECT_EQ(0U, reader_->BytesRemaining());
   buf.resize(bytes_.size());  // Resize to compare.
   EXPECT_EQ(bytes_, buf);