Move Download res to //chrome/browser/download

Move Android resources from: //chrome/android/java/res_download
to: //chrome/browser/download/android/java/res.

Clean up the new android_resource target's deps to remove dependence
on all of chrome_app_java_resources.

Bug: 1047896
Change-Id: I0b6377840b2716c05832842dd938e93c513a7fa9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2033939Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738623}

chrome/android/BUILD.gn

@@ -184,10 +184,10 @@ if (enable_vr) {
   }
 }
 
+# TODO(chouinard): Remove this wrapper target after downstream dependencies on it are replaced.
 android_resources("chrome_download_java_resources") {
-  resource_dirs = [ "//chrome/android/java/res_download" ]
-  deps = [ ":chrome_app_java_resources" ]
-  custom_package = "org.chromium.chrome.download"
+  resource_dirs = []
+  deps = [ "//chrome/browser/download/android:java_resources" ]
 }
 
 android_library("app_hooks_java") {
@@ -223,7 +223,6 @@ android_library("chrome_java") {
   deps = [
     ":chrome_android_java_switches",
     ":chrome_app_java_resources",
-    ":chrome_download_java_resources",
     ":chrome_public_android_manifest",
     ":chrome_public_apk_template_resources",
     ":chrome_public_java",
@@ -256,6 +255,7 @@ android_library("chrome_java") {
     "//chrome/browser/android/thin_webview:factory_java",
     "//chrome/browser/android/thin_webview:java",
     "//chrome/browser/download/android:java",
+    "//chrome/browser/download/android:java_resources",
     "//chrome/browser/flags:java",
     "//chrome/browser/geolocation/android:java",
     "//chrome/browser/image_fetcher:java",

chrome/android/java/src/org/chromium/chrome/browser/download/home/DownloadManagerCoordinatorImpl.java

@@ -17,6 +17,7 @@ import org.chromium.base.DiscardableReferencePool;
 import org.chromium.base.ObserverList;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.base.supplier.ObservableSupplier;
+import org.chromium.chrome.R;
 import org.chromium.chrome.browser.download.home.filter.Filters;
 import org.chromium.chrome.browser.download.home.filter.Filters.FilterType;
 import org.chromium.chrome.browser.download.home.list.DateOrderedListCoordinator;
@@ -25,7 +26,6 @@ import org.chromium.chrome.browser.download.home.list.ListItem;
 import org.chromium.chrome.browser.download.home.snackbars.DeleteUndoCoordinator;
 import org.chromium.chrome.browser.download.home.toolbar.ToolbarCoordinator;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
-import org.chromium.chrome.download.R;
 import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate;
 import org.chromium.components.feature_engagement.Tracker;
 import org.chromium.components.offline_items_collection.OfflineContentProvider;

chrome/browser/download/android/BUILD.gn

@@ -59,3 +59,16 @@ android_library("download_java_tests") {
     "//third_party/mockito:mockito_java",
   ]
 }
+
+android_resources("java_resources") {
+  resource_dirs = [ "java/res" ]
+  deps = [
+    "//chrome/browser/ui/android/strings:ui_strings_grd",
+    "//components/browser_ui/modaldialog/android:java_resources",
+    "//components/browser_ui/strings/android:browser_ui_strings_grd",
+    "//components/browser_ui/styles/android:java_resources",
+    "//components/browser_ui/widget/android:java_resources",
+    "//ui/android:ui_java_resources",
+  ]
+  custom_package = "org.chromium.chrome.download"
+}