move MediaStoreHelper and DownloadFileProvider to chrome/browser/download

BUG=1013759

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

chrome/android/chrome_java_sources.gni

@@ -512,7 +512,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/DownloadPage.java",
   "java/src/org/chromium/chrome/browser/download/DownloadResumptionBackgroundTask.java",
   "java/src/org/chromium/chrome/browser/download/DownloadResumptionScheduler.java",
-  "java/src/org/chromium/chrome/browser/download/DownloadFileProvider.java",
   "java/src/org/chromium/chrome/browser/download/DownloadServiceDelegate.java",
   "java/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntry.java",
   "java/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceHelper.java",
@@ -521,7 +520,6 @@ chrome_java_sources = [
   "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/MediaStoreHelper.java",
   "java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java",
   "java/src/org/chromium/chrome/browser/download/SystemDownloadNotifier.java",
   "java/src/org/chromium/chrome/browser/download/home/DownloadManagerCoordinator.java",

chrome/android/chrome_test_java_sources.gni

@@ -134,7 +134,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/dom_distiller/DistillabilityServiceTest.java",
   "javatests/src/org/chromium/chrome/browser/dom_distiller/DistilledPagePrefsTest.java",
   "javatests/src/org/chromium/chrome/browser/download/ChromeDownloadDelegateTest.java",
-  "javatests/src/org/chromium/chrome/browser/download/DownloadFileProviderTest.java",
   "javatests/src/org/chromium/chrome/browser/download/DownloadForegroundServiceManagerTest.java",
   "javatests/src/org/chromium/chrome/browser/download/DownloadForegroundServiceTest.java",
   "javatests/src/org/chromium/chrome/browser/download/DownloadInfoBarControllerTest.java",

chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java

@@ -230,8 +230,6 @@ public abstract class ChromeFeatureList {
             "DarkenWebsitesCheckboxInThemesSetting";
     public static final String DIRECT_ACTIONS = "DirectActions";
     public static final String DOWNLOAD_FILE_PROVIDER = "DownloadFileProvider";
-    public static final String DOWNLOAD_LOCATION_SHOW_IMAGE_IN_GALLERY =
-            "DownloadLocationShowImageInGallery";
     public static final String DOWNLOAD_NOTIFICATION_BADGE = "DownloadNotificationBadge";
     public static final String DOWNLOAD_PROGRESS_INFOBAR = "DownloadProgressInfoBar";
     public static final String DOWNLOAD_RENAME = "DownloadRename";

chrome/browser/android/chrome_feature_list.cc

@@ -132,7 +132,6 @@ const base::Feature* kFeaturesExposedToJava[] = {
     &kContextualSearchTapDisableOverride,
     &kContextualSearchTranslationModel,
     &kDirectActions,
-    &kDownloadLocationShowImageInGallery,
     &kDownloadFileProvider,
     &kDownloadNotificationBadge,
     &kDownloadProgressInfoBar,
@@ -401,9 +400,6 @@ const base::Feature kDrawVerticallyEdgeToEdge{
 const base::Feature kDownloadAutoResumptionThrottling{
     "DownloadAutoResumptionThrottling", base::FEATURE_ENABLED_BY_DEFAULT};
 
-const base::Feature kDownloadLocationShowImageInGallery{
-    "DownloadLocationShowImageInGallery", base::FEATURE_ENABLED_BY_DEFAULT};
-
 const base::Feature kDownloadProgressInfoBar{"DownloadProgressInfoBar",
                                              base::FEATURE_ENABLED_BY_DEFAULT};
 

chrome/browser/android/chrome_feature_list.h

@@ -65,7 +65,6 @@ extern const base::Feature kDirectActions;
 extern const base::Feature kDontPrefetchLibraries;
 extern const base::Feature kDownloadAutoResumptionThrottling;
 extern const base::Feature kDownloadFileProvider;
-extern const base::Feature kDownloadLocationShowImageInGallery;
 extern const base::Feature kDownloadNotificationBadge;
 extern const base::Feature kDownloadProgressInfoBar;
 extern const base::Feature kDownloadRename;

chrome/browser/download/android/BUILD.gn

@@ -9,15 +9,19 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/download/DirectoryOption.java",
     "java/src/org/chromium/chrome/browser/download/DownloadFilter.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/DownloadInfo.java",
+    "java/src/org/chromium/chrome/browser/download/MediaStoreHelper.java",
     "java/src/org/chromium/chrome/browser/download/MimeUtils.java",
   ]
 
   deps = [
     "//base:base_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",
   ]
 }
 
@@ -33,12 +37,15 @@ android_library("download_java_tests") {
 
   java_files = [
     "javatests/src/org/chromium/chrome/browser/download/MimeUtilsTest.java",
+    "javatests/src/org/chromium/chrome/browser/download/DownloadFileProviderTest.java",
   ]
 
   deps = [
     ":java",
+    "//base:base_java",
     "//base:base_java_test_support",
     "//chrome/test/android:chrome_java_test_support",
     "//third_party/junit",
+    "//third_party/mockito:mockito_java",
   ]
 }

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

@@ -13,7 +13,6 @@ import org.chromium.base.BuildInfo;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.task.AsyncTask;
-import org.chromium.chrome.browser.ChromeFeatureList;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -37,8 +36,7 @@ public class MediaStoreHelper {
      */
     public static void addImageToGalleryOnSDCard(String filePath, String mimeType) {
         // TODO(xingliu): Support Android Q when we have available device with SD card slot.
-        if (!ChromeFeatureList.isEnabled(ChromeFeatureList.DOWNLOAD_LOCATION_SHOW_IMAGE_IN_GALLERY)
-                || TextUtils.isEmpty(filePath) || mimeType == null || !mimeType.startsWith("image/")
+        if (TextUtils.isEmpty(filePath) || mimeType == null || !mimeType.startsWith("image/")
                 || BuildInfo.isAtLeastQ()) {
             return;
         }