Add deps to base module for DFMs which depend on base

This was causing failures of the bundle smoke tests with debug builds. I
think R8 was fixing this for us on release builds.

Bug: 1147248
Change-Id: I9490f26f069becea5a8a6662b614c62cf23c16fa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2533307
Auto-Submit: Clark DuVall <cduvall@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826611}

chrome/android/BUILD.gn

@@ -632,11 +632,9 @@ java_group("chrome_all_java") {
   deps = [
     ":chrome_java",
     "//chrome/android/features/keyboard_accessory:internal_java",
-    "//chrome/android/modules/extra_icu/provider:java",
     "//chrome/browser/download/internal/android:java",
     "//chrome/browser/password_check:internal_java",
     "//chrome/browser/tabmodel/internal:java",
-    "//chrome/browser/test_dummy/internal:base_module_java",
     "//chrome/browser/touch_to_fill/android/internal:java",
     "//chrome/browser/ui/android/appmenu/internal:java",
     "//chrome/browser/video_tutorials/internal:java",
@@ -654,10 +652,6 @@ java_group("chrome_all_java") {
       "//chrome/android/features/tab_ui:module_desc_java",
     ]
   }
-
-  if (dfmify_dev_ui) {
-    deps += [ "//chrome/android/modules/dev_ui/provider:java" ]
-  }
 }
 
 # This is a list of all base module jni headers. New features should add their
@@ -2155,7 +2149,9 @@ android_library("base_module_java") {
     "//content/public/android:content_java",
 
     # Deps for DFMs.
+    "//chrome/android/modules/extra_icu/provider:java",
     "//chrome/android/modules/stack_unwinder/provider:java",
+    "//chrome/browser/test_dummy/internal:base_module_java",
 
     # Deps to pull services into base module.
     # TODO(crbug.com/1126301): Consider moving these to the chrome module to
@@ -2165,6 +2161,12 @@ android_library("base_module_java") {
     "//components/payments/content/android:service_java",
     "//third_party/android_sdk/androidx_browser:androidx_browser_java",
   ]
+
+  # More deps for DFMs.
+  if (dfmify_dev_ui) {
+    deps += [ "//chrome/android/modules/dev_ui/provider:java" ]
+  }
+
   srcjar_deps = [ ":chrome_product_config" ]
 
   # Add the actual implementation where necessary so that downstream targets