Android: Add direct deps for chrome/browser

Remove //{clank,chrome/browser}* from allowlist now that clank has
rolled.

Bug: 1082904
Change-Id: I7d5f1694ffa3571579a6723b1f5b84f62eba9899
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2307730
Commit-Queue: Peter Wen <wnwen@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790069}

build/config/android/internal_rules.gni

@@ -3067,8 +3067,6 @@ if (enable_java_templates) {
           filter_exclude(
               [ get_label_info(":$target_name", "label_no_toolchain") ],
               [
-                "//chrome/browser*",
-                "//clank*",
                 "//components*",
 
                 # This is due to the "special group" bypass.

chrome/browser/android/crypto/BUILD.gn

@@ -8,6 +8,7 @@ android_library("java") {
   deps = [
     "//base:base_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
   sources = [
     "java/src/org/chromium/chrome/browser/crypto/ByteArrayGenerator.java",

chrome/browser/android/crypto/java/src/org/chromium/chrome/browser/crypto/CipherFactory.java

@@ -7,6 +7,8 @@ package org.chromium.chrome.browser.crypto;
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 
+import androidx.annotation.AnyThread;
+
 import org.chromium.base.Log;
 import org.chromium.base.ObserverList;
 import org.chromium.base.SecureRandomInitializer;
@@ -23,7 +25,6 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
 
-import javax.annotation.concurrent.ThreadSafe;
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
 import javax.crypto.spec.IvParameterSpec;
@@ -49,7 +50,7 @@ import javax.crypto.spec.SecretKeySpec;
  * Explicitly ending the session destroys the {@link Bundle}, making the previous session's data
  * unreadable.
  */
-@ThreadSafe
+@AnyThread
 public class CipherFactory {
     private static final String TAG = "CipherFactory";
     static final int NUM_BYTES = 16;

chrome/browser/android/thin_webview/BUILD.gn

@@ -21,6 +21,7 @@ android_library("java") {
     "//base:base_java",
     "//components/embedder_support/android:web_contents_delegate_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_java",
   ]
 }

chrome/browser/android/thin_webview/internal/BUILD.gn

@@ -42,6 +42,7 @@ android_library("internal_java") {
     "//chrome/browser/android/thin_webview:java",
     "//components/embedder_support/android:web_contents_delegate_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]

chrome/browser/browser_controls/android/BUILD.gn

@@ -19,6 +19,7 @@ android_library("java") {
     "//chrome/browser/flags:java",
     "//components/browser_ui/util/android:java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_java",
   ]
 }

chrome/browser/contextmenu/BUILD.gn

@@ -19,5 +19,6 @@ android_library("java") {
     "//base:base_java",
     "//components/embedder_support/android:context_menu_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
 }

chrome/browser/download/android/BUILD.gn

@@ -69,6 +69,7 @@ android_library("java") {
     "//components/prefs/android:java",
     "//components/user_prefs/android:java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_core_core_java",
     "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_deps:androidx_preference_preference_java",
@@ -83,7 +84,14 @@ android_library("java") {
 
 android_library_factory("factory_java") {
   # These deps will be inherited by the resulting android_library target.
-  deps = [ ":java" ]
+  deps = [
+    ":java",
+    "//base:base_java",
+    "//chrome/browser/ui/messages/android:java",
+    "//components/feature_engagement:feature_engagement_java",
+    "//components/offline_items_collection/core:core_java",
+    "//ui/android:ui_java",
+  ]
 
   # This internal file will be replaced by a generated file so the resulting
   # android_library target does not actually depend on this internal file.
@@ -114,9 +122,11 @@ android_library("download_java_tests") {
     ":java",
     "//base:base_java",
     "//base:base_java_test_support",
+    "//chrome/browser/flags:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/browser_ui/util/android:java",
     "//components/offline_items_collection/core:core_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",

chrome/browser/engagement/android/BUILD.gn

@@ -22,9 +22,11 @@ android_library("javatests") {
     ":java",
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
+    "//chrome/browser/flags:java",
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/tab:java",
     "//chrome/test/android:chrome_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/junit:junit",
   ]
 }

chrome/browser/flags/BUILD.gn

@@ -18,6 +18,7 @@ android_library("java") {
     "//base:base_java",
     "//base:jni_java",
     "//chrome/browser/preferences:java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
   srcjar_deps = [ ":chrome_android_java_switches_srcjar" ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -64,6 +65,7 @@ java_library("flags_junit_tests") {
     "//base:base_junit_test_support",
     "//base/test:test_support_java",
     "//chrome/test/android:chrome_java_test_support",
+    "//third_party/android_deps:robolectric_all_java",
     "//third_party/junit",
   ]
 }
@@ -81,6 +83,7 @@ android_library("javatests") {
     "//base/test:test_support_java",
     "//chrome/android:chrome_java",
     "//chrome/test/android:chrome_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_sdk:android_test_mock_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit",

chrome/browser/image_fetcher/BUILD.gn

@@ -12,6 +12,7 @@ android_library("java") {
     "//chrome/browser/util:java",
     "//components/browser_ui/util/android:java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/gif_player:gif_player_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]

chrome/browser/offline_pages/android/BUILD.gn

@@ -8,6 +8,7 @@ android_library("java") {
   sources = [ "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchConfiguration.java" ]
 
   deps = [
+    "//base:base_java",
     "//base:jni_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/profiles/android:java",

chrome/browser/optimization_guide/android/BUILD.gn

@@ -40,6 +40,7 @@ android_library("native_java_unittests") {
 
   deps = [
     ":java",
+    "//base:base_java",
     "//components/optimization_guide/proto:optimization_guide_proto_java",
     "//content/public/android:content_java",
     "//third_party/junit",
@@ -62,6 +63,7 @@ java_library("junit_tests") {
     "//chrome/android:chrome_test_util_java",
     "//components/optimization_guide/proto:optimization_guide_proto_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:robolectric_all_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",
   ]

chrome/browser/paint_preview/android/BUILD.gn

@@ -37,6 +37,7 @@ android_library("java") {
     "//components/paint_preview/browser/android:java",
     "//components/paint_preview/player/android:java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_java",
     "//url:gurl_java",
   ]

chrome/browser/password_check/android/BUILD.gn

@@ -30,6 +30,7 @@ android_library("public_java") {
     "//base:base_java",
     "//components/browser_ui/settings/android:java",
     "//components/browser_ui/widget/android:java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_deps:androidx_preference_preference_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
@@ -75,12 +76,15 @@ android_library("test_java") {
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_java",
     "//chrome/android:chrome_test_util_java",
+    "//chrome/browser/flags:java",
     "//chrome/browser/password_check/android/internal:internal_java",
     "//chrome/browser/settings:test_support_java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/embedder_support/android:util_java",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",

chrome/browser/password_check/android/internal/BUILD.gn

@@ -47,6 +47,7 @@ android_library("internal_ui_factory_java") {
 android_library("internal_java") {
   deps = [
     ":java_resources",
+    "//base:base_java",
     "//base:jni_java",
     "//chrome/android:chrome_app_java_resources",
     "//chrome/android:chrome_java",
@@ -55,6 +56,7 @@ android_library("internal_java") {
     "//chrome/browser/settings:java",
     "//chrome/browser/ui/android/strings:ui_strings_grd",
     "//components/embedder_support/android:util_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_deps:androidx_preference_preference_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",

chrome/browser/password_manager/android_test_helpers/BUILD.gn

@@ -24,9 +24,11 @@ android_library("test_support_java") {
   testonly = true
   sources = [ "javatests/src/org/chromium/chrome/browser/password_manager/PasswordManagerClientBridgeForTesting.java" ]
   deps = [
+    "//base:base_java",
     "//base:base_jni_headers",
     "//base:jni_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }

chrome/browser/performance_hints/android/BUILD.gn

@@ -15,6 +15,7 @@ android_library("java") {
     "//base:base_java",
     "//base:jni_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
 
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]

chrome/browser/preferences/BUILD.gn

@@ -19,6 +19,7 @@ android_library("java") {
   deps = [
     "//base:base_java",
     "//base:jni_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   srcjar_deps = [ ":java_pref_names_srcjar" ]
@@ -66,6 +67,7 @@ java_library("preferences_junit_tests") {
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
     "//base/test:test_support_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/junit:junit",
     "//third_party/mockito:mockito_java",
   ]

chrome/browser/profiles/android/BUILD.gn

@@ -14,6 +14,7 @@ android_library("java") {
     "//chrome/browser/preferences:java",
     "//components/embedder_support/android:browser_context_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   sources = [

chrome/browser/safe_browsing/android/BUILD.gn

@@ -31,6 +31,7 @@ android_library("java") {
     "//chrome/browser/flags:java",
     "//components/browser_ui/settings/android:java",
     "//components/browser_ui/widget/android:java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_deps:androidx_preference_preference_java",
     "//ui/android:ui_full_java",
@@ -44,10 +45,13 @@ android_library("javatests") {
   sources = [ "javatests/src/org/chromium/chrome/browser/safe_browsing/settings/SecuritySettingsFragmentTest.java" ]
   deps = [
     ":java",
+    "//base:base_java_test_support",
+    "//chrome/browser/flags:java",
     "//chrome/browser/settings:test_support_java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/browser_ui/widget/android:java",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/junit",
   ]
 }

chrome/browser/safety_check/android/BUILD.gn

@@ -40,6 +40,7 @@ android_library("java") {
     "//chrome/browser/preferences:java",
     "//components/browser_ui/settings/android:java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java8_java",
@@ -67,6 +68,7 @@ android_library("javatests") {
     "//chrome/test/android:chrome_java_test_support",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:androidx_preference_preference_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit:junit",
     "//third_party/mockito:mockito_java",

chrome/browser/settings/BUILD.gn

@@ -15,6 +15,8 @@ android_library("java") {
     "//components/browser_ui/settings/android:java",
     "//components/prefs/android:java",
     "//components/user_prefs/android:java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_fragment_fragment_java",
   ]
 }
 
@@ -37,6 +39,7 @@ android_library("javatests") {
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_preference_preference_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:espresso_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",

chrome/browser/subresource_filter/BUILD.gn

@@ -25,6 +25,7 @@ if (is_android) {
       "//base:base_java_test_support",
       "//chrome/android:chrome_java",
       "//chrome/android:chrome_test_java",
+      "//chrome/browser/flags:java",
       "//chrome/browser/tab:java",
       "//chrome/browser/tabmodel:java",
       "//chrome/browser/ui/messages/android:java",
@@ -33,6 +34,7 @@ if (is_android) {
       "//components/safe_browsing/android:safe_browsing_java",
       "//content/public/test/android:content_java_test_support",
       "//net/android:net_java_test_support",
+      "//third_party/android_deps:androidx_test_runner_java",
       "//third_party/android_support_test_runner:rules_java",
       "//third_party/android_support_test_runner:runner_java",
       "//third_party/junit",

chrome/browser/tab/BUILD.gn

@@ -54,9 +54,13 @@ android_library("java") {
     "//components/find_in_page/android:java",
     "//components/navigation_interception/android:navigation_interception_java",
     "//content/public/android:content_java",
+    "//net/android:net_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_core_core_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//ui/android:ui_full_java",
+    "//url:gurl_java",
+    "//url:origin_java",
   ]
 
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]

chrome/browser/tabmodel/BUILD.gn

@@ -29,5 +29,6 @@ android_library("java") {
     "//chrome/browser/tab:java",
     "//components/embedder_support/android:util_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
 }

chrome/browser/tabpersistence/BUILD.gn

@@ -8,6 +8,7 @@ android_library("java") {
   sources = [ "android/java/src/org/chromium/chrome/browser/tabpersistence/TabStateDirectory.java" ]
   deps = [
     "//base:base_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_core_core_java",
   ]
 }

chrome/browser/thumbnail/generator/BUILD.gn

@@ -121,6 +121,8 @@ if (is_android) {
       "//content/public/android:content_java",
       "//content/public/test/android:content_java_test_support",
       "//third_party/android_deps:android_support_v4_java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
+      "//third_party/android_deps:androidx_test_runner_java",
       "//third_party/android_support_test_runner:runner_java",
       "//third_party/hamcrest:hamcrest_java",
       "//third_party/junit",

chrome/browser/touch_to_fill/android/BUILD.gn

@@ -27,7 +27,9 @@ generate_jni("jni_headers") {
 
 android_library("public_java") {
   deps = [
+    "//base:base_java",
     "//components/browser_ui/android/bottomsheet:java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_java",
   ]
 
@@ -48,6 +50,7 @@ junit_binary("touch_to_fill_junit_tests") {
     "//base:base_junit_test_support",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_util_java",
+    "//chrome/browser/flags:java",
     "//chrome/browser/touch_to_fill/android:public_java",
     "//chrome/browser/touch_to_fill/android/internal:java",
     "//chrome/browser/ui/android/favicon:java",
@@ -55,6 +58,7 @@ junit_binary("touch_to_fill_junit_tests") {
     "//components/browser_ui/android/bottomsheet:java",
     "//components/module_installer/android:module_installer_java",
     "//components/url_formatter/android:url_formatter_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",
@@ -77,12 +81,14 @@ android_library("test_java") {
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_java",
     "//chrome/android:chrome_test_util_java",
+    "//chrome/browser/flags:java",
     "//chrome/browser/touch_to_fill/android/internal:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/browser_ui/android/bottomsheet:java",
     "//components/browser_ui/android/bottomsheet/test:java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:espresso_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit",

chrome/browser/touch_to_fill/android/internal/BUILD.gn

@@ -20,6 +20,7 @@ android_library("java") {
     "//components/browser_ui/android/bottomsheet:java",
     "//components/embedder_support/android:util_java",
     "//components/url_formatter/android:url_formatter_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//ui/android:ui_java",
   ]

chrome/browser/ui/android/appmenu/BUILD.gn

@@ -17,12 +17,18 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/ui/appmenu/CustomViewBinder.java",
     "java/src/org/chromium/chrome/browser/ui/appmenu/MenuButtonDelegate.java",
   ]
-  deps = [ "//chrome/browser/android/lifecycle:java" ]
+  deps = [
+    "//chrome/browser/android/lifecycle:java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+  ]
 }
 
 android_library_factory("factory_java") {
   # These deps will be inherited by the resulting android_library target.
-  deps = [ ":java" ]
+  deps = [
+    ":java",
+    "//chrome/browser/android/lifecycle:java",
+  ]
 
   # This internal file will be replaced by a generated file so the resulting
   # android_library target does not actually depend on this internal file.

chrome/browser/ui/android/appmenu/internal/BUILD.gn

@@ -26,6 +26,7 @@ android_library("java") {
     ":java_resources",
     "//base:base_java",
     "//chrome/browser/android/lifecycle:java",
+    "//chrome/browser/flags:java",
     "//chrome/browser/ui/android/appmenu:java",
     "//components/browser_ui/widget/android:java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
@@ -69,13 +70,16 @@ android_library("javatests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//chrome/browser/android/lifecycle:java",
+    "//chrome/browser/flags:java",
     "//chrome/browser/ui/android/appmenu:java",
     "//chrome/browser/ui/android/appmenu/test:test_support_java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/browser_ui/widget/android:test_support_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit",

chrome/browser/ui/android/appmenu/test/BUILD.gn

@@ -12,6 +12,7 @@ android_library("test_support_java") {
     "java/src/org/chromium/chrome/browser/ui/appmenu/TestAppMenuObserver.java",
   ]
   deps = [
+    "//base:base_java",
     "//base:base_java_test_support",
     "//chrome/browser/ui/android/appmenu:java",
     "//chrome/browser/ui/android/appmenu/internal:java",

chrome/browser/ui/android/default_browser_promo/BUILD.gn

@@ -19,6 +19,7 @@ android_library("java") {
     "//chrome/browser/preferences:java",
     "//chrome/browser/profiles/android:java",
     "//components/browser_ui/widget/android:java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_full_java",
   ]
 }
@@ -68,6 +69,7 @@ android_library("javatests") {
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_preference_preference_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:espresso_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",

chrome/browser/ui/android/favicon/BUILD.gn

@@ -21,6 +21,8 @@ android_library("java") {
     "//components/embedder_support/android:util_java",
     "//components/url_formatter/android:url_formatter_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_core_core_java",
     "//ui/android:ui_java",
     "//url:gurl_java",
   ]

chrome/browser/ui/messages/android/BUILD.gn

@@ -41,6 +41,7 @@ android_library("java") {
     "//components/infobars/android:infobar_android_enums_java",
     "//components/infobars/android:java",
     "//components/infobars/core:infobar_enums_java",
+    "//content/public/android:content_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
@@ -83,6 +84,7 @@ android_library("javatests") {
     "//chrome/test/android:chrome_java_test_support",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit",

chrome/browser/util/BUILD.gn

@@ -22,6 +22,7 @@ android_library("java") {
     "//components/browser_ui/util/android:java",
     "//components/embedder_support/android:util_java",
     "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_collection_collection_java",
     "//third_party/android_deps:androidx_core_core_java",
     "//third_party/android_deps:androidx_legacy_legacy_support_core_utils_java",
@@ -51,6 +52,7 @@ android_library("javatests") {
     "//chrome/test/android:chrome_java_test_support",
     "//components/signin/core/browser/android:java",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_sdk:android_test_mock_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit",