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* download_manager,
     const DownloadUrlParameters::OnStartedCallback& started_cb) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  DownloadManager* download_manager = info->request_handle.GetDownloadManager();
+  if (!download_manager)
+    download_manager = info->request_handle.GetDownloadManager();
   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 162 matching lines @@
   // Blink verifies that the requester of this download is allowed to set a
   // suggested name for the security origin of the downlaod URL. However, this
   // assumption doesn't hold if there were cross origin redirects. Therefore,
   // clear the suggested_name for such requests.
   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),
+      base::Bind(&StartOnUIThread, base::Passed(&info),
+                 base::Passed(&tab_info_), base::Passed(&stream_reader),
+                 download_manager_.get(),

[asanka, 2015/11/25 15:53:57]

Can't de-reference a WeakPtr on a thread other that its home thread. We'd need
to pass in the WeakPtr as-is to StartOnUIThread and have StartOnUIThread
dereference it on the UI thread.

[svaldez, 2015/11/25 17:53:28]

Yeah, found that out when testing. SHould be fixed.

                  // 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