android_deps: undo manual changes to build.gn file.

These changes were manually added into build.gn file for androidx
migration. They are no longer needed now that the import calls have
moved over.

Bug: 1067050,1067070
Change-Id: Ia7cd36bf52b39444a2dec6bdc065e41b187a2c1c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2160011Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@chromium.org>
Cr-Commit-Position: refs/heads/master@{#762093}

android_webview/nonembedded/BUILD.gn

@@ -57,7 +57,7 @@ android_library("devui_java") {
     "//base:base_java",
     "//components/minidump_uploader:minidump_uploader_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_android_support_support_fragment_java",
+    "//third_party/android_deps:androidx_fragment_fragment_java",
     "//ui/android:ui_java",
   ]
   android_manifest_for_lint = system_webview_android_manifest

chrome/android/BUILD.gn

@@ -421,11 +421,11 @@ android_library("chrome_java") {
     # ClearBrowsingDataTabsFramgent.java is converted to AndroidX.
     "//third_party/android_deps:androidx_core_core_java",
     "//third_party/android_deps:androidx_gridlayout_gridlayout_java",
+    "//third_party/android_deps:androidx_interpolator_interpolator_java",
     "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
     "//third_party/android_deps:androidx_preference_preference_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:androidx_viewpager_viewpager_java",
-    "//third_party/android_deps:com_android_support_interpolator_java",
     "//third_party/android_deps:com_google_android_material_material_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_deps:com_google_dagger_dagger_java",

chrome/android/feed/feed_java_sources.gni

@@ -12,9 +12,9 @@ if (enable_feed_in_chrome) {
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_cardview_cardview_java",
     "//third_party/android_deps:androidx_collection_collection_java",
+    "//third_party/android_deps:androidx_interpolator_interpolator_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:androidx_swiperefreshlayout_swiperefreshlayout_java",
-    "//third_party/android_deps:com_android_support_interpolator_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/android_deps:javax_inject_javax_inject_java",

chrome/browser/android/examples/custom_tabs_client/src/java/org/chromium/customtabsclient/MainActivity.java

@@ -18,7 +18,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
@@ -33,6 +32,7 @@ import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.browser.customtabs.CustomTabsCallback;
 import androidx.browser.customtabs.CustomTabsClient;
 import androidx.browser.customtabs.CustomTabsIntent;

chrome/test/android/BUILD.gn

@@ -44,8 +44,8 @@ android_library("chrome_java_test_pagecontroller") {
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
     "//chrome/browser/ui/android/appmenu/test:test_support_java",
+    "//third_party/android_deps:androidx_drawerlayout_drawerlayout_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",
@@ -236,11 +236,11 @@ android_library("chrome_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_core_core_java",
+    "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_deps:androidx_legacy_legacy_support_v4_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:com_android_support_appcompat_v7_java",
-    "//third_party/android_deps:com_android_support_support_fragment_java",
     "//third_party/android_deps:com_google_android_material_material_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_sdk:android_test_base_java",

components/browser_ui/widget/android/BUILD.gn

@@ -98,8 +98,8 @@ android_library("java") {
     "//components/embedder_support/android:util_java",
     "//third_party/android_deps:android_support_v4_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_interpolator_interpolator_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
-    "//third_party/android_deps:com_android_support_interpolator_java",
     "//ui/android:ui_java",
     "//url:gurl_java",
   ]

remoting/android/client_java_tmpl.gni

@@ -89,8 +89,8 @@ template("remoting_android_client_java_tmpl") {
       "//remoting/proto/remoting/v1:directory_proto_java",
       "//third_party/android_deps:android_support_v7_appcompat_java",
       "//third_party/android_deps:androidx_annotation_annotation_java",
+      "//third_party/android_deps:androidx_drawerlayout_drawerlayout_java",
       "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
-      "//third_party/android_deps:com_android_support_drawerlayout_java",
       "//third_party/android_deps:com_android_support_mediarouter_v7_java",
       "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
       "//ui/android:ui_utils_java",

third_party/android_swipe_refresh/BUILD.gn

@@ -15,7 +15,7 @@ android_library("android_swipe_refresh_java") {
   ]
   deps = [
     "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_android_support_interpolator_java",
-    "//third_party/android_deps:com_android_support_support_core_ui_java",
+    "//third_party/android_deps:androidx_interpolator_interpolator_java",
+    "//third_party/android_deps:androidx_legacy_legacy_support_core_ui_java",
   ]
 }

third_party/robolectric/BUILD.gn

@@ -1114,7 +1114,7 @@ java_library("shadows_multidex_java") {
     ":robolectric_shadowapi_java",
     ":robolectric_utils_java",
     ":shadows_core_java",
-    "//third_party/android_deps:com_android_support_multidex_java_orig",
+    "//third_party/android_deps:com_android_support_multidex_java",
     "//third_party/android_deps:com_google_code_gson_gson_java",
     "//third_party/android_deps:com_google_guava_guava_java",
   ]
@@ -1167,6 +1167,7 @@ java_library("shadows_play_services_java") {
     "$google_play_services_package:google_play_services_basement_java",
     "//third_party/android_deps:android_support_v4_java",
     "//third_party/android_deps:com_android_support_support_annotations_java",
+    "//third_party/android_deps:com_android_support_support_fragment_java",
     "//third_party/android_deps:com_google_code_gson_gson_java",
     "//third_party/android_deps:com_google_guava_guava_java",
   ]

weblayer/browser/android/javatests/BUILD.gn

@@ -45,7 +45,7 @@ android_library("weblayer_java_tests") {
     "//net/android:net_java_test_support",
     "//third_party/android_deps:android_support_v4_java",
     "//third_party/android_deps:androidx_core_core_java",
-    "//third_party/android_deps:com_android_support_support_fragment_java",
+    "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit:junit",
@@ -70,7 +70,7 @@ android_library("weblayer_private_java_tests") {
     "//base:base_java_test_support",
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java_test_support",
-    "//third_party/android_deps:com_android_support_support_fragment_java",
+    "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit:junit",

weblayer/public/java/BUILD.gn

@@ -74,11 +74,11 @@ android_library("java") {
     ":client_resources",
     ":client_version",
     ":weblayer_client_manifest",
-    "//third_party/android_deps:android_arch_lifecycle_common_java",
-    "//third_party/android_deps:android_arch_lifecycle_viewmodel_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_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",
   ]