move downloadstartuputils to chrome/browser/download

Bug: 1013759
Change-Id: I089b87ee804dfc7151f332f0d967eccaf3573dce
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1891472
Commit-Queue: Min Qin <qinmin@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Reviewed-by: Min Qin <qinmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712420}

chrome/android/BUILD.gn

@@ -2625,7 +2625,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/download/DownloadManagerService.java",
     "java/src/org/chromium/chrome/browser/download/DownloadMediaData.java",
     "java/src/org/chromium/chrome/browser/download/DownloadMediaParserBridge.java",
-    "java/src/org/chromium/chrome/browser/download/DownloadStartupUtils.java",
     "java/src/org/chromium/chrome/browser/download/DownloadUtils.java",
     "java/src/org/chromium/chrome/browser/download/home/rename/RenameUtils.java",
     "java/src/org/chromium/chrome/browser/download/items/OfflineContentAggregatorFactory.java",

chrome/android/chrome_java_sources.gni

@@ -522,7 +522,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/DownloadSnackbarController.java",
   "java/src/org/chromium/chrome/browser/download/DownloadUmaStatsEntry.java",
   "java/src/org/chromium/chrome/browser/download/DownloadUpdate.java",
-  "java/src/org/chromium/chrome/browser/download/DownloadStartupUtils.java",
   "java/src/org/chromium/chrome/browser/download/DownloadUtils.java",
   "java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java",
   "java/src/org/chromium/chrome/browser/download/SystemDownloadNotifier.java",

chrome/browser/download/android/BUILD.gn

@@ -12,22 +12,27 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/download/DownloadFileProvider.java",
     "java/src/org/chromium/chrome/browser/download/DownloadInfo.java",
     "java/src/org/chromium/chrome/browser/download/MediaStoreHelper.java",
+    "java/src/org/chromium/chrome/browser/download/DownloadStartupUtils.java",
     "java/src/org/chromium/chrome/browser/download/MimeUtils.java",
   ]
 
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//chrome/browser/util:java",
     "//components/download/public/common:public_java",
     "//components/offline_items_collection/core:core_java",
     "//content/public/android:content_java",
     "//third_party/android_deps:com_android_support_support_compat_java",
   ]
+
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 generate_jni("jni_headers") {
   sources = [
     "java/src/org/chromium/chrome/browser/download/DownloadInfo.java",
+    "java/src/org/chromium/chrome/browser/download/DownloadStartupUtils.java",
     "java/src/org/chromium/chrome/browser/download/MimeUtils.java",
   ]
 }

chrome/browser/download/android/download_startup_utils.cc

@@ -7,8 +7,8 @@
 #include <jni.h>
 #include <utility>
 
-#include "chrome/android/chrome_jni_headers/DownloadStartupUtils_jni.h"
 #include "chrome/browser/android/profile_key_startup_accessor.h"
+#include "chrome/browser/download/android/jni_headers/DownloadStartupUtils_jni.h"
 #include "chrome/browser/download/download_manager_utils.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "components/download/public/common/in_progress_download_manager.h"

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadStartupUtils.java → chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/DownloadStartupUtils.java

@@ -3,13 +3,13 @@
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.download;
+
 import org.chromium.base.annotations.NativeMethods;
 
 /**
  * Handles initialization for the downloads system, i.e. creating in-progress download manager or
  * full download manager depending on whether we are in reduced mode or full browser mode.
  */
-
 public class DownloadStartupUtils {
     /**
      * Initializes the downloads system if not already initialized.