Adding WebContent-free Download

content/browser/download/download_resource_handler.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_resource_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 44 matching lines @@
     return;
   started_cb.Run(item, interrupt_reason);
 }
 
 // Static function in order to prevent any accidental accesses to
 // DownloadResourceHandler members from the UI thread.
 static void StartOnUIThread(
     scoped_ptr<DownloadCreateInfo> info,
     scoped_ptr<DownloadResourceHandler::DownloadTabInfo> tab_info,
     scoped_ptr<ByteStreamReader> stream,
+    DownloadManager* parent_download_manager,
     const DownloadUrlParameters::OnStartedCallback& started_cb) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   DownloadManager* download_manager = info->request_handle.GetDownloadManager();
+  if (!download_manager)
+    download_manager = parent_download_manager;

[asanka, 2015/11/20 19:57:46]

I'd do this the other way. I.e. if parent_download_manager is non-nullptr, then
use it without poking at info->request_handle at all.

[svaldez, 2015/11/23 15:18:56]

Done.

   if (!download_manager) {
     // NULL in unittests or if the page closed right after starting the
     // download.
     if (!started_cb.is_null())
       started_cb.Run(NULL, DOWNLOAD_INTERRUPT_REASON_USER_CANCELED);
 
     // |stream| gets deleted on non-FILE thread, but it's ok since
     // we're not using stream_writer_ yet.
 
     return;
@@ skipping 166 matching lines @@
   if (info->url_chain.size() > 1 &&
       info->url_chain.front().GetOrigin() != info->url_chain.back().GetOrigin())
     info->save_info->suggested_name.clear();
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&StartOnUIThread,
                  base::Passed(&info),
                  base::Passed(&tab_info_),
                  base::Passed(&stream_reader),
+                 parent_download_manager_,
                  // Pass to StartOnUIThread so that variable
                  // access is always on IO thread but function
                  // is called on UI thread.
                  started_cb_));
   // Guaranteed to be called in StartOnUIThread
   started_cb_.Reset();
 
   return true;
 }
 
@@ skipping 277 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&DeleteOnUIThread, base::Passed(&tab_info_)));
   }
 
   UMA_HISTOGRAM_TIMES("SB2.DownloadDuration",
                       base::TimeTicks::Now() - download_start_time_);
 }
 
 }  // namespace content