net: Split sync part of UploadFileElementReader as UploadFileElementReaderSync

Add UploadFileElementReaderSync and use it from Chrome Frame.
Remove UploadDataStream::InitSync/ReadSync
Remove UploadElementReader::InitSync/ReadSync
Allow passing null callbacks for Init/Read when callers can be confident that the operation finishes synchronously.

BUG=None
TEST=net_unittests, chrome_frame_net_tests
TBR=ananta@chromium.org for chrome_frame/urlmon_upload_data_stream.cc

Review URL: https://chromiumcodereview.appspot.com/11587007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174133 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/net/base/upload_bytes_element_reader_unittest.cc b/net/base/upload_bytes_element_reader_unittest.cc
index eca720f..b5bd588 100644
--- a/net/base/upload_bytes_element_reader_unittest.cc
+++ b/net/base/upload_bytes_element_reader_unittest.cc
@@ -19,7 +19,7 @@ class UploadBytesElementReaderTest : public PlatformTest {
     const char kData[] = "123abc";
     bytes_.assign(kData, kData + arraysize(kData));
     reader_.reset(new UploadBytesElementReader(&bytes_[0], bytes_.size()));
-    ASSERT_EQ(OK, reader_->InitSync());
+    ASSERT_EQ(OK, reader_->Init(CompletionCallback()));
     EXPECT_EQ(bytes_.size(), reader_->GetContentLength());
     EXPECT_EQ(bytes_.size(), reader_->BytesRemaining());
     EXPECT_TRUE(reader_->IsInMemory());
@@ -34,7 +34,7 @@ TEST_F(UploadBytesElementReaderTest, ReadPartially) {
   std::vector<char> buf(kHalfSize);
   scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
   EXPECT_EQ(static_cast<int>(buf.size()),
-            reader_->ReadSync(wrapped_buffer, buf.size()));
+            reader_->Read(wrapped_buffer, buf.size(), CompletionCallback()));
   EXPECT_EQ(bytes_.size() - buf.size(), reader_->BytesRemaining());
   bytes_.resize(kHalfSize);  // Resize to compare.
   EXPECT_EQ(bytes_, buf);
@@ -44,11 +44,11 @@ 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(wrapped_buffer, buf.size()));
+            reader_->Read(wrapped_buffer, buf.size(), CompletionCallback()));
   EXPECT_EQ(0U, reader_->BytesRemaining());
   EXPECT_EQ(bytes_, buf);
   // Try to read again.
-  EXPECT_EQ(0, reader_->ReadSync(wrapped_buffer, buf.size()));
+  EXPECT_EQ(0, reader_->Read(wrapped_buffer, buf.size(), CompletionCallback()));
 }
 
 TEST_F(UploadBytesElementReaderTest, ReadTooMuch) {
@@ -56,7 +56,7 @@ TEST_F(UploadBytesElementReaderTest, ReadTooMuch) {
   std::vector<char> buf(kTooLargeSize);
   scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
   EXPECT_EQ(static_cast<int>(bytes_.size()),
-            reader_->ReadSync(wrapped_buffer, buf.size()));
+            reader_->Read(wrapped_buffer, buf.size(), CompletionCallback()));
   EXPECT_EQ(0U, reader_->BytesRemaining());
   buf.resize(bytes_.size());  // Resize to compare.
   EXPECT_EQ(bytes_, buf);
@@ -68,18 +68,18 @@ TEST_F(UploadBytesElementReaderTest, MultipleInit) {
 
   // Read all.
   EXPECT_EQ(static_cast<int>(buf.size()),
-            reader_->ReadSync(wrapped_buffer, buf.size()));
+            reader_->Read(wrapped_buffer, buf.size(), CompletionCallback()));
   EXPECT_EQ(0U, reader_->BytesRemaining());
   EXPECT_EQ(bytes_, buf);
 
   // Call Init() again to reset the state.
-  ASSERT_EQ(OK, reader_->InitSync());
+  ASSERT_EQ(OK, reader_->Init(CompletionCallback()));
   EXPECT_EQ(bytes_.size(), reader_->GetContentLength());
   EXPECT_EQ(bytes_.size(), reader_->BytesRemaining());
 
   // Read again.
   EXPECT_EQ(static_cast<int>(buf.size()),
-            reader_->ReadSync(wrapped_buffer, buf.size()));
+            reader_->Read(wrapped_buffer, buf.size(), CompletionCallback()));
   EXPECT_EQ(0U, reader_->BytesRemaining());
   EXPECT_EQ(bytes_, buf);
 }