net: Make UploadData::GetContentLength() asynchronous.

However, the asynchronous version is not used yet.
The synchronous version is kept as GetContentLengthSync().
The existing code is changed to use the synchronous version.

TEST=net_unittests
BUG=72001,112607

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

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

1 files changed, 6 insertions, 1 deletions

diff --git a/net/base/upload_data_stream.cc b/net/base/upload_data_stream.cc
index cee54c7..5b2e5d3 100644
--- a/net/base/upload_data_stream.cc
+++ b/net/base/upload_data_stream.cc
@@ -31,7 +31,10 @@ UploadDataStream::~UploadDataStream() {
 int UploadDataStream::Init() {
   DCHECK(!initialized_successfully_);
 
-  total_size_ = upload_data_->GetContentLength();
+  {
+    base::ThreadRestrictions::ScopedAllowIO allow_io;
+    total_size_ = upload_data_->GetContentLengthSync();
+  }
 
   // If the underlying file has been changed and the expected file
   // modification time is set, treat it as error. Note that the expected
@@ -98,6 +101,8 @@ int UploadDataStream::Read(IOBuffer* buf, int buf_len) {
       // Open the file of the current element if not yet opened.
       if (!element_file_stream_.get()) {
         element_file_bytes_remaining_ = element.GetContentLength();
+        // Temporarily allow until fix: http://crbug.com/72001.
+        base::ThreadRestrictions::ScopedAllowIO allow_io;
         element_file_stream_.reset(element.NewFileStreamForReading());
       }