Revert "Split out minimal target for PaymentDetailsUpdateService"

This reverts commit 022292aa.

Reason for revert: Breaking clank builds: https://ci.chromium.org/p/chrome/builders/ci/android-builder-perf/230952

Original change's description:
> Split out minimal target for PaymentDetailsUpdateService
>
> We are investigated using isolated splits for Chrome, and splitting
> //chrome code into a DFM. Due to b/169196314, all service classes must
> be present in the base module. See go/isolated-splits-clank for more
> details.
>
> This change creates a new minimal target for PaymentDetailsUpdateService
> which the base module will depend on.
>
> Bug: 1126301
> Change-Id: Ib4396073bbc4254c0400bccec1f4acac3ba88ad8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2459508
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Danyao Wang <danyao@chromium.org>
> Commit-Queue: Clark DuVall <cduvall@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#815649}

TBR=agrieve@chromium.org,danyao@chromium.org,maxlg@chromium.org,cduvall@chromium.org

Change-Id: I8eea37376fcbd13b78774cf4c4fb2480c309d150
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1126301
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2463803Reviewed-by: Clark DuVall <cduvall@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815680}

chrome/android/BUILD.gn

@@ -430,7 +430,6 @@ android_library("chrome_java") {
     "//components/paint_preview/player/android:java",
     "//components/password_manager/core/browser:password_manager_java_enums",
     "//components/payments/content/android:java",
-    "//components/payments/content/android:service_java",
     "//components/payments/mojom:mojom_java",
     "//components/permissions/android:java",
     "//components/policy/android:policy_java",
@@ -949,7 +948,6 @@ android_library("chrome_test_util_java") {
     "//chrome/browser/ui/android/appmenu:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/payments/content/android:java",
-    "//components/payments/content/android:service_java",
     "//components/payments/mojom:mojom_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
@@ -1123,7 +1121,6 @@ android_library("chrome_test_java") {
     "//components/paint_preview/player/android:javatests",
     "//components/password_manager/core/browser:password_manager_java_enums",
     "//components/payments/content/android:java",
-    "//components/payments/content/android:service_java",
     "//components/payments/mojom:mojom_java",
     "//components/permissions/android:java",
     "//components/policy/android:policy_java",
@@ -2127,7 +2124,6 @@ android_library("base_module_java") {
     # reduce base dex size.
     "$google_play_services_package:google_play_services_cast_framework_java",
     "//components/background_task_scheduler:background_task_scheduler_java",
-    "//components/payments/content/android:service_java",
     "//third_party/android_sdk/androidx_browser:androidx_browser_java",
   ]
   srcjar_deps = [ ":chrome_product_config" ]

components/payments/content/android/BUILD.gn

@@ -73,38 +73,10 @@ android_resources("java_resources") {
   sources = payments_java_resources
 }
 
-# Minimal target to depend on PaymentDetailsUpdateService. This should be kept
-# as small as possible, as it will always be included in chrome's base module.
-android_library("service_java") {
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-  sources = [
-    "java/src/org/chromium/components/payments/Address.java",
-    "java/src/org/chromium/components/payments/PackageManagerDelegate.java",
-    "java/src/org/chromium/components/payments/PayerData.java",
-    "java/src/org/chromium/components/payments/PaymentAddressTypeConverter.java",
-    "java/src/org/chromium/components/payments/PaymentDetailsUpdateService.java",
-    "java/src/org/chromium/components/payments/PaymentDetailsUpdateServiceHelper.java",
-    "java/src/org/chromium/components/payments/PaymentFeatureList.java",
-    "java/src/org/chromium/components/payments/PaymentRequestUpdateEventListener.java",
-    "java/src/org/chromium/components/payments/intent/WebPaymentIntentHelper.java",
-    "java/src/org/chromium/components/payments/intent/WebPaymentIntentHelperType.java",
-  ]
-  deps = [
-    "//base:base_java",
-    "//base:jni_java",
-    "//components/payments/mojom:mojom_java",
-    "//content/public/android:content_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-  ]
-  srcjar_deps = [
-    ":error_strings_generated_srcjar",
-    ":payment_details_update_service_aidl",
-  ]
-}
-
 android_library("java") {
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   sources = [
+    "java/src/org/chromium/components/payments/Address.java",
     "java/src/org/chromium/components/payments/BasicCardUtils.java",
     "java/src/org/chromium/components/payments/BrowserPaymentRequest.java",
     "java/src/org/chromium/components/payments/CanMakePaymentQuery.java",
@@ -116,9 +88,15 @@ android_library("java") {
     "java/src/org/chromium/components/payments/MojoPaymentRequestGateKeeper.java",
     "java/src/org/chromium/components/payments/MojoStructCollection.java",
     "java/src/org/chromium/components/payments/OriginSecurityChecker.java",
+    "java/src/org/chromium/components/payments/PackageManagerDelegate.java",
+    "java/src/org/chromium/components/payments/PayerData.java",
+    "java/src/org/chromium/components/payments/PaymentAddressTypeConverter.java",
     "java/src/org/chromium/components/payments/PaymentApp.java",
     "java/src/org/chromium/components/payments/PaymentAppFactoryParams.java",
     "java/src/org/chromium/components/payments/PaymentDetailsConverter.java",
+    "java/src/org/chromium/components/payments/PaymentDetailsUpdateService.java",
+    "java/src/org/chromium/components/payments/PaymentDetailsUpdateServiceHelper.java",
+    "java/src/org/chromium/components/payments/PaymentFeatureList.java",
     "java/src/org/chromium/components/payments/PaymentHandlerHost.java",
     "java/src/org/chromium/components/payments/PaymentManifestDownloader.java",
     "java/src/org/chromium/components/payments/PaymentManifestParser.java",
@@ -127,6 +105,7 @@ android_library("java") {
     "java/src/org/chromium/components/payments/PaymentRequestLifecycleObserver.java",
     "java/src/org/chromium/components/payments/PaymentRequestParams.java",
     "java/src/org/chromium/components/payments/PaymentRequestSpec.java",
+    "java/src/org/chromium/components/payments/PaymentRequestUpdateEventListener.java",
     "java/src/org/chromium/components/payments/PaymentUIsObserver.java",
     "java/src/org/chromium/components/payments/PaymentValidator.java",
     "java/src/org/chromium/components/payments/SkipToGPayHelper.java",
@@ -135,11 +114,12 @@ android_library("java") {
     "java/src/org/chromium/components/payments/UrlUtil.java",
     "java/src/org/chromium/components/payments/WebAppManifestSection.java",
     "java/src/org/chromium/components/payments/intent/IsReadyToPayServiceHelper.java",
+    "java/src/org/chromium/components/payments/intent/WebPaymentIntentHelper.java",
+    "java/src/org/chromium/components/payments/intent/WebPaymentIntentHelperType.java",
     "java/src/org/chromium/components/payments/intent/WebPaymentIntentHelperTypeConverter.java",
   ]
   deps = [
     ":java_resources",
-    ":service_java",
     "//base:base_java",
     "//base:jni_java",
     "//components/autofill/android:autofill_java",
@@ -156,8 +136,10 @@ android_library("java") {
     "//url:origin_java",
   ]
   srcjar_deps = [
+    ":error_strings_generated_srcjar",
     ":method_strings_generated_srcjar",
     ":payment_app_type_generated_enum",
+    ":payment_details_update_service_aidl",
     ":payments_journey_logger_enum_javagen",
   ]
   resources_package = "org.chromium.components.payments"