net: Make UploadData::GetContentLength() asynchronous.

net/base/upload_data_stream.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/upload_data_stream.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 #include "net/base/file_stream.h"
@@ skipping 13 matching lines @@
       current_position_(0),
       initialized_successfully_(false) {
 }
 
 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
   // modification time from WebKit is based on time_t precision. So we
   // have to convert both to time_t to compare. This check is used for
   // sliced files.
   const std::vector<UploadData::Element>& elements = *upload_data_->elements();
   for (size_t i = 0; i < elements.size(); ++i) {
     const UploadData::Element& element = elements[i];
     if (element.type() == UploadData::TYPE_FILE &&
@@ skipping 46 matching lines @@
       // Advance to the next element if we have consumed all data in the
       // current element.
       if (element_offset_ == element_data.size())
         advance_to_next_element = true;
     } else {
       DCHECK(element.type() == UploadData::TYPE_FILE);
 
       // 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());
       }
 
       const int num_bytes_to_read =
           static_cast<int>(std::min(element_file_bytes_remaining_,
                                     static_cast<uint64>(free_buffer_space)));
       if (num_bytes_to_read > 0) {
         int num_bytes_consumed = 0;
         // Temporarily allow until fix: http://crbug.com/72001.
         base::ThreadRestrictions::ScopedAllowIO allow_io;
@@ skipping 63 matching lines @@
   return false;
 }
 
 bool UploadDataStream::IsInMemory() const {
   DCHECK(initialized_successfully_);
 
   return upload_data_->IsInMemory();
 }
 
 }  // namespace net