Polish the cleaning up url request code for parallel download.

content/browser/download/download_file_impl.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 "content/browser/download/download_file_impl.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 458 matching lines @@
   RecordContiguousWriteTime(now - start);
 
   // Take care of communication with our observer.
   if (reason != DOWNLOAD_INTERRUPT_REASON_NONE) {
     HandleStreamError(source_stream, reason);
   } else if (state == ByteStreamReader::STREAM_COMPLETE || should_terminate) {
     // Signal successful completion or termination of the current stream.
     source_stream->stream_reader()->RegisterCallback(base::Closure());
     source_stream->set_finished(true);
     if (should_terminate)
-      CancelRequestOnUIThread(source_stream->offset());
+      CancelRequest(source_stream->offset());
     if (source_stream->length() == DownloadSaveInfo::kLengthFullContent) {
       SetPotentialFileLength(source_stream->offset() +
                              source_stream->bytes_written());
     }
     num_active_streams_--;
 
     // Inform observers.
     SendUpdate();
 
     // All the stream reader are completed, shut down file IO processing.
@@ skipping 153 matching lines @@
     if (can_recover_from_error) {
       // Since the neighbor stream will download all data downloading from its
       // offset to source_stream->offset(). Close all other streams in the
       // middle.
       for (auto& stream : source_streams_) {
         if (stream.second->offset() < source_stream->offset() &&
             stream.second->offset() > preceding_neighbor->offset()) {
           DCHECK_EQ(stream.second->bytes_written(), 0);
           stream.second->stream_reader()->RegisterCallback(base::Closure());
           stream.second->set_finished(true);
-          CancelRequestOnUIThread(stream.second->offset());
+          CancelRequest(stream.second->offset());
           num_active_streams_--;
         }
       }
     }
   }
 
   SendUpdate();  // Make info up to date before error.
 
   if (!can_recover_from_error) {
     // Error case for both upstream source and file write.
@@ skipping 19 matching lines @@
   for (auto& stream : source_streams_) {
     int64_t offset = stream.second->offset();
     if (offset < source_stream->offset() && offset >= max_preceding_offset) {
       ret = stream.second.get();
       max_preceding_offset = offset;
     }
   }
   return ret;
 }
 
-void DownloadFileImpl::CancelRequestOnUIThread(int64_t offset) {
+void DownloadFileImpl::CancelRequest(int64_t offset) {
   if (!cancel_request_callback_.is_null()) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                             base::Bind(cancel_request_callback_, offset));
   }
 }
 
 void DownloadFileImpl::DebugStates() const {
   DVLOG(1) << "### Debugging DownloadFile states:";
   DVLOG(1) << "Total source stream count = " << source_streams_.size();
   for (const auto& stream : source_streams_) {
@@ skipping 11 matching lines @@
     const base::FilePath& new_path,
     const RenameCompletionCallback& completion_callback)
     : option(option),
       new_path(new_path),
       retries_left(kMaxRenameRetries),
       completion_callback(completion_callback) {}
 
 DownloadFileImpl::RenameParameters::~RenameParameters() {}
 
 }  // namespace content