Reduce unnecessary download interruptions due to parallel requests

content/browser/download/download_worker.cc

 // Copyright 2017 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_worker.h"
 
 #include "content/browser/download/download_create_info.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 #include "content/public/browser/web_contents.h"
 
 namespace content {
 namespace {
 
 const int kVerboseLevel = 1;
 
+class CompletedByteStreamReader : public ByteStreamReader {
+ public:
+  CompletedByteStreamReader(int status) : status_(status){};

[xingliu, 2017/05/10 01:40:17]

nit: space between ) and {}.

[qinmin, 2017/05/10 17:47:24]

wierd, this is the result of "git cl format". Fixed anyway.

+  ~CompletedByteStreamReader() override = default;
+
+  // ByteStreamReader implementations:
+  ByteStreamReader::StreamState Read(scoped_refptr<net::IOBuffer>* data,
+                                     size_t* length) override {
+    return ByteStreamReader::STREAM_COMPLETE;
+  }
+  int GetStatus() const override { return status_; }
+  void RegisterCallback(const base::Closure& sink_callback) override{};

[xingliu, 2017/05/10 01:40:17]

nit: also space here.

[qinmin, 2017/05/10 17:47:24]

Done.

+
+ private:
+  int status_;
+};
+
 std::unique_ptr<UrlDownloader, BrowserThread::DeleteOnIOThread>
 CreateUrlDownloader(std::unique_ptr<DownloadUrlParameters> params,
                     base::WeakPtr<UrlDownloader::Delegate> delegate) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // Build the URLRequest, BlobDataHandle is hold in original request for image
   // download.
   std::unique_ptr<net::URLRequest> url_request =
       DownloadRequestCore::CreateRequestOnIOThread(DownloadItem::kInvalidId,
                                                    params.get());
@@ skipping 61 matching lines @@
     VLOG(kVerboseLevel) << "Byte stream arrived after user cancel the request.";
     create_info->request_handle->CancelRequest();
     return;
   }
 
   // TODO(xingliu): Add metric for error handling.
   if (create_info->result !=
       DownloadInterruptReason::DOWNLOAD_INTERRUPT_REASON_NONE) {
     VLOG(kVerboseLevel) << "Parallel download sub-request failed. reason = "
                         << create_info->result;
-
-    delegate_->OnServerResponseError(this, create_info->result);
-    return;
+    stream_reader.reset(new CompletedByteStreamReader(create_info->result));
   }
 
   request_handle_ = std::move(create_info->request_handle);
 
   // Pause the stream if user paused, still push the stream reader to the sink.
   if (is_paused_) {
     VLOG(kVerboseLevel) << "Byte stream arrived after user pause the request.";
     Pause();
   }
 
   delegate_->OnByteStreamReady(this, std::move(stream_reader));
 }
 
 void DownloadWorker::OnUrlDownloaderStopped(UrlDownloader* downloader) {
   // Release the |url_downloader_|, the object will be deleted on IO thread.
   url_downloader_.reset();
 }
 
 void DownloadWorker::AddUrlDownloader(
     std::unique_ptr<UrlDownloader, BrowserThread::DeleteOnIOThread>
         downloader) {
   url_downloader_ = std::move(downloader);
 }
 
 }  // namespace content