Modify Build.gn files to reduce the file changes in the androidx update.

See https://chromium-review.googlesource.com/c/chromium/src/+/1830506

-Update build.gn dependencies for androidx update.
-Change an import for androidx annotations that should have been
when all other annotation imports were migrated to androidx.

Bug: 896775
Change-Id: Ie22118da7841fac029aee37a5c1d10b78325b87e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036407Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@google.com>
Cr-Commit-Position: refs/heads/master@{#738426}

base/BUILD.gn

@@ -3229,6 +3229,8 @@ if (is_android) {
       "//third_party/android_deps:androidx_annotation_annotation_java",
       "//third_party/android_deps:com_android_support_collections_java",
       "//third_party/android_deps:com_android_support_multidex_java",
+      "//third_party/android_deps:com_android_support_support_annotations_java",
+      "//third_party/android_deps:com_android_support_support_compat_java",
       "//third_party/jsr-305:jsr_305_javalib",
     ]
 
@@ -3393,6 +3395,8 @@ if (is_android) {
       ":base_java_test_support",
       ":jni_java",
       "//base/test:test_support_java",
+      "//third_party/android_deps:androidx_test_monitor_java",
+      "//third_party/android_deps:androidx_test_uiautomator_uiautomator_java",
       "//third_party/android_support_test_runner:runner_java",
       "//third_party/hamcrest:hamcrest_java",
       "//third_party/junit:junit",
@@ -3446,6 +3450,9 @@ if (is_android) {
       ":jni_java",
       "//testing/android/reporter:reporter_java",
       "//third_party/android_deps:androidx_annotation_annotation_java",
+      "//third_party/android_deps:androidx_test_monitor_java",
+      "//third_party/android_deps:androidx_test_runner_java",
+      "//third_party/android_deps:androidx_test_uiautomator_uiautomator_java",
       "//third_party/android_deps:com_android_support_support_compat_java",
       "//third_party/android_sdk:android_support_chromium_java",
       "//third_party/android_sdk:android_test_base_java",
@@ -3555,6 +3562,8 @@ if (is_android) {
     deps = [
       ":base_java",
       "//testing/android/junit:junit_test_support",
+      "//third_party/android_deps:androidx_test_monitor_java",
+      "//third_party/android_deps:androidx_test_uiautomator_uiautomator_java",
       "//third_party/android_support_test_runner:runner_java",
       "//third_party/hamcrest:hamcrest_java",
       "//third_party/junit:junit",

chrome/test/android/BUILD.gn

@@ -43,6 +43,8 @@ android_library("chrome_java_test_pagecontroller") {
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
     "//chrome/browser/ui/android/appmenu:test_support_java",
+    "//third_party/android_deps:androidx_test_uiautomator_uiautomator_java",
+    "//third_party/android_deps:com_android_support_drawerlayout_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/guava:guava_android_java",
     "//third_party/junit",
@@ -208,9 +210,12 @@ android_library("chrome_java_test_support") {
     "//third_party/android_deps:android_arch_lifecycle_common_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:com_android_support_appcompat_v7_java",
     "//third_party/android_deps:com_android_support_design_java",
     "//third_party/android_deps:com_android_support_recyclerview_v7_java",
     "//third_party/android_deps:com_android_support_support_compat_java",
+    "//third_party/android_deps:com_android_support_support_fragment_java",
+    "//third_party/android_deps:com_android_support_support_v4_java",
     "//third_party/android_sdk:android_test_base_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",

components/invalidation/impl/BUILD.gn

@@ -272,6 +272,7 @@ if (is_android) {
       "//base:base_java_test_support",
       "//components/signin/core/browser/android:java",
       "//components/sync/android:sync_java",
+      "//third_party/android_deps:androidx_test_monitor_java",
       "//third_party/android_sdk:android_test_base_java",
       "//third_party/android_sdk:android_test_runner_java",
       "//third_party/android_support_test_runner:runner_java",

components/signin/core/browser/android/BUILD.gn

@@ -74,6 +74,7 @@ android_library("signin_javatests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_test_monitor_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/jsr-305:jsr_305_javalib",

net/android/BUILD.gn

@@ -76,6 +76,8 @@ android_library("net_java_test_support") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_test_monitor_java",
+    "//third_party/android_deps:androidx_test_uiautomator_uiautomator_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit",

weblayer/public/java/BUILD.gn

@@ -66,7 +66,9 @@ android_library("java") {
     ":client_resources",
     ":client_version",
     ":weblayer_client_manifest",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:android_arch_lifecycle_common_java",
+    "//third_party/android_deps:android_arch_lifecycle_viewmodel_java",
+    "//third_party/android_deps:com_android_support_support_annotations_java",
     "//third_party/android_deps:com_android_support_support_compat_java",
     "//third_party/android_deps:com_android_support_support_fragment_java",
     "//weblayer/browser/java:interfaces_java",