net: Explicitly close a file stream in UploadDataStream.

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 147 matching lines @@
 
   eof_ = IsEOF();
 
   return OK;
 }
 
 void UploadDataStream::AdvanceToNextElement() {
   ++element_index_;
   element_offset_ = 0;
   element_file_bytes_remaining_ = 0;
-  element_file_stream_.reset();
+  if (element_file_stream_.get()) {
+    // Temporarily allow until fix: http://crbug.com/72001.
+    base::ThreadRestrictions::ScopedAllowIO allow_io;
+    element_file_stream_.Close();

[eroman, 2012/02/01 21:43:28]

The call to Close() isn't strictly necessary right?
Destruction should implicitly close it too.

[satorux1, 2012/02/01 21:46:09]

you are right, but wanted to make it clear that file access is performed here. I
also plan to make file closing asynchronous in the upcoming patches.

btw, element_file_stream_.Close() should have been
element_file_stream_->Close(). patch set 2 fixed this.

+    element_file_stream_.reset();
+  }
 }
 
 bool UploadDataStream::IsEOF() const {
   const std::vector<UploadData::Element>& elements = *upload_data_->elements();
 
   // Check if all elements are consumed and the buffer is empty.
   if (element_index_ == elements.size() && !buf_len_) {
     // If the upload data is chunked, check if the last element is the
     // last chunk.
     if (!upload_data_->is_chunked() ||
@@ skipping 11 matching lines @@
           (!elements.empty() &&
            element_index_ == elements.size() &&
            elements.back().is_last_chunk()));
 }
 
 bool UploadDataStream::IsInMemory() const {
   return upload_data_->IsInMemory();
 }
 
 }  // namespace net