Adding WebContent-free Download

content/browser/download/download_manager_impl.cc

Index: content/browser/download/download_manager_impl.cc
diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc
index 6a98bc2f8a4a1f5e9eae6f63d78d6ee87f2117f6..6128ba016841be144f9b225b3eb4f5cf10608dc8 100644
--- a/content/browser/download/download_manager_impl.cc
+++ b/content/browser/download/download_manager_impl.cc
@@ -11,6 +11,7 @@
 #include "base/debug/alias.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
+#include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
@@ -50,7 +51,9 @@ namespace content {
 namespace {
 
 void BeginDownload(scoped_ptr<DownloadUrlParameters> params,
-                   uint32 download_id) {
+                   uint32 download_id,
+                   base::WeakPtr<DownloadManagerImpl> download_manager,
+                   DownloadManagerImpl::Core* core) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // ResourceDispatcherHost{Base} is-not-a URLRequest::Delegate, and
   // DownloadUrlParameters can-not include resource_dispatcher_host_impl.h, so
@@ -120,19 +123,20 @@ void BeginDownload(scoped_ptr<DownloadUrlParameters> params,
   save_info->prompt_for_save_location = params->prompt();
   save_info->file = params->GetFile();
 
-  ResourceDispatcherHost::Get()->BeginDownload(
-      request.Pass(),
-      params->referrer(),
-      params->content_initiated(),
-      params->resource_context(),
-      params->render_process_host_id(),
-      params->render_view_host_routing_id(),
-      params->render_frame_host_routing_id(),
-      params->prefer_cache(),
-      params->do_not_prompt_for_login(),
-      save_info.Pass(),
-      download_id,
-      params->callback());
+  if (params->render_process_host_id() != -1) {
+    ResourceDispatcherHost::Get()->BeginDownload(
+        request.Pass(), params->referrer(), params->content_initiated(),
+        params->resource_context(), params->render_process_host_id(),
+        params->render_view_host_routing_id(),
+        params->render_frame_host_routing_id(), params->prefer_cache(),
+        params->do_not_prompt_for_login(), save_info.Pass(), download_id,
+        params->callback());
+  } else {
+    core->AddUrlDownloader(UrlDownloader::BeginDownload(
+        download_manager, request.Pass(), params->referrer(), false,
+        params->prefer_cache(), true, save_info.Pass(), download_id,
+        params->callback()));
+  }
 }
 
 class DownloadItemFactoryImpl : public DownloadItemFactory {
@@ -206,6 +210,21 @@ class DownloadItemFactoryImpl : public DownloadItemFactory {
 
 }  // namespace
 
+DownloadManagerImpl::Core::Core() {}
+
+DownloadManagerImpl::Core::~Core() {
+  DCHECK(url_downloaders_.size() == 0);
+}
+
+void DownloadManagerImpl::Core::AddUrlDownloader(
+    scoped_ptr<UrlDownloader> downloader) {
+  url_downloaders_.push_back(downloader.Pass());
+}
+
+void DownloadManagerImpl::Core::Shutdown() {
+  url_downloaders_.clear();
+}
+
 DownloadManagerImpl::DownloadManagerImpl(
     net::NetLog* net_log,
     BrowserContext* browser_context)
@@ -218,6 +237,7 @@ DownloadManagerImpl::DownloadManagerImpl(
       net_log_(net_log),
       weak_factory_(this) {
   DCHECK(browser_context);
+  core_ = new Core;

[asanka, 2015/12/08 16:58:32]

Move this to member initialization.

[svaldez, 2015/12/08 20:39:26]

Removed Core.

 }
 
 DownloadManagerImpl::~DownloadManagerImpl() {
@@ -329,6 +349,10 @@ void DownloadManagerImpl::Shutdown() {
   if (delegate_)
     delegate_->Shutdown();
   delegate_ = NULL;
+
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+                          base::Bind(&Core::Shutdown,
+                                     base::Unretained(core_)));
 }
 
 void DownloadManagerImpl::StartDownload(
@@ -512,10 +536,10 @@ void DownloadManagerImpl::ResumeInterruptedDownload(
     scoped_ptr<content::DownloadUrlParameters> params,
     uint32 id) {
   RecordDownloadSource(INITIATED_BY_RESUMPTION);
-  BrowserThread::PostTask(
-      BrowserThread::IO,
-      FROM_HERE,
-      base::Bind(&BeginDownload, base::Passed(&params), id));
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+                          base::Bind(&BeginDownload, base::Passed(&params), id,
+                                     weak_factory_.GetWeakPtr(),
+                                     core_));
 }
 
 void DownloadManagerImpl::SetDownloadItemFactoryForTesting(
@@ -612,9 +636,11 @@ void DownloadManagerImpl::DownloadUrl(
     DCHECK(params->prefer_cache());
     DCHECK_EQ("POST", params->method());
   }
-  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(
-      &BeginDownload, base::Passed(&params),
-      content::DownloadItem::kInvalidId));
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+                          base::Bind(&BeginDownload, base::Passed(&params),
+                                     content::DownloadItem::kInvalidId,
+                                     weak_factory_.GetWeakPtr(),
+                                     core_));
 }
 
 void DownloadManagerImpl::AddObserver(Observer* observer) {