Migrate references to use androidx.collection.

Bug: 1052460
Change-Id: I9b9530362c4a17f78ee6f0907f15527c6fd4f99b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2078848Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@google.com>
Cr-Commit-Position: refs/heads/master@{#745689}

chrome/android/BUILD.gn

@@ -361,7 +361,7 @@ android_library("chrome_java") {
     "//third_party/android_deps:android_arch_lifecycle_runtime_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_collections_java",
+    "//third_party/android_deps:androidx_collection_collection_java",
     "//third_party/android_deps:com_android_support_coordinatorlayout_java",
     "//third_party/android_deps:com_android_support_customview_java",
     "//third_party/android_deps:com_android_support_design_java",
@@ -871,7 +871,7 @@ android_library("chrome_test_java") {
     "//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_collections_java",
+    "//third_party/android_deps:androidx_collection_collection_java",
     "//third_party/android_deps:com_android_support_design_java",
     "//third_party/android_deps:com_android_support_preference_v7_java",
     "//third_party/android_deps:com_android_support_recyclerview_v7_java",

chrome/android/features/autofill_assistant/BUILD.gn

@@ -50,7 +50,7 @@ android_library("java") {
     "//third_party/android_deps:android_arch_lifecycle_runtime_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_collections_java",
+    "//third_party/android_deps:androidx_collection_collection_java",
     "//third_party/android_deps:com_android_support_coordinatorlayout_java",
     "//third_party/android_deps:com_android_support_design_java",
     "//third_party/android_deps:com_android_support_gridlayout_v7_java",

chrome/android/features/media_router/BUILD.gn

@@ -19,7 +19,7 @@ android_library("java") {
     "//chrome/android:chrome_java",
     "//services/media_session/public/cpp/android:media_session_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:com_android_support_collections_java",
+    "//third_party/android_deps:androidx_collection_collection_java",
     "//third_party/android_deps:com_android_support_mediarouter_v7_java",
     "//third_party/android_deps:com_android_support_support_compat_java",
     "//third_party/android_media:android_media_java",

chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java

@@ -7,11 +7,11 @@ package org.chromium.chrome.browser.media.router.caf;
 import static org.chromium.chrome.browser.media.router.caf.CastUtils.isSameOrigin;
 
 import android.os.Handler;
-import android.support.v4.util.ArrayMap;
 import android.text.TextUtils;
 import android.util.SparseArray;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.collection.ArrayMap;
 
 import com.google.android.gms.cast.ApplicationMetadata;
 import com.google.android.gms.common.api.PendingResult;

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/common/intern/HashPoolInterner.java

@@ -4,9 +4,8 @@
 
 package org.chromium.chrome.browser.feed.library.common.intern;
 
-import android.support.v4.util.SparseArrayCompat;
-
 import androidx.annotation.Nullable;
+import androidx.collection.SparseArrayCompat;
 
 import java.lang.ref.WeakReference;
 

chrome/android/feed/feed_java_sources.gni

@@ -9,8 +9,8 @@ if (enable_feed_in_chrome) {
     "//base:base_java",
     "//components/feed/core/proto:proto_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_collection_collection_java",
     "//third_party/android_deps:com_android_support_cardview_v7_java",
-    "//third_party/android_deps:com_android_support_collections_java",
     "//third_party/android_deps:com_android_support_interpolator_java",
     "//third_party/android_deps:com_android_support_recyclerview_v7_java",
     "//third_party/android_deps:com_android_support_support_annotations_java",

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

@@ -6,11 +6,11 @@ package org.chromium.chrome.browser.payments;
 
 import android.content.Context;
 import android.os.Handler;
-import android.support.v4.util.ArrayMap;
 import android.text.TextUtils;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.collection.ArrayMap;
 
 import org.chromium.base.Callback;
 import org.chromium.base.Log;

chrome/android/java/src/org/chromium/chrome/browser/payments/SkipToGPayHelper.java

@@ -4,7 +4,7 @@
 
 package org.chromium.chrome.browser.payments;
 
-import android.support.v4.util.ArrayMap;
+import androidx.collection.ArrayMap;
 
 import org.json.JSONException;
 import org.json.JSONObject;

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataFragment.java

@@ -10,7 +10,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.v4.util.ArraySet;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceFragmentCompat;
 import android.view.LayoutInflater;
@@ -23,6 +22,7 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.collection.ArraySet;
 
 import org.chromium.base.CollectionUtil;
 import org.chromium.base.metrics.RecordHistogram;

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoUtil.java

@@ -6,10 +6,10 @@ package org.chromium.chrome.browser.signin;
 
 import android.accounts.Account;
 import android.app.Activity;
-import android.support.v4.util.ArraySet;
 import android.text.TextUtils;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.collection.ArraySet;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.supplier.Supplier;

chrome/android/java/src/org/chromium/chrome/browser/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java

@@ -11,11 +11,11 @@ import android.content.res.Resources;
 import android.graphics.Rect;
 import android.media.AudioManager;
 import android.os.Build;
-import android.support.v4.util.ArrayMap;
 import android.view.KeyEvent;
 import android.view.View;
 
 import androidx.annotation.Nullable;
+import androidx.collection.ArrayMap;
 
 import org.chromium.base.ActivityState;
 import org.chromium.base.ApplicationStatus;

chrome/android/javatests/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataFragmentTest.java

@@ -13,7 +13,6 @@ import static org.junit.Assert.assertTrue;
 import android.os.Build;
 import android.support.test.filters.LargeTest;
 import android.support.test.filters.MediumTest;
-import android.support.v4.util.ArraySet;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.preference.CheckBoxPreference;
 import android.support.v7.preference.Preference;
@@ -21,6 +20,8 @@ import android.support.v7.preference.PreferenceScreen;
 import android.widget.Button;
 import android.widget.ListView;
 
+import androidx.collection.ArraySet;
+
 import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Assert;

chrome/android/junit/src/org/chromium/chrome/browser/omnibox/suggestions/basic/BasicSuggestionProcessorTest.java

@@ -12,9 +12,9 @@ import static org.mockito.Mockito.verify;
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
-import android.support.v4.util.ArrayMap;
 
 import androidx.annotation.IntDef;
+import androidx.collection.ArrayMap;
 
 import org.junit.Assert;
 import org.junit.Before;

chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninPromoUtilTest.java

@@ -9,7 +9,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import android.support.v4.util.ArraySet;
+import androidx.collection.ArraySet;
 
 import com.google.common.collect.ImmutableSet;
 

chrome/browser/thumbnail/generator/BUILD.gn

@@ -60,7 +60,7 @@ if (is_android) {
       "//content/public/android:content_java",
       "//third_party/android_deps:android_support_v4_java",
       "//third_party/android_deps:androidx_annotation_annotation_java",
-      "//third_party/android_deps:com_android_support_collections_java",
+      "//third_party/android_deps:androidx_collection_collection_java",
       "//third_party/android_deps:com_google_protobuf_protobuf_lite_java",
     ]
 

chrome/browser/thumbnail/generator/android/java/src/org/chromium/chrome/browser/thumbnail/generator/ThumbnailProviderImpl.java

@@ -5,12 +5,12 @@
 package org.chromium.chrome.browser.thumbnail.generator;
 
 import android.graphics.Bitmap;
-import android.support.v4.util.LruCache;
 import android.text.TextUtils;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.collection.LruCache;
 
 import org.chromium.base.DiscardableReferencePool;
 import org.chromium.base.ThreadUtils;

chrome/browser/util/BUILD.gn

@@ -24,7 +24,7 @@ android_library("java") {
     "//base:jni_java",
     "//components/embedder_support/android:util_java",
     "//content/public/android:content_java",
-    "//third_party/android_deps:com_android_support_collections_java",
+    "//third_party/android_deps:androidx_collection_collection_java",
     "//third_party/android_deps:com_android_support_support_compat_java",
     "//third_party/android_deps:com_android_support_support_core_utils_java",
     "//url:gurl_java",

chrome/browser/util/android/java/src/org/chromium/chrome/browser/util/BitmapCache.java

@@ -6,11 +6,11 @@ package org.chromium.chrome.browser.util;
 
 import android.graphics.Bitmap;
 import android.os.Looper;
-import android.support.v4.util.LruCache;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.collection.LruCache;
 
 import org.chromium.base.DiscardableReferencePool;
 import org.chromium.base.SysUtils;

content/public/android/BUILD.gn

@@ -78,7 +78,7 @@ android_library("content_java") {
     "//services/shape_detection/public/mojom:mojom_java",
     "//skia/public/mojom:mojom_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_android_support_collections_java",
+    "//third_party/android_deps:androidx_collection_collection_java",
     "//third_party/android_deps:com_android_support_support_compat_java",
     "//third_party/blink/public:blink_headers_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
@@ -427,7 +427,7 @@ android_library("content_javatests") {
     "//services/service_manager/public/java:service_manager_java",
     "//services/test/echo/public/mojom:mojom_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_android_support_collections_java",
+    "//third_party/android_deps:androidx_collection_collection_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/blink/public:blink_headers_java",

content/public/android/java/src/org/chromium/content/browser/BindingManager.java

@@ -7,7 +7,8 @@ package org.chromium.content.browser;
 import android.content.ComponentCallbacks2;
 import android.content.Context;
 import android.content.res.Configuration;
-import android.support.v4.util.ArraySet;
+
+import androidx.collection.ArraySet;
 
 import org.chromium.base.Log;
 import org.chromium.base.library_loader.LibraryLoader;

third_party/android_sdk/androidx_browser/BUILD.gn

@@ -42,12 +42,12 @@ android_library("androidx_browser_java") {
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_concurrent_concurrent_futures_java",
-    "//third_party/android_deps:com_android_support_collections_java",
     "//third_party/android_deps:com_android_support_support_annotations_java",
     "//third_party/android_deps:com_android_support_support_compat_java",
 
     # TODO(bjoyce): Remove when androidx migration is complete.
     # crbug.com/1047843
+    "//third_party/android_deps:com_android_support_collections_java_orig",
     "//third_party/android_deps:com_android_support_support_compat_java_orig",
   ]
   srcjar_deps = [ ":androidx_browser_service_aidl" ]

third_party/custom_tabs_client/BUILD.gn

@@ -89,7 +89,7 @@ android_library("custom_tabs_support_java") {
     # files are manually written to androidx crbug.com/1047843.
     # "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:com_android_support_appcompat_v7_java_orig",
-    "//third_party/android_deps:com_android_support_collections_java",
+    "//third_party/android_deps:com_android_support_collections_java_orig",
     "//third_party/android_deps:com_android_support_interpolator_java",
     "//third_party/android_deps:com_android_support_support_annotations_java",
     "//third_party/android_deps:com_android_support_support_compat_java",