Move InProgressDownloadManager creation logic into DownloadManagerUtils

Currently InProgressDownloadManager is created in DownloadManagerImpl.
However, for content layer, we don't need to create the in-progress DB.
As a result, This CL move InProgressDownloadManager creation to Chrome layer,
it also allows us to construct the SimpleFactoryKey from the profile,
which can later be used to create the SimpleDownloadManagerCoordinator.

BUG=942770

Change-Id: I8f020f2685dd0d6972c56ab1225b440c3c73051b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1555010Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Commit-Queue: Min Qin <qinmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#648745}

chrome/browser/BUILD.gn

@@ -426,6 +426,8 @@ jumbo_split_static_library("browser") {
     "download/download_item_model.h",
     "download/download_location_dialog_result.h",
     "download/download_location_dialog_type.h",
+    "download/download_manager_utils.cc",
+    "download/download_manager_utils.h",
     "download/download_offline_content_provider.cc",
     "download/download_offline_content_provider.h",
     "download/download_permission_request.cc",

chrome/browser/download/download_manager_utils.cc

+// Copyright 2019 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 "chrome/browser/download/download_manager_utils.h"
+
+#include "base/bind.h"
+#include "build/build_config.h"
+#include "chrome/browser/profiles/profile.h"
+#include "components/download/public/common/in_progress_download_manager.h"
+#include "content/public/browser/download_request_utils.h"
+
+#if defined(OS_ANDROID)
+#include "chrome/browser/android/download/download_manager_service.h"
+#endif
+
+// Ignores origin security check. DownloadManagerImpl will provide its own
+// implementation when InProgressDownloadManager object is passed to it.
+bool IgnoreOriginSecurityCheck(const GURL& url) {
+  return true;
+}
+
+download::InProgressDownloadManager*
+DownloadManagerUtils::RetrieveInProgressDownloadManager(Profile* profile) {
+  // TODO(qinmin): use the profile to retrieve SimpleFactoryKey and
+  // create SimpleDownloadManagerCoordinator.
+#if defined(OS_ANDROID)
+  download::InProgressDownloadManager* manager =
+      DownloadManagerService::GetInstance()->RetriveInProgressDownloadManager(
+          profile);
+  if (manager)
+    return manager;
+#endif
+  return new download::InProgressDownloadManager(
+      nullptr,
+      profile->IsOffTheRecord() ? base::FilePath() : profile->GetPath(),
+      base::BindRepeating(&IgnoreOriginSecurityCheck),
+      base::BindRepeating(&content::DownloadRequestUtils::IsURLSafe));
+}

chrome/browser/download/download_manager_utils.h

+// Copyright 2019 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.
+
+#ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_UTILS_H_
+#define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_UTILS_H_
+
+#include "base/macros.h"
+
+class Profile;
+
+namespace download {
+class InProgressDownloadManager;
+}
+
+class DownloadManagerUtils {
+ public:
+  // Creates an InProgressDownloadManager from a profile.
+  static download::InProgressDownloadManager* RetrieveInProgressDownloadManager(
+      Profile* profile);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(DownloadManagerUtils);
+};
+
+#endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_UTILS_H_

chrome/browser/profiles/profile_impl.cc

@@ -52,6 +52,7 @@
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_core_service.h"
 #include "chrome/browser/download/download_core_service_factory.h"
+#include "chrome/browser/download/download_manager_utils.h"
 #include "chrome/browser/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/media/media_device_id_salt.h"
 #include "chrome/browser/net/system_network_context_manager.h"
@@ -190,9 +191,7 @@
 
 #endif
 
-#if defined(OS_ANDROID)
-#include "chrome/browser/android/download/download_manager_service.h"
-#else
+#if !defined(OS_ANDROID)
 #include "chrome/services/app_service/app_service.h"
 #include "chrome/services/app_service/public/mojom/constants.mojom.h"
 #include "components/zoom/zoom_event_manager.h"
@@ -1330,12 +1329,7 @@ std::string ProfileImpl::GetMediaDeviceIDSalt() {
 
 download::InProgressDownloadManager*
 ProfileImpl::RetriveInProgressDownloadManager() {
-#if defined(OS_ANDROID)
-  return DownloadManagerService::GetInstance()
-      ->RetriveInProgressDownloadManager(this);
-#else
-  return nullptr;
-#endif
+  return DownloadManagerUtils::RetrieveInProgressDownloadManager(this);
 }
 
 bool ProfileImpl::IsSameProfile(Profile* profile) {

content/browser/download/download_manager_impl.cc

@@ -338,9 +338,7 @@ DownloadManagerImpl::DownloadManagerImpl(BrowserContext* browser_context)
   if (!in_progress_manager_) {
     in_progress_manager_ =
         std::make_unique<download::InProgressDownloadManager>(
-            this,
-            IsOffTheRecord() ? base::FilePath() : browser_context_->GetPath(),
-            base::BindRepeating(&IsOriginSecure),
+            this, base::FilePath(), base::BindRepeating(&IsOriginSecure),
             base::BindRepeating(&DownloadRequestUtils::IsURLSafe));
   } else {
     in_progress_manager_->set_delegate(this);