Move DownloadFileProvider to the base module

This provider had minimal dependencies, and moving to the base module
will give chrome module preloading more time to work. See
http://crrev.com/c/2577546 for more background.

Bug: 1150600
Change-Id: Ic35fbe75a82aa19bea76dcbfb3aed534cbd2e600
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2587821Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Min Qin <qinmin@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836628}

chrome/android/BUILD.gn

@@ -308,6 +308,7 @@ android_library("chrome_java") {
     "//chrome/browser/continuous_search:java",
     "//chrome/browser/device:java",
     "//chrome/browser/download/android:factory_java",
+    "//chrome/browser/download/android:file_provider_java",
     "//chrome/browser/download/android:java",
     "//chrome/browser/download/android:java_resources",
     "//chrome/browser/engagement/android:java",
@@ -1050,6 +1051,7 @@ android_library("chrome_test_java") {
     "//chrome/browser/contextmenu:java",
     "//chrome/browser/continuous_search:javatests",
     "//chrome/browser/device:java",
+    "//chrome/browser/download/android:file_provider_java",
     "//chrome/browser/download/android:java",
     "//chrome/browser/download/internal/android:javatests",
     "//chrome/browser/endpoint_fetcher:java",
@@ -2181,6 +2183,7 @@ android_library("base_module_java") {
     "$google_play_services_package:google_play_services_gcm_java",
     "//base:base_java",
     "//base:jni_java",
+    "//chrome/browser/download/android:file_provider_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",
     "//chrome/browser/util:java",

chrome/android/expectations/monochrome_public_bundle.AndroidManifest.expected

@@ -861,6 +861,7 @@
         android:authorities="$PACKAGE.DownloadFileProvider"
         android:exported="false"
         android:grantUriPermissions="true"
+        android:initOrder="10000"
         android:name="org.chromium.chrome.browser.download.DownloadFileProvider">
       <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
     </provider>  # DIFF-ANCHOR: 97e158a1

chrome/android/expectations/trichrome_chrome_bundle.AndroidManifest.expected

@@ -799,6 +799,7 @@
         android:authorities="$PACKAGE.DownloadFileProvider"
         android:exported="false"
         android:grantUriPermissions="true"
+        android:initOrder="10000"
         android:name="org.chromium.chrome.browser.download.DownloadFileProvider">
       <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
     </provider>  # DIFF-ANCHOR: 97e158a1

chrome/android/java/AndroidManifest.xml

@@ -886,14 +886,6 @@ by a child template that "extends" this file.
                     android:readPermission="android.permission.GLOBAL_SEARCH" />
         </provider>
 
-        <provider android:name="org.chromium.chrome.browser.download.DownloadFileProvider"
-            android:authorities="{{ manifest_package }}.DownloadFileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
-
         <!-- Broadcast receiver that will be notified of account changes -->
         <receiver android:name="org.chromium.chrome.browser.services.AccountsChangedReceiver"
             android:exported="true">
@@ -1242,9 +1234,9 @@ by a child template that "extends" this file.
           "com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
           android:value="org.chromium.components.media_router.caf.CastOptionsProvider"/>
 
-      <!-- Provider for FileProvider. This is declared in the base module and
-           has the initOrder attribute to ensure it is loaded first and gives
-           the chrome split preloader more time to work. -->
+      <!-- These providers are declared in the base module and have the
+           initOrder attribute to ensure they are loaded first, which gives the
+           chrome split preloader more time to work. -->
       <provider android:name="org.chromium.chrome.browser.util.ChromeFileProvider"
           android:authorities="{{ manifest_package }}.FileProvider"
           android:exported="false"
@@ -1254,6 +1246,15 @@ by a child template that "extends" this file.
               android:resource="@xml/file_paths" />
       </provider>
 
+      <provider android:name="org.chromium.chrome.browser.download.DownloadFileProvider"
+          android:authorities="{{ manifest_package }}.DownloadFileProvider"
+          android:exported="false"
+          android:initOrder="10000"
+          android:grantUriPermissions="true">
+          <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
+              android:resource="@xml/file_paths" />
+      </provider>
+
       {% block base_application_definitions %}
       {% endblock %}
       {% block extra_application_definitions_for_test %}

chrome/browser/download/android/BUILD.gn

@@ -5,14 +5,28 @@
 import("//build/config/android/rules.gni")
 import("//chrome/android/features/android_library_factory_tmpl.gni")
 
-android_library("java") {
+# Minimal Java library for the DownloadFileProvider which will be included in
+# the base module.
+android_library("file_provider_java") {
   sources = [
     "java/src/org/chromium/chrome/browser/download/DirectoryOption.java",
+    "java/src/org/chromium/chrome/browser/download/DownloadDirectoryProvider.java",
+    "java/src/org/chromium/chrome/browser/download/DownloadFileProvider.java",
+  ]
+  deps = [
+    "//base:base_java",
+    "//components/embedder_support/android:util_java",
+    "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_core_core_java",
+  ]
+}
+
+android_library("java") {
+  sources = [
     "java/src/org/chromium/chrome/browser/download/DownloadConstants.java",
     "java/src/org/chromium/chrome/browser/download/DownloadDelegateImpl.java",
     "java/src/org/chromium/chrome/browser/download/DownloadDialogBridge.java",
-    "java/src/org/chromium/chrome/browser/download/DownloadDirectoryProvider.java",
-    "java/src/org/chromium/chrome/browser/download/DownloadFileProvider.java",
     "java/src/org/chromium/chrome/browser/download/DownloadFilter.java",
     "java/src/org/chromium/chrome/browser/download/DownloadInfo.java",
     "java/src/org/chromium/chrome/browser/download/DownloadLaterMetrics.java",
@@ -51,6 +65,7 @@ android_library("java") {
   ]
 
   deps = [
+    ":file_provider_java",
     ":java_resources",
     "//base:base_java",
     "//base:jni_java",
@@ -125,6 +140,7 @@ android_library("download_java_tests") {
   ]
 
   deps = [
+    ":file_provider_java",
     ":java",
     "//base:base_java",
     "//base:base_java_test_support",
@@ -154,6 +170,7 @@ android_library("junit_tests") {
   ]
 
   deps = [
+    ":file_provider_java",
     ":java",
     "//base:base_java",
     "//base:base_java_test_support",

chrome/browser/download/internal/android/BUILD.gn

@@ -107,6 +107,7 @@ android_library("java") {
     ":jni_headers",
     "//base:base_java",
     "//base:jni_java",
+    "//chrome/browser/download/android:file_provider_java",
     "//chrome/browser/download/android:java",
     "//chrome/browser/thumbnail:java",
     "//chrome/browser/ui/messages/android:java",