Autofill Assistant dependencies are now deps instead of classpath_deps.

Bug: 951489
Change-Id: I6959c83313aef83976910a56e7c198bcb98d50ea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1613077
Commit-Queue: Jordan Demeulenaere <jdemeulenaere@chromium.org>
Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Auto-Submit: Jordan Demeulenaere <jdemeulenaere@chromium.org>
Cr-Commit-Position: refs/heads/master@{#660769}

chrome/android/features/autofill_assistant/BUILD.gn

@@ -37,9 +37,9 @@ android_library("java") {
   classpath_deps = [
     "//base:base_java",
     "//chrome/android:chrome_java",
+    "//components/policy/android:policy_java",
     "//components/signin/core/browser/android:java",
     "//components/url_formatter/android:url_formatter_java",
-    "//components/policy/android:policy_java",
     "//content/public/android:content_java",
     "//mojo/public/java:bindings_java",
     "//third_party/android_deps:android_arch_lifecycle_common_java",
@@ -57,11 +57,9 @@ android_library("java") {
   ]
 
   if (enable_chrome_android_internal) {
-    # TODO(crbug/951489): Change below to 'deps' once crbug/951489 is fixed.
-    classpath_deps +=
-        [ "//clank/features/autofill_assistant:animated_poodle_java" ]
+    deps += [ "//clank/features/autofill_assistant:animated_poodle_java" ]
   } else {
-    classpath_deps += [ ":animated_poodle_java" ]
+    deps += [ ":animated_poodle_java" ]
   }
 
   java_files = [

chrome/android/features/autofill_assistant/autofill_assistant_module_tmpl.gni

@@ -31,7 +31,6 @@ template("autofill_assistant_module_tmpl") {
     package_name = "autofill_assistant"
     package_name_to_id_mapping = resource_packages_id_mapping
     deps = [
-      "//chrome/android/features/autofill_assistant:animated_poodle_java",
       "//chrome/android/features/autofill_assistant:java",
     ]
   }