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"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 
 namespace net {
 
 const size_t UploadDataStream::kBufferSize = 16384;
 bool UploadDataStream::merge_chunks_ = true;
 
 UploadDataStream::~UploadDataStream() {
 }
 
 int UploadDataStream::Init() {
   DCHECK(!initialized_successfully_);
 
-  total_size_ = upload_data_->GetContentLength();
+  total_size_ = upload_data_->GetContentLengthSyncHack();
   const int result = FillBuffer();
   initialized_successfully_ = (result == OK);
   return result;
 }
 
 // static
 size_t UploadDataStream::GetBufferSize() {
   return kBufferSize;
 }
 
@@ skipping 71 matching lines @@
         // time_t precision. So we have to convert both to time_t to compare.
         if (!element.expected_file_modification_time().is_null()) {
           base::PlatformFileInfo info;
           if (file_util::GetFileInfo(element.file_path(), &info) &&
               element.expected_file_modification_time().ToTimeT() !=
                   info.last_modified.ToTimeT()) {
             return ERR_UPLOAD_FILE_CHANGED;
           }
         }
         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 72 matching lines @@
            elements.back().is_last_chunk()));
 }
 
 bool UploadDataStream::IsInMemory() const {
   DCHECK(initialized_successfully_);
 
   return upload_data_->IsInMemory();
 }
 
 }  // namespace net