Revert "Move some java download files to chrome/browser/download/android"

This reverts commit 4812124d.

Reason for revert: Suspect causing build failure android_arm64-builder-perf 
https://ci.chromium.org/p/chrome/builders/ci/android_arm64-builder-perf/122367

Original change's description:
> Move some java download files to chrome/browser/download/android
> 
> This CL moves the DirectoryOption and DownloadDirectoryProvider.java
> 
> BUG=1013759
> 
> Change-Id: I78bef333bed85a4e34a70843caaf37ef1dbfa7de
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1867192
> Reviewed-by: David Trainor <dtrainor@chromium.org>
> Commit-Queue: Min Qin <qinmin@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#708254}

TBR=dtrainor@chromium.org,qinmin@chromium.org

Change-Id: I6f219a56fe4ad9e4e5cde3b8acfca4c045a5bfc7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1013759
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1873281Reviewed-by: Ella Ge <eirage@chromium.org>
Commit-Queue: Ella Ge <eirage@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708299}

chrome/android/BUILD.gn

@@ -795,7 +795,6 @@ android_library("chrome_test_java") {
     "//chrome/android/webapk/libs/common:common_java",
     "//chrome/browser/android/metrics:ukm_java_test_support",
     "//chrome/browser/android/metrics:ukm_javatests",
-    "//chrome/browser/download/android:java",
     "//chrome/browser/ui/android/widget:java",
     "//chrome/browser/ui/android/widget:test_support_java",
     "//chrome/browser/util/android:java",

chrome/android/chrome_java_sources.gni

@@ -486,9 +486,11 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeTabInfo.java",
   "java/src/org/chromium/chrome/browser/dom_distiller/TabDistillabilityProvider.java",
   "java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java",
+  "java/src/org/chromium/chrome/browser/download/DirectoryOption.java",
   "java/src/org/chromium/chrome/browser/download/DownloadActivity.java",
   "java/src/org/chromium/chrome/browser/download/DownloadBroadcastManager.java",
   "java/src/org/chromium/chrome/browser/download/DownloadController.java",
+  "java/src/org/chromium/chrome/browser/download/DownloadDirectoryProvider.java",
   "java/src/org/chromium/chrome/browser/download/DownloadForegroundService.java",
   "java/src/org/chromium/chrome/browser/download/DownloadForegroundServiceManager.java",
   "java/src/org/chromium/chrome/browser/download/DownloadForegroundServiceObservers.java",

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

@@ -131,9 +131,8 @@ public class DownloadDirectoryProvider {
                 hasAddtionalDirectory = true;
             }
 
-            if (hasAddtionalDirectory) {
+            if (hasAddtionalDirectory)
                 recordDirectoryType(DirectoryOption.DownloadLocationDirectoryType.ADDITIONAL);
-            }
 
             return dirs;
         }
@@ -204,7 +203,7 @@ public class DownloadDirectoryProvider {
     private AllDirectoriesTask mAllDirectoriesTask;
     private ArrayList<DirectoryOption> mDirectoryOptions;
     private String mExternalStorageDirectory;
-    private ArrayList<Callback<ArrayList<DirectoryOption>>> mCallbacks = new ArrayList<>();
+    private ArrayList < Callback < ArrayList<DirectoryOption>>> mCallbacks = new ArrayList<>();
 
     protected DownloadDirectoryProvider() {
         registerSDCardReceiver();

chrome/browser/download/android/BUILD.gn

@@ -5,14 +5,10 @@
 import("//build/config/android/rules.gni")
 
 android_library("java") {
-  java_files = [
-    "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_files =
+      [ "java/src/org/chromium/chrome/browser/download/DownloadFilter.java" ]
 
   deps = [
     "//base:base_java",
-    "//content/public/android:content_java",
   ]
 }

chrome/browser/download/android/DEPS

 include_rules = [
   "+media/video",
-  "+content/public/android/java/src/org/chromium/content_public",
 ]