diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessibilityUtils.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessibilityUtils.java
index db6f8a75a8b0a..88836e1387035 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessibilityUtils.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessibilityUtils.java
@@ -7,10 +7,11 @@ package org.chromium.chrome.browser.autofill_assistant;
import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_AUTO;
import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
-import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.view.View;
+import androidx.annotation.Nullable;
+
/**
* Common accessibility utilities used by autofill assistant.
*/
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomBarCoordinator.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomBarCoordinator.java
index 35b93b6b6ff72..943cb4dc7c997 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomBarCoordinator.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomBarCoordinator.java
@@ -4,7 +4,6 @@
package org.chromium.chrome.browser.autofill_assistant;
-import android.support.annotation.Nullable;
import android.transition.ChangeBounds;
import android.transition.Fade;
import android.transition.TransitionManager;
@@ -15,6 +14,8 @@ import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.ScrollView;
+import androidx.annotation.Nullable;
+
import org.chromium.base.supplier.ObservableSupplierImpl;
import org.chromium.chrome.autofill_assistant.R;
import org.chromium.chrome.browser.ChromeActivity;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDialogButton.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDialogButton.java
index eb77741452846..c3a6f59d7d69e 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDialogButton.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDialogButton.java
@@ -5,7 +5,8 @@
package org.chromium.chrome.browser.autofill_assistant;
import android.content.Context;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantInfoPopup.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantInfoPopup.java
index 078e5edcc60c0..2f1179ff0d7e5 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantInfoPopup.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantInfoPopup.java
@@ -5,9 +5,10 @@
package org.chromium.chrome.browser.autofill_assistant;
import android.content.Context;
-import android.support.annotation.Nullable;
import android.support.v7.app.AlertDialog;
+import androidx.annotation.Nullable;
+
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.ui.UiUtils;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantRootViewContainer.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantRootViewContainer.java
index bf2faa26a7b09..d08d93e9b6e80 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantRootViewContainer.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantRootViewContainer.java
@@ -6,10 +6,11 @@ package org.chromium.chrome.browser.autofill_assistant;
import android.content.Context;
import android.graphics.Rect;
-import android.support.annotation.Nullable;
import android.util.AttributeSet;
import android.widget.LinearLayout;
+import androidx.annotation.Nullable;
+
import org.chromium.chrome.browser.ChromeActivity;
import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java
index 10009579e9a79..f665f99f7a036 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java
@@ -5,7 +5,8 @@
package org.chromium.chrome.browser.autofill_assistant;
import android.content.Context;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantChipAdapter.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantChipAdapter.java
index 4d7088c9b5534..6f4d2bb9f0a7d 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantChipAdapter.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantChipAdapter.java
@@ -4,11 +4,11 @@
package org.chromium.chrome.browser.autofill_assistant.carousel;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.ListUpdateCallback;
import androidx.recyclerview.widget.RecyclerView;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantColor.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantColor.java
index ec411201d2bea..0a6d157fe554a 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantColor.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantColor.java
@@ -7,9 +7,9 @@ package org.chromium.chrome.browser.autofill_assistant.generic_ui;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Color;
-import android.support.annotation.Nullable;
import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.base.annotations.CalledByNative;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantDrawable.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantDrawable.java
index 68b14454fb8c8..d69c90de44d9f 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantDrawable.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantDrawable.java
@@ -9,10 +9,11 @@ import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.Nullable;
import android.support.v7.content.res.AppCompatResources;
+import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
+
import org.chromium.base.Callback;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantGenericUiDelegate.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantGenericUiDelegate.java
index 17be058873e5c..f1c2e9914d301 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantGenericUiDelegate.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantGenericUiDelegate.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.autofill_assistant.generic_ui;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantGenericUiModel.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantGenericUiModel.java
index 73db86302e138..9594498b7ff7d 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantGenericUiModel.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantGenericUiModel.java
@@ -4,9 +4,10 @@
package org.chromium.chrome.browser.autofill_assistant.generic_ui;
-import android.support.annotation.Nullable;
import android.view.View;
+import androidx.annotation.Nullable;
+
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.ui.modelutil.PropertyModel;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewFactory.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewFactory.java
index b26ad9d166c38..155fc19682bd1 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewFactory.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewFactory.java
@@ -5,13 +5,14 @@
package org.chromium.chrome.browser.autofill_assistant.generic_ui;
import android.content.Context;
-import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewInteractions.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewInteractions.java
index 129d38ff69eac..5f60e592ffde1 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewInteractions.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewInteractions.java
@@ -7,10 +7,11 @@ package org.chromium.chrome.browser.autofill_assistant.generic_ui;
import static org.chromium.chrome.browser.autofill_assistant.generic_ui.AssistantValue.isDateSingleton;
import android.content.Context;
-import android.support.annotation.Nullable;
import android.view.View;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.chrome.browser.autofill_assistant.user_data.AssistantDateTime;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDrawable.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDrawable.java
index e321e4a0ba9a1..c011c4029af63 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDrawable.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDrawable.java
@@ -20,13 +20,13 @@ import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.Region;
import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.TypedValue;
import android.widget.TextView;
import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.chrome.autofill_assistant.R;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayImage.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayImage.java
index bd6b7586c2563..edb77eb05c681 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayImage.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayImage.java
@@ -5,9 +5,9 @@
package org.chromium.chrome.browser.autofill_assistant.overlay;
import android.graphics.Bitmap;
-import android.support.annotation.Nullable;
import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
/** Java equivalent to {@code OverlayImageProto}. */
public class AssistantOverlayImage {
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayModel.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayModel.java
index d25ad9a614a84..fa7ebb26d7dbf 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayModel.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayModel.java
@@ -5,9 +5,9 @@
package org.chromium.chrome.browser.autofill_assistant.overlay;
import android.graphics.RectF;
-import android.support.annotation.Nullable;
import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantChoiceList.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantChoiceList.java
index 1a8dc484927d3..9e04a671a89d3 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantChoiceList.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantChoiceList.java
@@ -6,7 +6,6 @@ package org.chromium.chrome.browser.autofill_assistant.user_data;
import android.content.Context;
import android.content.res.TypedArray;
-import android.support.annotation.Nullable;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.View;
@@ -20,6 +19,7 @@ import android.widget.Space;
import android.widget.TextView;
import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
import androidx.gridlayout.widget.GridLayout;
import org.chromium.base.ApiCompatibilityUtils;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataBinder.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataBinder.java
index 30c767e7e267b..3efcce5e2aa7c 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataBinder.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataBinder.java
@@ -5,10 +5,11 @@
package org.chromium.chrome.browser.autofill_assistant.user_data;
import android.app.Activity;
-import android.support.annotation.Nullable;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.Nullable;
+
import org.chromium.base.task.PostTask;
import org.chromium.chrome.browser.ChromeVersionInfo;
import org.chromium.chrome.browser.autofill.prefeditor.EditorDialog;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataModel.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataModel.java
index 48d2f8a808730..050c47b041c8c 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataModel.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataModel.java
@@ -5,10 +5,11 @@
package org.chromium.chrome.browser.autofill_assistant.user_data;
import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
import android.view.View;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.chrome.browser.autofill.PersonalDataManager;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateSection.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateSection.java
index 6442cbb0d70e9..1c2f764858f84 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateSection.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateSection.java
@@ -5,13 +5,14 @@
package org.chromium.chrome.browser.autofill_assistant.user_data;
import android.content.Context;
-import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.chrome.autofill_assistant.R;
import org.chromium.chrome.browser.autofill_assistant.user_data.AssistantVerticalExpander.ChevronStyle;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantInfoSection.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantInfoSection.java
index 8fd7a21056353..36859d97494e9 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantInfoSection.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantInfoSection.java
@@ -5,12 +5,13 @@
package org.chromium.chrome.browser.autofill_assistant.user_data;
import android.content.Context;
-import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+
import org.chromium.base.Callback;
import org.chromium.chrome.autofill_assistant.R;
import org.chromium.chrome.browser.autofill_assistant.AssistantTextUtils;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginChoice.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginChoice.java
index 590bb69dbc71a..a00f485de4b93 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginChoice.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginChoice.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.autofill_assistant.user_data;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.chromium.chrome.browser.autofill.prefeditor.EditableOption;
import org.chromium.chrome.browser.autofill_assistant.AssistantInfoPopup;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginSection.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginSection.java
index 0b68f821b8184..2b3a028b2b2cc 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginSection.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginSection.java
@@ -7,13 +7,13 @@ package org.chromium.chrome.browser.autofill_assistant.user_data;
import static org.chromium.chrome.browser.autofill_assistant.AssistantAccessibilityUtils.setAccessibility;
import android.content.Context;
-import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
import org.chromium.chrome.autofill_assistant.R;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantAdditionalSectionFactory.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantAdditionalSectionFactory.java
index 4a7d13844f1a2..51fe8e9476509 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantAdditionalSectionFactory.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantAdditionalSectionFactory.java
@@ -5,9 +5,10 @@
package org.chromium.chrome.browser.autofill_assistant.user_data.additional_sections;
import android.content.Context;
-import android.support.annotation.Nullable;
import android.view.ViewGroup;
+import androidx.annotation.Nullable;
+
/** Interface for factories of additional user form sections. */
public interface AssistantAdditionalSectionFactory {
/**
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantPopupListSection.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantPopupListSection.java
index 06cde1256e78e..188fe266b762a 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantPopupListSection.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantPopupListSection.java
@@ -5,13 +5,14 @@
package org.chromium.chrome.browser.autofill_assistant.user_data.additional_sections;
import android.content.Context;
-import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+
import org.chromium.chrome.autofill_assistant.R;
import org.chromium.chrome.browser.autofill_assistant.AssistantTextUtils;
import org.chromium.chrome.browser.autofill_assistant.generic_ui.AssistantValue;
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantTextInputSection.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantTextInputSection.java
index 780aa23cc16c1..9e573023ef5ab 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantTextInputSection.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantTextInputSection.java
@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.autofill_assistant.user_data.additional_sect
import static org.chromium.chrome.browser.autofill.prefeditor.EditorFieldModel.INPUT_TYPE_HINT_ALPHA_NUMERIC;
import android.content.Context;
-import android.support.annotation.Nullable;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -17,6 +16,7 @@ import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.annotation.Nullable;
import androidx.core.util.Pair;
import org.chromium.base.ApiCompatibilityUtils;
diff --git a/chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataTestHelper.java b/chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataTestHelper.java
index e299bd13419d7..c48af899d5ca2 100644
--- a/chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataTestHelper.java
+++ b/chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataTestHelper.java
@@ -8,11 +8,12 @@ import static org.chromium.chrome.browser.autofill_assistant.AssistantTagsForTes
import static org.chromium.chrome.browser.autofill_assistant.AutofillAssistantUiTestUtil.findViewsWithTag;
import static org.chromium.chrome.browser.autofill_assistant.user_data.AssistantCollectUserDataCoordinator.DIVIDER_TAG;
-import android.support.annotation.Nullable;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+
import org.chromium.base.test.util.CallbackHelper;
import org.chromium.chrome.browser.autofill.PersonalDataManager;
import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
diff --git a/chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayUiTest.java b/chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayUiTest.java
index 21f809cc27e36..fddfb92749777 100644
--- a/chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayUiTest.java
+++ b/chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayUiTest.java
@@ -24,10 +24,11 @@ import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.graphics.Rect;
import android.graphics.RectF;
-import android.support.annotation.Nullable;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
+import androidx.annotation.Nullable;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestService.java b/chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestService.java
index 7220053dc51bb..e712e01c9a729 100644
--- a/chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestService.java
+++ b/chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestService.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.autofill_assistant;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.protobuf.ByteString;
import com.google.protobuf.InvalidProtocolBufferException;
diff --git a/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/data/CachedProviderAdapter.java b/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/data/CachedProviderAdapter.java
index 5e9ce466e180e..566d5cd0eff0f 100644
--- a/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/data/CachedProviderAdapter.java
+++ b/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/data/CachedProviderAdapter.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.keyboard_accessory.data;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.chromium.base.Callback;
diff --git a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceLayoutTest.java b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceLayoutTest.java
index e945e559bc180..6017850f6fb15 100644
--- a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceLayoutTest.java
+++ b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceLayoutTest.java
@@ -42,7 +42,6 @@ import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import android.support.annotation.Nullable;
import android.support.test.InstrumentationRegistry;
import android.support.test.espresso.Espresso;
import android.support.test.espresso.NoMatchingViewException;
@@ -54,6 +53,7 @@ import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
+import androidx.annotation.Nullable;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridItemTouchHelperCallback.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridItemTouchHelperCallback.java
index 4db5cbc5113d6..e47d5e5279a56 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridItemTouchHelperCallback.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridItemTouchHelperCallback.java
@@ -9,10 +9,10 @@ import static org.chromium.chrome.browser.tasks.tab_management.TabListModel.Card
import static org.chromium.chrome.browser.tasks.tab_management.TabListModel.CardProperties.ModelType.TAB;
import android.graphics.Canvas;
-import android.support.annotation.NonNull;
import android.view.HapticFeedbackConstants;
import android.view.View;
+import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.RecyclerView;
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorLayoutBinderTest.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorLayoutBinderTest.java
index 4c4137e968e74..b9385eb7fda02 100644
--- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorLayoutBinderTest.java
+++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorLayoutBinderTest.java
@@ -9,7 +9,6 @@ import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
import android.graphics.Rect;
-import android.support.annotation.NonNull;
import android.support.test.annotation.UiThreadTest;
import android.support.test.filters.MediumTest;
import android.support.test.filters.SmallTest;
@@ -19,6 +18,7 @@ import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import org.junit.Assert;
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabUiTestHelper.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabUiTestHelper.java
index fbb442198250c..51b168e37dcaf 100644
--- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabUiTestHelper.java
+++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabUiTestHelper.java
@@ -28,7 +28,6 @@ import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.os.Build;
import android.provider.Settings;
-import android.support.annotation.Nullable;
import android.support.test.InstrumentationRegistry;
import android.support.test.espresso.NoMatchingRootException;
import android.support.test.espresso.NoMatchingViewException;
@@ -44,6 +43,7 @@ import android.support.test.espresso.contrib.RecyclerViewActions;
import android.view.View;
import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
import org.hamcrest.Description;
diff --git a/chrome/android/features/test_dummy/internal/BUILD.gn b/chrome/android/features/test_dummy/internal/BUILD.gn
index 471e2d98ccb14..bf81c75b00a99 100644
--- a/chrome/android/features/test_dummy/internal/BUILD.gn
+++ b/chrome/android/features/test_dummy/internal/BUILD.gn
@@ -51,6 +51,7 @@ android_library("base_module_java") {
"//chrome/android/modules/test_dummy/provider:java",
"//chrome/android/modules/test_dummy/public:java",
"//third_party/android_deps:android_support_v7_appcompat_java",
+ "//third_party/android_deps:com_android_support_support_annotations_java",
]
sources = [
"java/src/org/chromium/chrome/features/test_dummy/TestDummyActivity.java",
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/client/scope/ProcessScopeBuilder.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/client/scope/ProcessScopeBuilder.java
index 63c10cdbb37d7..18d2357a07fa8 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/client/scope/ProcessScopeBuilder.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/client/scope/ProcessScopeBuilder.java
@@ -5,7 +5,8 @@
package org.chromium.chrome.browser.feed.library.api.client.scope;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
+
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.api.host.config.ApplicationInfo;
import org.chromium.chrome.browser.feed.library.api.host.config.Configuration;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/client/stream/Stream.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/client/stream/Stream.java
index 8fab0fa281415..6a696fbc8e644 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/client/stream/Stream.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/client/stream/Stream.java
@@ -5,9 +5,9 @@
package org.chromium.chrome.browser.feed.library.api.client.stream;
import android.os.Bundle;
-import android.support.annotation.IntDef;
import android.view.View;
+import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
import java.util.List;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/config/ApplicationInfo.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/config/ApplicationInfo.java
index e454d501add0a..81ffd0839a556 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/config/ApplicationInfo.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/config/ApplicationInfo.java
@@ -7,7 +7,8 @@ package org.chromium.chrome.browser.feed.library.api.host.config;
import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager.NameNotFoundException;
-import android.support.annotation.IntDef;
+
+import androidx.annotation.IntDef;
import org.chromium.chrome.browser.feed.library.common.logging.Logger;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/config/Configuration.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/config/Configuration.java
index 1a32d7986238c..4d4d3ab0bc139 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/config/Configuration.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/config/Configuration.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.config;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
import java.util.HashMap;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/imageloader/BundledAssets.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/imageloader/BundledAssets.java
index 91b6a4ccd96dd..90f2a86c571a2 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/imageloader/BundledAssets.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/imageloader/BundledAssets.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.imageloader;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
/** Enumerates the set of bundled assets which could be requested via the {@link ImageLoaderApi}. */
@StringDef({BundledAssets.OFFLINE_INDICATOR_BADGE, BundledAssets.OFFLINE_INDICATOR_BADGE_DARK_BG,
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/ActionType.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/ActionType.java
index 4959219cea6f5..83fd1f42afd3a 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/ActionType.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/ActionType.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.logging;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
/**
* IntDef representing the different types of actions.
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/InternalFeedError.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/InternalFeedError.java
index 95316d7a6ae41..c2aed6d6cb4e3 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/InternalFeedError.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/InternalFeedError.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.logging;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
/**
* Represents internal errors of the Feed libraries.
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/RequestReason.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/RequestReason.java
index d0363040434b4..e45df5aa084b4 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/RequestReason.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/RequestReason.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.logging;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
/**
* The reason a request is being made.
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/ScrollType.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/ScrollType.java
index 4de1b5994fc89..bf573155e33f6 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/ScrollType.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/ScrollType.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.logging;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
/** IntDef representing the different types of scrolls. */
@IntDef({ScrollType.UNKNOWN, ScrollType.STREAM_SCROLL, ScrollType.NEXT_VALUE})
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/SessionEvent.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/SessionEvent.java
index ca3f19d11e0b2..43d962e1ba98c 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/SessionEvent.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/SessionEvent.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.logging;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
/**
* IntDef representing the different results of requesting sessions.
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/SpinnerType.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/SpinnerType.java
index 8de9a27156b10..4b72c46bc2050 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/SpinnerType.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/SpinnerType.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.logging;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
/**
* IntDef representing the different types of spinners.
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/Task.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/Task.java
index 86a0b77ee1ea6..6f788cc32347c 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/Task.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/Task.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.logging;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
/**
* IntDef representing the different tasks that can be queued on the {@link
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/ZeroStateShowReason.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/ZeroStateShowReason.java
index c05d74a708ad9..2e789dc8d6935 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/ZeroStateShowReason.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/logging/ZeroStateShowReason.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.logging;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
/**
* The reason a zero state is shown.
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/network/HttpHeader.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/network/HttpHeader.java
index a27dce7bfca8f..2260881b55ab7 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/network/HttpHeader.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/network/HttpHeader.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.network;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
public final class HttpHeader {
/** These string values correspond with the actual header name. */
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/network/HttpRequest.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/network/HttpRequest.java
index 568fa2359e64e..b710682852fb0 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/network/HttpRequest.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/network/HttpRequest.java
@@ -5,7 +5,8 @@
package org.chromium.chrome.browser.feed.library.api.host.network;
import android.net.Uri;
-import android.support.annotation.StringDef;
+
+import androidx.annotation.StringDef;
import java.net.HttpURLConnection;
import java.util.ArrayList;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/scheduler/SchedulerApi.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/scheduler/SchedulerApi.java
index 1f2da45247e83..f134a13540aa1 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/scheduler/SchedulerApi.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/scheduler/SchedulerApi.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.scheduler;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
/** Allows host to change behavior based on Feed requests and their status */
public interface SchedulerApi {
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/storage/CommitResult.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/storage/CommitResult.java
index 604e786100bde..e4bd838441e58 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/storage/CommitResult.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/storage/CommitResult.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.storage;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
/** Status after completion of a commit to storage. */
public final class CommitResult {
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/storage/ContentOperation.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/storage/ContentOperation.java
index 0d6fa1836f14b..d451d40e50c8b 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/storage/ContentOperation.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/storage/ContentOperation.java
@@ -4,8 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.storage;
-import android.support.annotation.IntDef;
-
+import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
import java.util.Arrays;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/storage/JournalOperation.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/storage/JournalOperation.java
index ebea84e0f7f37..af65c075bede7 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/storage/JournalOperation.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/storage/JournalOperation.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.storage;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
/** A mutation to the underlying {@link JournalStorage}. */
public abstract class JournalOperation {
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/stream/TooltipCallbackApi.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/stream/TooltipCallbackApi.java
index b83e7dd1ff178..5cd9098c40f9d 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/stream/TooltipCallbackApi.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/stream/TooltipCallbackApi.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.stream;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
/** Interface for callbacks for tooltip events. */
public interface TooltipCallbackApi {
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/stream/TooltipInfo.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/stream/TooltipInfo.java
index 7bb97e79d69b7..74bf1f7330890 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/stream/TooltipInfo.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/stream/TooltipInfo.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.host.stream;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
/** All the information necessary to render a tooltip. */
public interface TooltipInfo {
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/actionparser/ActionSource.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/actionparser/ActionSource.java
index 885150c13a910..6fb04ef4c14e9 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/actionparser/ActionSource.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/actionparser/ActionSource.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.internal.actionparser;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
/** Possible action types. */
@IntDef({ActionSource.UNKNOWN, ActionSource.VIEW, ActionSource.CLICK, ActionSource.LONG_CLICK,
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/modelprovider/ModelChild.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/modelprovider/ModelChild.java
index f3b378ea2315f..40730c22e67e8 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/modelprovider/ModelChild.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/modelprovider/ModelChild.java
@@ -4,8 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.internal.modelprovider;
-import android.support.annotation.IntDef;
-
+import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
/**
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/modelprovider/ModelError.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/modelprovider/ModelError.java
index 356e394529cf6..674c512bf49b0 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/modelprovider/ModelError.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/modelprovider/ModelError.java
@@ -4,8 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.internal.modelprovider;
-import android.support.annotation.IntDef;
-
+import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
import com.google.protobuf.ByteString;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/modelprovider/ModelProvider.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/modelprovider/ModelProvider.java
index 5d8d4f00d90cb..19ac7d24e4d9f 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/modelprovider/ModelProvider.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/modelprovider/ModelProvider.java
@@ -4,8 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.internal.modelprovider;
-import android.support.annotation.IntDef;
-
+import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
import org.chromium.chrome.browser.feed.library.api.common.MutationContext;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/store/LocalActionMutation.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/store/LocalActionMutation.java
index 103aa083e525c..e9fe0f49bdb1f 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/store/LocalActionMutation.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/store/LocalActionMutation.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.api.internal.store;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import org.chromium.chrome.browser.feed.library.api.host.storage.CommitResult;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/BasicStream.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/BasicStream.java
index aef132f33bd94..cc0c3dea6e6db 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/BasicStream.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/BasicStream.java
@@ -11,14 +11,14 @@ import android.content.Context;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.os.Bundle;
-import android.support.annotation.IntDef;
-import android.support.annotation.VisibleForTesting;
import android.util.Base64;
import android.view.ContextThemeWrapper;
import android.view.View;
import android.view.View.OnLayoutChangeListener;
+import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/StreamItemAnimator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/StreamItemAnimator.java
index 996b78bd9659b..fc77116f76bab 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/StreamItemAnimator.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/StreamItemAnimator.java
@@ -4,8 +4,7 @@
package org.chromium.chrome.browser.feed.library.basicstream.internal;
-import android.support.annotation.VisibleForTesting;
-
+import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.RecyclerView;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/StreamRecyclerViewAdapter.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/StreamRecyclerViewAdapter.java
index 0e1950ccc057f..2c480d3fff5b2 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/StreamRecyclerViewAdapter.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/StreamRecyclerViewAdapter.java
@@ -10,13 +10,13 @@ import static org.chromium.chrome.browser.feed.library.basicstream.internal.view
import static org.chromium.chrome.browser.feed.library.basicstream.internal.viewholders.ViewHolderType.TYPE_ZERO_STATE;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
import android.widget.FrameLayout;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.DiffUtil.DiffResult;
import androidx.recyclerview.widget.ListUpdateCallback;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/CardDriver.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/CardDriver.java
index bbf46a2e7d069..29e476b53795f 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/CardDriver.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/CardDriver.java
@@ -6,9 +6,8 @@ package org.chromium.chrome.browser.feed.library.basicstream.internal.drivers;
import static org.chromium.chrome.browser.feed.library.common.Validators.checkState;
-import android.support.annotation.VisibleForTesting;
-
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.api.client.stream.Stream.ContentChangedListener;
import org.chromium.chrome.browser.feed.library.api.host.action.ActionApi;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/ClusterDriver.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/ClusterDriver.java
index dea12b41f05f4..62fcf94c0fd4b 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/ClusterDriver.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/ClusterDriver.java
@@ -4,9 +4,8 @@
package org.chromium.chrome.browser.feed.library.basicstream.internal.drivers;
-import android.support.annotation.VisibleForTesting;
-
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.api.client.stream.Stream.ContentChangedListener;
import org.chromium.chrome.browser.feed.library.api.host.action.ActionApi;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/ContentDriver.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/ContentDriver.java
index 4c4d02373e01f..4440ae31652a9 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/ContentDriver.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/ContentDriver.java
@@ -6,9 +6,8 @@ package org.chromium.chrome.browser.feed.library.basicstream.internal.drivers;
import static org.chromium.chrome.browser.feed.library.common.Validators.checkState;
-import android.support.annotation.VisibleForTesting;
-
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.RecyclerView;
import org.chromium.base.Consumer;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/ContinuationDriver.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/ContinuationDriver.java
index 5f7ea78da5df4..1904cb1694b69 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/ContinuationDriver.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/ContinuationDriver.java
@@ -8,11 +8,11 @@ import static org.chromium.chrome.browser.feed.library.common.Validators.checkNo
import static org.chromium.chrome.browser.feed.library.common.Validators.checkState;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
import android.view.View;
import android.view.View.OnClickListener;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.feed.library.api.host.config.Configuration;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/HeaderDriver.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/HeaderDriver.java
index 81af9c8779bd4..95f947bbbc802 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/HeaderDriver.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/HeaderDriver.java
@@ -6,9 +6,8 @@ package org.chromium.chrome.browser.feed.library.basicstream.internal.drivers;
import static org.chromium.chrome.browser.feed.library.common.Validators.checkState;
-import android.support.annotation.VisibleForTesting;
-
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.api.client.stream.Header;
import org.chromium.chrome.browser.feed.library.basicstream.internal.viewholders.FeedViewHolder;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/NoContentDriver.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/NoContentDriver.java
index 3660003b84b83..849a23d878461 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/NoContentDriver.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/NoContentDriver.java
@@ -6,9 +6,8 @@ package org.chromium.chrome.browser.feed.library.basicstream.internal.drivers;
import static org.chromium.chrome.browser.feed.library.common.Validators.checkState;
-import android.support.annotation.VisibleForTesting;
-
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.basicstream.internal.viewholders.FeedViewHolder;
import org.chromium.chrome.browser.feed.library.basicstream.internal.viewholders.NoContentViewHolder;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/StreamDriver.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/StreamDriver.java
index e9639dc525818..20a6cbd68365f 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/StreamDriver.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/StreamDriver.java
@@ -7,9 +7,9 @@ package org.chromium.chrome.browser.feed.library.basicstream.internal.drivers;
import static org.chromium.chrome.browser.feed.library.common.Validators.checkNotNull;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.feed.library.api.client.stream.Stream.ContentChangedListener;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/ZeroStateDriver.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/ZeroStateDriver.java
index fefbe671d6d81..98f6dc8670cde 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/ZeroStateDriver.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/drivers/ZeroStateDriver.java
@@ -6,11 +6,11 @@ package org.chromium.chrome.browser.feed.library.basicstream.internal.drivers;
import static org.chromium.chrome.browser.feed.library.common.Validators.checkState;
-import android.support.annotation.VisibleForTesting;
import android.view.View;
import android.view.View.OnClickListener;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.api.client.stream.Stream.ContentChangedListener;
import org.chromium.chrome.browser.feed.library.api.host.logging.BasicLoggingApi;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/viewholders/ContinuationViewHolder.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/viewholders/ContinuationViewHolder.java
index 38eb066b4112e..6a94b83e12a0c 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/viewholders/ContinuationViewHolder.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/viewholders/ContinuationViewHolder.java
@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.feed.library.basicstream.internal.viewholder
import static org.chromium.chrome.browser.feed.library.common.Validators.checkNotNull;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@@ -15,6 +14,7 @@ import android.view.ViewGroup;
import android.view.ViewGroup.MarginLayoutParams;
import android.widget.FrameLayout;
+import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.RecyclerView.LayoutParams;
import org.chromium.chrome.browser.feed.library.api.host.config.Configuration;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/viewholders/PietViewHolder.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/viewholders/PietViewHolder.java
index de287f1b12e6c..367f0732e1b41 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/viewholders/PietViewHolder.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/viewholders/PietViewHolder.java
@@ -7,13 +7,13 @@ package org.chromium.chrome.browser.feed.library.basicstream.internal.viewholder
import static org.chromium.chrome.browser.feed.library.common.Validators.checkNotNull;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup.MarginLayoutParams;
import android.widget.FrameLayout;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.RecyclerView.LayoutParams;
import org.chromium.chrome.browser.feed.library.api.host.action.StreamActionApi;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/viewholders/ViewHolderType.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/viewholders/ViewHolderType.java
index a99fbb705c28b..cbc2a0dd58048 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/viewholders/ViewHolderType.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/basicstream/internal/viewholders/ViewHolderType.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.basicstream.internal.viewholders;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
/**
* Constants to specify the type of ViewHolder to create in the {@link StreamRecyclerViewAdapter}.
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/common/concurrent/TaskQueue.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/common/concurrent/TaskQueue.java
index 64e863531ff26..0d76b0c5438de 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/common/concurrent/TaskQueue.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/common/concurrent/TaskQueue.java
@@ -4,10 +4,9 @@
package org.chromium.chrome.browser.feed.library.common.concurrent;
-import android.support.annotation.IntDef;
-import android.support.annotation.VisibleForTesting;
-
+import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.api.host.logging.BasicLoggingApi;
import org.chromium.chrome.browser.feed.library.api.host.logging.InternalFeedError;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/common/locale/LocaleUtils.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/common/locale/LocaleUtils.java
index df38fcf0efd36..ab6ad82a0216b 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/common/locale/LocaleUtils.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/common/locale/LocaleUtils.java
@@ -8,9 +8,10 @@ import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build;
import android.os.Build.VERSION;
-import android.support.annotation.VisibleForTesting;
import android.text.TextUtils;
+import androidx.annotation.VisibleForTesting;
+
import java.util.Locale;
/** Utility methods for retrieving information about device language. */
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/common/logging/Dumper.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/common/logging/Dumper.java
index 1bb0c9d541a4a..cb3bc725fa594 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/common/logging/Dumper.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/common/logging/Dumper.java
@@ -4,10 +4,10 @@
package org.chromium.chrome.browser.feed.library.common.logging;
-import android.support.annotation.VisibleForTesting;
import android.text.TextUtils;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import java.io.IOException;
import java.lang.ref.WeakReference;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedapplifecyclelistener/FeedLifecycleListener.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedapplifecyclelistener/FeedLifecycleListener.java
index 9b5cc619d2362..1801ba8a85882 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedapplifecyclelistener/FeedLifecycleListener.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedapplifecyclelistener/FeedLifecycleListener.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.feedapplifecyclelistener;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
/**
* Internal interface used to register Feed components with the {@link FeedAppLifecycleListener},
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedmodelprovider/FeedModelProvider.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedmodelprovider/FeedModelProvider.java
index 7c50b58aad359..03a0bfe6ae39a 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedmodelprovider/FeedModelProvider.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedmodelprovider/FeedModelProvider.java
@@ -4,9 +4,8 @@
package org.chromium.chrome.browser.feed.library.feedmodelprovider;
-import android.support.annotation.VisibleForTesting;
-
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import com.google.protobuf.ByteString;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedmodelprovider/internal/FeatureChangeImpl.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedmodelprovider/internal/FeatureChangeImpl.java
index 5d46ba1e07a0d..7a65e1d1fc1bd 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedmodelprovider/internal/FeatureChangeImpl.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedmodelprovider/internal/FeatureChangeImpl.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.feedmodelprovider.internal;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.api.internal.modelprovider.FeatureChange;
import org.chromium.chrome.browser.feed.library.api.internal.modelprovider.ModelChild;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedmodelprovider/internal/ModelCursorImpl.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedmodelprovider/internal/ModelCursorImpl.java
index 0c1f442177f7c..b2ab008116312 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedmodelprovider/internal/ModelCursorImpl.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedmodelprovider/internal/ModelCursorImpl.java
@@ -4,9 +4,8 @@
package org.chromium.chrome.browser.feed.library.feedmodelprovider.internal;
-import android.support.annotation.VisibleForTesting;
-
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.api.internal.modelprovider.FeatureChange;
import org.chromium.chrome.browser.feed.library.api.internal.modelprovider.FeatureChange.ChildChanges;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedmodelprovider/internal/ModelMutationImpl.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedmodelprovider/internal/ModelMutationImpl.java
index c4dae181ac26a..3cd741ee390aa 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedmodelprovider/internal/ModelMutationImpl.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedmodelprovider/internal/ModelMutationImpl.java
@@ -4,9 +4,8 @@
package org.chromium.chrome.browser.feed.library.feedmodelprovider.internal;
-import android.support.annotation.VisibleForTesting;
-
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.api.common.MutationContext;
import org.chromium.chrome.browser.feed.library.api.internal.modelprovider.ModelMutation;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/FeedSessionManagerImpl.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/FeedSessionManagerImpl.java
index f6878ad9cab7d..b7143c7801de7 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/FeedSessionManagerImpl.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/FeedSessionManagerImpl.java
@@ -4,9 +4,8 @@
package org.chromium.chrome.browser.feed.library.feedsessionmanager;
-import android.support.annotation.VisibleForTesting;
-
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.base.Consumer;
import org.chromium.base.Function;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/internal/HeadAsStructure.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/internal/HeadAsStructure.java
index 9449fb546afd3..741eea5244932 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/internal/HeadAsStructure.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/internal/HeadAsStructure.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.feedsessionmanager.internal;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
import org.chromium.base.Consumer;
import org.chromium.base.Function;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/internal/SessionCache.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/internal/SessionCache.java
index ef7513499b6df..ac445ea5fea67 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/internal/SessionCache.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/internal/SessionCache.java
@@ -4,9 +4,8 @@
package org.chromium.chrome.browser.feed.library.feedsessionmanager.internal;
-import android.support.annotation.VisibleForTesting;
-
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.browser.feed.library.api.host.logging.Task;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/internal/SessionManagerMutation.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/internal/SessionManagerMutation.java
index d6123b663feab..f49887bd97a45 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/internal/SessionManagerMutation.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/internal/SessionManagerMutation.java
@@ -4,10 +4,10 @@
package org.chromium.chrome.browser.feed.library.feedsessionmanager.internal;
-import android.support.annotation.VisibleForTesting;
import android.text.TextUtils;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.base.Consumer;
import org.chromium.chrome.browser.feed.library.api.client.knowncontent.KnownContent;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/internal/TimeoutSessionImpl.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/internal/TimeoutSessionImpl.java
index 5986be0820fbc..af9cd45764fd8 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/internal/TimeoutSessionImpl.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/feedsessionmanager/internal/TimeoutSessionImpl.java
@@ -4,9 +4,8 @@
package org.chromium.chrome.browser.feed.library.feedsessionmanager.internal;
-import android.support.annotation.VisibleForTesting;
-
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.api.common.MutationContext;
import org.chromium.chrome.browser.feed.library.api.internal.common.ThreadUtils;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/hostimpl/storage/PersistentJournalStorage.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/hostimpl/storage/PersistentJournalStorage.java
index cfedc66d17e17..2216f68627e66 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/hostimpl/storage/PersistentJournalStorage.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/hostimpl/storage/PersistentJournalStorage.java
@@ -9,9 +9,9 @@ import static org.chromium.chrome.browser.feed.library.api.host.storage.JournalO
import static org.chromium.chrome.browser.feed.library.api.host.storage.JournalOperation.Type.DELETE;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.base.Consumer;
import org.chromium.chrome.browser.feed.library.api.host.storage.CommitResult;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/AdapterParameters.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/AdapterParameters.java
index e856d73420edc..abbe9b4437ffe 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/AdapterParameters.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/AdapterParameters.java
@@ -5,10 +5,11 @@
package org.chromium.chrome.browser.feed.library.piet;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.VisibleForTesting;
+
import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.browser.feed.library.common.time.Clock;
import org.chromium.chrome.browser.feed.library.piet.PietStylesHelper.PietStylesHelperFactory;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ChunkedTextElementAdapter.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ChunkedTextElementAdapter.java
index 285cdcbd0443d..d07d669c13f53 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ChunkedTextElementAdapter.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ChunkedTextElementAdapter.java
@@ -15,7 +15,6 @@ import android.graphics.Typeface;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
-import android.support.annotation.VisibleForTesting;
import android.text.Layout;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
@@ -31,6 +30,7 @@ import android.view.View;
import android.widget.TextView;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.base.Consumer;
import org.chromium.chrome.browser.feed.library.common.logging.Logger;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/DebugLogger.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/DebugLogger.java
index afa80beb37b13..37fd8fe11695f 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/DebugLogger.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/DebugLogger.java
@@ -5,8 +5,6 @@
package org.chromium.chrome.browser.feed.library.piet;
import android.content.Context;
-import android.support.annotation.IntDef;
-import android.support.annotation.VisibleForTesting;
import android.util.SparseArray;
import android.util.SparseIntArray;
import android.view.View;
@@ -14,7 +12,9 @@ import android.view.ViewGroup.LayoutParams;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import androidx.core.widget.TextViewCompat;
import org.chromium.chrome.browser.feed.library.common.ui.LayoutUtils;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ElementAdapter.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ElementAdapter.java
index 5141f8aef5c2b..7d3076172107b 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ElementAdapter.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ElementAdapter.java
@@ -9,13 +9,13 @@ import static org.chromium.chrome.browser.feed.library.piet.StyleProvider.DIMENS
import android.content.Context;
import android.os.Build;
-import android.support.annotation.VisibleForTesting;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
import android.view.accessibility.AccessibilityNodeInfo;
import android.widget.FrameLayout;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.common.logging.Logger;
import org.chromium.chrome.browser.feed.library.piet.DebugLogger.MessageType;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ElementAdapterFactory.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ElementAdapterFactory.java
index 3c134db2071c6..5f074accfb180 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ElementAdapterFactory.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ElementAdapterFactory.java
@@ -5,9 +5,10 @@
package org.chromium.chrome.browser.feed.library.piet;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
import android.view.View;
+import androidx.annotation.VisibleForTesting;
+
import org.chromium.chrome.browser.feed.library.piet.DebugLogger.MessageType;
import org.chromium.chrome.browser.feed.library.piet.TemplateBinder.TemplateKey;
import org.chromium.components.feed.core.proto.ui.piet.ElementsProto.CustomElement;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ElementListAdapter.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ElementListAdapter.java
index 18a9ba95b3e0f..0cf408dee6038 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ElementListAdapter.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ElementListAdapter.java
@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.feed.library.piet;
import static org.chromium.chrome.browser.feed.library.piet.StyleProvider.DIMENSION_NOT_SET;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
@@ -15,6 +14,7 @@ import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.piet.AdapterFactory.SingletonKeySupplier;
import org.chromium.chrome.browser.feed.library.piet.DebugLogger.MessageType;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/FrameAdapterImpl.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/FrameAdapterImpl.java
index 37a87f5506bc0..c7b26c10720a3 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/FrameAdapterImpl.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/FrameAdapterImpl.java
@@ -9,7 +9,6 @@ import static org.chromium.components.feed.core.proto.ui.piet.ErrorsProto.ErrorC
import static org.chromium.components.feed.core.proto.ui.piet.ErrorsProto.ErrorCode.ERR_POOR_FRAME_RATE;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
@@ -17,6 +16,7 @@ import android.view.ViewGroup.LayoutParams;
import android.widget.LinearLayout;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.api.host.config.DebugBehavior;
import org.chromium.chrome.browser.feed.library.common.logging.Logger;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/FrameContext.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/FrameContext.java
index c7bd61b1de52c..ab5fee765a41f 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/FrameContext.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/FrameContext.java
@@ -11,10 +11,10 @@ import static org.chromium.components.feed.core.proto.ui.piet.ErrorsProto.ErrorC
import static org.chromium.components.feed.core.proto.ui.piet.ErrorsProto.ErrorCode.ERR_MISSING_BINDING_VALUE;
import static org.chromium.components.feed.core.proto.ui.piet.ErrorsProto.ErrorCode.ERR_MISSING_TEMPLATE;
-import android.support.annotation.VisibleForTesting;
import android.view.View;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.api.host.config.DebugBehavior;
import org.chromium.chrome.browser.feed.library.common.logging.Logger;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/GridRowAdapter.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/GridRowAdapter.java
index 71c47adb1ba43..4bd0fb8b28dae 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/GridRowAdapter.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/GridRowAdapter.java
@@ -11,11 +11,12 @@ import static org.chromium.components.feed.core.proto.ui.piet.ErrorsProto.ErrorC
import static org.chromium.components.feed.core.proto.ui.piet.ErrorsProto.ErrorCode.ERR_UNSUPPORTED_FEATURE;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
import android.view.Gravity;
import android.view.View;
import android.widget.LinearLayout;
+import androidx.annotation.VisibleForTesting;
+
import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.browser.feed.library.common.ui.LayoutUtils;
import org.chromium.chrome.browser.feed.library.piet.AdapterFactory.AdapterKeySupplier;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ImageElementAdapter.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ImageElementAdapter.java
index 293180ab5e600..ce2c36963d09a 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ImageElementAdapter.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ImageElementAdapter.java
@@ -8,11 +8,11 @@ import static org.chromium.chrome.browser.feed.library.api.host.imageloader.Imag
import static org.chromium.chrome.browser.feed.library.common.Validators.checkState;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
import android.widget.ImageView;
import android.widget.ImageView.ScaleType;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.piet.AdapterFactory.SingletonKeySupplier;
import org.chromium.chrome.browser.feed.library.piet.ui.AspectRatioScalingImageView;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/MediaQueryHelper.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/MediaQueryHelper.java
index 3e8ea9e2db1e9..379a79e4ad34a 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/MediaQueryHelper.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/MediaQueryHelper.java
@@ -6,9 +6,9 @@ package org.chromium.chrome.browser.feed.library.piet;
import android.content.Context;
import android.content.res.Configuration;
-import android.support.annotation.VisibleForTesting;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.common.logging.Logger;
import org.chromium.chrome.browser.feed.library.common.ui.LayoutUtils;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/PietManagerImpl.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/PietManagerImpl.java
index f185bb91cfd8c..75b2f2161f224 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/PietManagerImpl.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/PietManagerImpl.java
@@ -5,10 +5,10 @@
package org.chromium.chrome.browser.feed.library.piet;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
import android.view.ViewGroup;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.browser.feed.library.api.host.config.DebugBehavior;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/PietStylesHelper.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/PietStylesHelper.java
index 359b09c6a025b..05785c8507eb3 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/PietStylesHelper.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/PietStylesHelper.java
@@ -6,10 +6,10 @@ package org.chromium.chrome.browser.feed.library.piet;
import static org.chromium.chrome.browser.feed.library.common.Validators.checkNotNull;
-import android.support.annotation.VisibleForTesting;
import android.util.LruCache;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.common.logging.Logger;
import org.chromium.chrome.browser.feed.library.piet.DebugLogger.MessageType;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/TextElementAdapter.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/TextElementAdapter.java
index 5e118ae3282f0..e4353f448c1fe 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/TextElementAdapter.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/TextElementAdapter.java
@@ -9,13 +9,13 @@ import android.graphics.Typeface;
import android.os.Build;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
-import android.support.annotation.VisibleForTesting;
import android.text.Layout;
import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import androidx.core.widget.TextViewCompat;
import org.chromium.base.Consumer;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/host/ActionHandler.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/host/ActionHandler.java
index 6c7434a83283e..aae73dfee19e4 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/host/ActionHandler.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/host/ActionHandler.java
@@ -4,9 +4,10 @@
package org.chromium.chrome.browser.feed.library.piet.host;
-import android.support.annotation.IntDef;
import android.view.View;
+import androidx.annotation.IntDef;
+
import org.chromium.components.feed.core.proto.ui.piet.ActionsProto.Action;
import org.chromium.components.feed.core.proto.ui.piet.LogDataProto.LogData;
import org.chromium.components.feed.core.proto.ui.piet.PietProto.Frame;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/host/AssetProvider.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/host/AssetProvider.java
index 66b5743949a44..a1cb9b8efa7d1 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/host/AssetProvider.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/host/AssetProvider.java
@@ -6,7 +6,8 @@ package org.chromium.chrome.browser.feed.library.piet.host;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
-import android.support.annotation.VisibleForTesting;
+
+import androidx.annotation.VisibleForTesting;
import org.chromium.base.Consumer;
import org.chromium.base.supplier.Supplier;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/host/TypefaceProvider.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/host/TypefaceProvider.java
index 8a3334bc635f4..7eda5c233b143 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/host/TypefaceProvider.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/host/TypefaceProvider.java
@@ -5,7 +5,8 @@
package org.chromium.chrome.browser.feed.library.piet.host;
import android.graphics.Typeface;
-import android.support.annotation.StringDef;
+
+import androidx.annotation.StringDef;
import org.chromium.base.Consumer;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ui/GradientShader.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ui/GradientShader.java
index d445f49c70ce7..145d7e6b74145 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ui/GradientShader.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ui/GradientShader.java
@@ -10,9 +10,9 @@ import android.graphics.RectF;
import android.graphics.Shader;
import android.graphics.Shader.TileMode;
import android.graphics.drawable.ShapeDrawable;
-import android.support.annotation.VisibleForTesting;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.base.supplier.Supplier;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ui/GridRowView.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ui/GridRowView.java
index 7c7cf5c592d8a..7af9b7eee30e1 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ui/GridRowView.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ui/GridRowView.java
@@ -6,13 +6,13 @@ package org.chromium.chrome.browser.feed.library.piet.ui;
import android.annotation.SuppressLint;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
+import androidx.annotation.VisibleForTesting;
import androidx.core.view.MarginLayoutParamsCompat;
import org.chromium.base.supplier.Supplier;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ui/RoundedCornerMaskCache.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ui/RoundedCornerMaskCache.java
index 0aeca4c07696d..0598bf5f57efd 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ui/RoundedCornerMaskCache.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ui/RoundedCornerMaskCache.java
@@ -11,10 +11,11 @@ import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.PorterDuff.Mode;
import android.graphics.PorterDuffXfermode;
-import android.support.annotation.IntDef;
-import android.support.annotation.VisibleForTesting;
import android.util.LruCache;
+import androidx.annotation.IntDef;
+import androidx.annotation.VisibleForTesting;
+
/** Caches rounded corner masks to save memory and time spent creating them */
public class RoundedCornerMaskCache {
// TODO: Make cache size configurable.
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/deepestcontenttracker/DeepestContentTracker.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/deepestcontenttracker/DeepestContentTracker.java
index 9ae29ce7479f8..259dfcb727b3f 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/deepestcontenttracker/DeepestContentTracker.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/deepestcontenttracker/DeepestContentTracker.java
@@ -4,9 +4,8 @@
package org.chromium.chrome.browser.feed.library.sharedstream.deepestcontenttracker;
-import android.support.annotation.VisibleForTesting;
-
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.api.internal.modelprovider.ModelProvider.ViewDepthProvider;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/logging/SpinnerLogger.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/logging/SpinnerLogger.java
index 3992d9663a7b6..b21423bf0a10f 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/logging/SpinnerLogger.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/logging/SpinnerLogger.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.sharedstream.logging;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.feed.library.api.host.logging.BasicLoggingApi;
import org.chromium.chrome.browser.feed.library.api.host.logging.SpinnerType;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/offlinemonitor/StreamOfflineMonitor.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/offlinemonitor/StreamOfflineMonitor.java
index fe025ce7946e1..ccc9e730f6907 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/offlinemonitor/StreamOfflineMonitor.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/offlinemonitor/StreamOfflineMonitor.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.feed.library.sharedstream.offlinemonitor;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
import org.chromium.base.Consumer;
import org.chromium.chrome.browser.feed.library.api.host.offlineindicator.OfflineIndicatorApi;
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/publicapi/menumeasurer/MenuMeasurer.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/publicapi/menumeasurer/MenuMeasurer.java
index c7aeb2477d34b..86f86ff455d25 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/publicapi/menumeasurer/MenuMeasurer.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/publicapi/menumeasurer/MenuMeasurer.java
@@ -5,7 +5,6 @@
package org.chromium.chrome.browser.feed.library.sharedstream.publicapi.menumeasurer;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
import android.view.View;
import android.view.View.MeasureSpec;
import android.view.ViewGroup;
@@ -13,6 +12,7 @@ import android.widget.ArrayAdapter;
import android.widget.ListAdapter;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.feed.R;
diff --git a/chrome/android/feed/feed_java_sources.gni b/chrome/android/feed/feed_java_sources.gni
index ab4e18bc4cb82..2702d7d67d230 100644
--- a/chrome/android/feed/feed_java_sources.gni
+++ b/chrome/android/feed/feed_java_sources.gni
@@ -9,12 +9,12 @@ 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_annotation_annotation_java",
"//third_party/android_deps:androidx_collection_collection_java",
"//third_party/android_deps:androidx_recyclerview_recyclerview_java",
"//third_party/android_deps:androidx_swiperefreshlayout_swiperefreshlayout_java",
"//third_party/android_deps:com_android_support_cardview_v7_java",
"//third_party/android_deps:com_android_support_interpolator_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
"//third_party/android_deps:javax_inject_javax_inject_java",
"//third_party/jsr-305:jsr_305_javalib",
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java
index e98400828059c..78b10714e1873 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java
@@ -6,9 +6,10 @@ package org.chromium.chrome.browser.compositor.bottombar.ephemeraltab;
import android.graphics.drawable.Drawable;
import android.os.Handler;
-import android.support.annotation.DrawableRes;
import android.text.TextUtils;
+import androidx.annotation.DrawableRes;
+
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ntp.NewTabPage;
import org.chromium.chrome.browser.profiles.Profile;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java
index bcf6f79126fa0..f34cacf970d68 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java
@@ -7,8 +7,6 @@ package org.chromium.chrome.browser.compositor.bottombar.ephemeraltab;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.TransitionDrawable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -17,6 +15,9 @@ import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.thinwebview.ThinWebView;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchContext.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchContext.java
index a9dcf7c2fb77d..313415dae0ef9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchContext.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchContext.java
@@ -4,9 +4,9 @@
package org.chromium.chrome.browser.contextualsearch;
-import android.support.annotation.NonNull;
import android.text.TextUtils;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicy.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicy.java
index 4edc339707603..fa62b0e58501e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicy.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicy.java
@@ -6,11 +6,11 @@ package org.chromium.chrome.browser.contextualsearch;
import android.content.Context;
import android.net.Uri;
-import android.support.annotation.NonNull;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.text.format.DateUtils;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java
index c008f20ddfeeb..9c61bdc77708c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java
@@ -4,8 +4,7 @@
package org.chromium.chrome.browser.customtabs;
-import android.support.annotation.IntDef;
-
+import androidx.annotation.IntDef;
import androidx.browser.customtabs.CustomTabsSessionToken;
import org.chromium.base.metrics.RecordHistogram;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIncognitoManager.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIncognitoManager.java
index fc4db2b37f237..6e321e8ec9b68 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIncognitoManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIncognitoManager.java
@@ -4,9 +4,10 @@
package org.chromium.chrome.browser.customtabs;
-import android.support.annotation.Nullable;
import android.view.WindowManager;
+import androidx.annotation.Nullable;
+
import org.chromium.base.CommandLine;
import org.chromium.chrome.browser.ChromeActivity;
import org.chromium.chrome.browser.browserservices.BrowserServicesIntentDataProvider;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabSessionHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabSessionHandler.java
index d4c9c35aebef8..654022e2243d4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabSessionHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabSessionHandler.java
@@ -9,10 +9,10 @@ import android.app.PendingIntent;
import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
-import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.widget.RemoteViews;
+import androidx.annotation.Nullable;
import androidx.browser.customtabs.CustomTabsIntent;
import androidx.browser.customtabs.CustomTabsService;
import androidx.browser.customtabs.CustomTabsSessionToken;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeIntentUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeIntentUtil.java
index 7efa13587dbe1..fb8cb518df49b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeIntentUtil.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeIntentUtil.java
@@ -8,7 +8,8 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.provider.Browser;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
import org.chromium.base.ApplicationStatus;
import org.chromium.base.ContextUtils;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/home/list/mutator/DateLabelAdder.java b/chrome/android/java/src/org/chromium/chrome/browser/download/home/list/mutator/DateLabelAdder.java
index 5cc30cd6c30cf..17d73c8f097e1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/home/list/mutator/DateLabelAdder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/home/list/mutator/DateLabelAdder.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.download.home.list.mutator;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.chromium.chrome.browser.download.home.DownloadManagerUiConfig;
import org.chromium.chrome.browser.download.home.JustNowProvider;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/home/list/mutator/DateSorter.java b/chrome/android/java/src/org/chromium/chrome/browser/download/home/list/mutator/DateSorter.java
index d161349ac9310..94a5bf95de136 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/home/list/mutator/DateSorter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/home/list/mutator/DateSorter.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.download.home.list.mutator;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.chromium.chrome.browser.download.home.JustNowProvider;
import org.chromium.chrome.browser.download.home.filter.Filters;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationSheetCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationSheetCoordinator.java
index bbfc30a6a29f4..d473b372431df 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationSheetCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationSheetCoordinator.java
@@ -6,13 +6,14 @@ package org.chromium.chrome.browser.gesturenav;
import android.content.Context;
import android.os.Handler;
-import android.support.annotation.IdRes;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
+import androidx.annotation.IdRes;
+
import org.chromium.base.metrics.RecordHistogram;
import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.R;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationService.java b/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationService.java
index 971fa14f1e83d..75c25d7cbcf8b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationService.java
@@ -10,10 +10,10 @@ import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.IBinder;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
import android.util.SparseIntArray;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import androidx.core.app.NotificationCompat;
import org.chromium.base.ContextUtils;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/answer/AnswerSuggestionProcessor.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/answer/AnswerSuggestionProcessor.java
index 9e6ab664e54a7..5d214922363c8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/answer/AnswerSuggestionProcessor.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/answer/AnswerSuggestionProcessor.java
@@ -6,7 +6,8 @@ package org.chromium.chrome.browser.omnibox.suggestions.answer;
import android.content.Context;
import android.graphics.Bitmap;
-import android.support.annotation.DrawableRes;
+
+import androidx.annotation.DrawableRes;
import org.chromium.base.ThreadUtils;
import org.chromium.base.metrics.RecordHistogram;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewBinder.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewBinder.java
index 655cc84848a3d..b25b6915c6a76 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewBinder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewBinder.java
@@ -6,11 +6,11 @@ package org.chromium.chrome.browser.omnibox.suggestions.base;
import android.content.res.ColorStateList;
import android.content.res.Resources;
-import android.support.annotation.ColorRes;
import android.support.v7.content.res.AppCompatResources;
import android.view.View;
import android.widget.ImageView;
+import androidx.annotation.ColorRes;
import androidx.core.view.ViewCompat;
import org.chromium.base.ApiCompatibilityUtils;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/DecoratedSuggestionView.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/DecoratedSuggestionView.java
index d1e20efaf98c3..aaedf233b34b9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/DecoratedSuggestionView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/DecoratedSuggestionView.java
@@ -5,11 +5,12 @@
package org.chromium.chrome.browser.omnibox.suggestions.base;
import android.content.Context;
-import android.support.annotation.DrawableRes;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
+import androidx.annotation.DrawableRes;
+
import org.chromium.chrome.R;
import org.chromium.components.browser_ui.widget.RoundedCornerImageView;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/SuggestionDrawableState.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/SuggestionDrawableState.java
index 5763dc6127673..7fbc6d01661f8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/SuggestionDrawableState.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/SuggestionDrawableState.java
@@ -9,11 +9,11 @@ import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
import android.support.v7.content.res.AppCompatResources;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
import androidx.core.util.ObjectsCompat;
import org.chromium.base.ApiCompatibilityUtils;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/BasicSuggestionProcessor.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/BasicSuggestionProcessor.java
index 63f985252009e..85d6731035ee2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/BasicSuggestionProcessor.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/BasicSuggestionProcessor.java
@@ -5,9 +5,10 @@
package org.chromium.chrome.browser.omnibox.suggestions.basic;
import android.content.Context;
-import android.support.annotation.DrawableRes;
import android.text.TextUtils;
+import androidx.annotation.DrawableRes;
+
import org.chromium.base.metrics.RecordHistogram;
import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.R;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/SuggestionViewViewBinder.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/SuggestionViewViewBinder.java
index 977957f731e1a..ee2a20a1ef634 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/SuggestionViewViewBinder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/SuggestionViewViewBinder.java
@@ -4,11 +4,12 @@
package org.chromium.chrome.browser.omnibox.suggestions.basic;
-import android.support.annotation.ColorRes;
import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
+import androidx.annotation.ColorRes;
+
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.omnibox.suggestions.SuggestionCommonProperties;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/clipboard/ClipboardSuggestionProcessor.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/clipboard/ClipboardSuggestionProcessor.java
index 9c859e2d366be..666f01e479e28 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/clipboard/ClipboardSuggestionProcessor.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/clipboard/ClipboardSuggestionProcessor.java
@@ -5,7 +5,8 @@
package org.chromium.chrome.browser.omnibox.suggestions.clipboard;
import android.content.Context;
-import android.support.annotation.DrawableRes;
+
+import androidx.annotation.DrawableRes;
import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.R;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewBinder.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewBinder.java
index 0035dc574a727..78e3f053fc023 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewBinder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewBinder.java
@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.omnibox.suggestions.tail;
-import android.support.annotation.ColorRes;
+import androidx.annotation.ColorRes;
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.chrome.R;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogContents.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogContents.java
index ad6a369bb5b82..37c9b54ccb0a2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogContents.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogContents.java
@@ -3,8 +3,8 @@
// found in the LICENSE file.
package org.chromium.chrome.browser.password_manager;
-import android.support.annotation.IdRes;
-import android.support.annotation.Nullable;
+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
import org.chromium.base.Callback;
import org.chromium.ui.modaldialog.ModalDialogManager;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogPasswordChangeContents.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogPasswordChangeContents.java
index 41f3141b4a2b0..f4efeeafc57e6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogPasswordChangeContents.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogPasswordChangeContents.java
@@ -3,8 +3,8 @@
// found in the LICENSE file.
package org.chromium.chrome.browser.password_manager;
-import android.support.annotation.IdRes;
-import android.support.annotation.Nullable;
+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
import org.chromium.base.Callback;
import org.chromium.ui.modaldialog.ModalDialogManager;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java
index 6073eae54effa..07ca122724103 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java
@@ -13,9 +13,9 @@ import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.os.IBinder;
import android.os.RemoteException;
-import android.support.annotation.VisibleForTesting;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.IsReadyToPayService;
import org.chromium.IsReadyToPayServiceCallback;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinder.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinder.java
index ec632c950d39d..64f6de0c6eec1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinder.java
@@ -8,10 +8,10 @@ import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
-import android.support.annotation.VisibleForTesting;
import android.text.TextUtils;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import org.chromium.base.Log;
import org.chromium.chrome.browser.ChromeActivity;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerView.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerView.java
index 9d27a21060fac..2162b72a92bf7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerView.java
@@ -5,12 +5,13 @@
package org.chromium.chrome.browser.payments.handler;
import android.content.Context;
-import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
import android.widget.FrameLayout;
+import androidx.annotation.Nullable;
+
import org.chromium.chrome.R;
import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetContent;
import org.chromium.content_public.browser.RenderCoordinates;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarMediator.java
index 9b421cf980ffb..f301147532613 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarMediator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarMediator.java
@@ -5,9 +5,10 @@
package org.chromium.chrome.browser.payments.handler.toolbar;
import android.os.Handler;
-import android.support.annotation.DrawableRes;
import android.view.View;
+import androidx.annotation.DrawableRes;
+
import org.chromium.base.Log;
import org.chromium.chrome.browser.ChromeActivity;
import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionMediator.java
index cd21fdcd0f9c2..d1c342bb0ab61 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionMediator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionMediator.java
@@ -12,10 +12,11 @@ import android.hardware.fingerprint.FingerprintManager.AuthenticationResult;
import android.os.Build;
import android.os.CancellationSignal;
import android.os.Handler;
-import android.support.annotation.Nullable;
import android.view.View;
import android.view.View.OnClickListener;
+import androidx.annotation.Nullable;
+
import org.chromium.chrome.R;
import org.chromium.chrome.browser.payments.PackageManagerDelegate;
import org.chromium.chrome.browser.payments.PaymentApp;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionView.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionView.java
index a652b163df6ff..e7763287b9f4a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionView.java
@@ -5,13 +5,14 @@
package org.chromium.chrome.browser.payments.micro;
import android.content.Context;
-import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+
import org.chromium.chrome.R;
import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetContent;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPreferencesManager.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPreferencesManager.java
index d7fd4443aa001..61f0456b704e9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPreferencesManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPreferencesManager.java
@@ -4,8 +4,7 @@
package org.chromium.chrome.browser.signin;
-import android.support.annotation.Nullable;
-
+import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java
index fb7e66432b9cc..c7b670cc15ed8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java
@@ -6,11 +6,11 @@ package org.chromium.chrome.browser.webapps;
import android.content.Context;
import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.util.Pair;
+import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import org.chromium.base.ContextUtils;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenCoordinator.java
index 1913fbace2d7f..51bdd68bd209c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenCoordinator.java
@@ -6,9 +6,9 @@ package org.chromium.chrome.browser.webapps.addtohomescreen;
import android.app.Activity;
import android.content.Context;
-import android.support.annotation.StringRes;
import android.text.TextUtils;
+import androidx.annotation.StringRes;
import androidx.annotation.VisibleForTesting;
import org.chromium.base.annotations.CalledByNative;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenDialogView.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenDialogView.java
index e86db45ba1c87..355d35f922b3f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenDialogView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenDialogView.java
@@ -10,7 +10,6 @@ import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.drawable.Icon;
import android.os.Build;
-import android.support.annotation.StringRes;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -22,6 +21,7 @@ import android.widget.LinearLayout;
import android.widget.RatingBar;
import android.widget.TextView;
+import androidx.annotation.StringRes;
import androidx.annotation.VisibleForTesting;
import org.chromium.base.ContextUtils;
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/micro/MicrotransactionRenderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/micro/MicrotransactionRenderTest.java
index e43489b250ad3..c74a89b5f9202 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/micro/MicrotransactionRenderTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/micro/MicrotransactionRenderTest.java
@@ -4,13 +4,13 @@
package org.chromium.chrome.browser.payments.micro;
-import android.support.annotation.Nullable;
import android.support.test.filters.SmallTest;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
+import androidx.annotation.Nullable;
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
import org.junit.Rule;
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActionsNotificationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActionsNotificationTest.java
index e45c3a6ce99a9..4f904f2529845 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActionsNotificationTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActionsNotificationTest.java
@@ -11,9 +11,10 @@ import android.content.ClipboardManager;
import android.content.Context;
import android.os.Build;
import android.service.notification.StatusBarNotification;
-import android.support.annotation.Nullable;
import android.support.test.filters.SmallTest;
+import androidx.annotation.Nullable;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
diff --git a/chrome/browser/touch_to_fill/android/internal/java/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillView.java b/chrome/browser/touch_to_fill/android/internal/java/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillView.java
index a9b28b0717f8c..cdd5807f1494c 100644
--- a/chrome/browser/touch_to_fill/android/internal/java/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillView.java
+++ b/chrome/browser/touch_to_fill/android/internal/java/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillView.java
@@ -9,12 +9,12 @@ import static org.chromium.chrome.browser.touch_to_fill.TouchToFillProperties.FI
import android.content.Context;
import android.content.res.Resources;
-import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.LinearLayout;
import androidx.annotation.DimenRes;
+import androidx.annotation.Nullable;
import androidx.annotation.Px;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
diff --git a/chrome/browser/touch_to_fill/android/internal/java/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillViewHolder.java b/chrome/browser/touch_to_fill/android/internal/java/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillViewHolder.java
index 9e1ce7452bbe9..94490c2091fcf 100644
--- a/chrome/browser/touch_to_fill/android/internal/java/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillViewHolder.java
+++ b/chrome/browser/touch_to_fill/android/internal/java/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillViewHolder.java
@@ -4,11 +4,11 @@
package org.chromium.chrome.browser.touch_to_fill;
-import android.support.annotation.LayoutRes;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.LayoutRes;
import androidx.recyclerview.widget.RecyclerView;
import org.chromium.ui.modelutil.PropertyKey;
diff --git a/chrome/test/android/test_trusted_web_activity/src/org/chromium/chrome/browser/browserservices/TestTrustedWebActivityService.java b/chrome/test/android/test_trusted_web_activity/src/org/chromium/chrome/browser/browserservices/TestTrustedWebActivityService.java
index 789f87fb812d8..fba1f192fd9ee 100644
--- a/chrome/test/android/test_trusted_web_activity/src/org/chromium/chrome/browser/browserservices/TestTrustedWebActivityService.java
+++ b/chrome/test/android/test_trusted_web_activity/src/org/chromium/chrome/browser/browserservices/TestTrustedWebActivityService.java
@@ -5,9 +5,9 @@
package org.chromium.chrome.browser.browserservices;
import android.app.Notification;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.browser.trusted.Token;
import androidx.browser.trusted.TokenStore;
import androidx.browser.trusted.TrustedWebActivityService;
diff --git a/chromecast/base/java/src/org/chromium/chromecast/base/CastSettingsManager.java b/chromecast/base/java/src/org/chromium/chromecast/base/CastSettingsManager.java
index fb0ad4a4b4ecd..541ef31d18353 100644
--- a/chromecast/base/java/src/org/chromium/chromecast/base/CastSettingsManager.java
+++ b/chromecast/base/java/src/org/chromium/chromecast/base/CastSettingsManager.java
@@ -14,7 +14,8 @@ import android.database.ContentObserver;
import android.os.Build;
import android.os.Handler;
import android.provider.Settings;
-import android.support.annotation.VisibleForTesting;
+
+import androidx.annotation.VisibleForTesting;
import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
diff --git a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastAudioFocusRequest.java b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastAudioFocusRequest.java
index 76b5548565820..2e29357708365 100644
--- a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastAudioFocusRequest.java
+++ b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastAudioFocusRequest.java
@@ -8,7 +8,8 @@ import android.media.AudioAttributes;
import android.media.AudioFocusRequest;
import android.media.AudioManager;
import android.os.Build;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
import org.chromium.base.Log;
diff --git a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastAudioManager.java b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastAudioManager.java
index dbbbcab72f58f..22b77a63bb24e 100644
--- a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastAudioManager.java
+++ b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastAudioManager.java
@@ -11,8 +11,8 @@ import android.media.AudioManager;
import android.media.audiopolicy.AudioPolicy;
import android.os.Build;
import android.os.Build.VERSION_CODES;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import org.chromium.base.Log;
diff --git a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsActivity.java b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsActivity.java
index cece6d2ca39a3..cbee3b71f5acf 100644
--- a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsActivity.java
+++ b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsActivity.java
@@ -12,7 +12,6 @@ import android.media.AudioManager;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.Nullable;
import android.view.MotionEvent;
import android.view.View;
import android.view.Window;
@@ -20,6 +19,8 @@ import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.Toast;
+import androidx.annotation.Nullable;
+
import org.chromium.base.Log;
import org.chromium.base.annotations.RemovableInRelease;
import org.chromium.chromecast.base.Both;
diff --git a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsScopes.java b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsScopes.java
index 46e6a8875249f..029110257ae34 100644
--- a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsScopes.java
+++ b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsScopes.java
@@ -8,10 +8,11 @@ import android.app.Activity;
import android.content.Context;
import android.graphics.drawable.ColorDrawable;
import android.os.IBinder;
-import android.support.annotation.ColorInt;
-import android.support.annotation.Nullable;
import android.widget.FrameLayout;
+import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
+
import org.chromium.chromecast.base.Observer;
import org.chromium.components.embedder_support.view.ContentView;
import org.chromium.components.embedder_support.view.ContentViewRenderView;
diff --git a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsView.java b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsView.java
index 1c8afb0c9f72a..c6c5b15519505 100644
--- a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsView.java
+++ b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsView.java
@@ -10,13 +10,14 @@ import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
import android.os.IBinder;
-import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.accessibility.AccessibilityNodeProvider;
import android.widget.FrameLayout;
+import androidx.annotation.Nullable;
+
import org.chromium.base.Log;
import org.chromium.chromecast.base.CastSwitches;
diff --git a/chromecast/media/cma/backend/android/java/src/org/chromium/chromecast/cma/backend/android/AudioSinkAudioTrackImpl.java b/chromecast/media/cma/backend/android/java/src/org/chromium/chromecast/cma/backend/android/AudioSinkAudioTrackImpl.java
index 3ece72555b060..e749b5a3f2ae0 100644
--- a/chromecast/media/cma/backend/android/java/src/org/chromium/chromecast/cma/backend/android/AudioSinkAudioTrackImpl.java
+++ b/chromecast/media/cma/backend/android/java/src/org/chromium/chromecast/cma/backend/android/AudioSinkAudioTrackImpl.java
@@ -13,9 +13,10 @@ import android.media.AudioTimestamp;
import android.media.AudioTrack;
import android.os.Build;
import android.os.SystemClock;
-import android.support.annotation.IntDef;
import android.util.SparseIntArray;
+import androidx.annotation.IntDef;
+
import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
import org.chromium.base.annotations.CalledByNative;
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RoundedCornerImageView.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RoundedCornerImageView.java
index 354c7d47f2b8a..e326233fd5064 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RoundedCornerImageView.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RoundedCornerImageView.java
@@ -19,11 +19,11 @@ import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.shapes.RoundRectShape;
import android.graphics.drawable.shapes.Shape;
-import android.support.annotation.ColorInt;
import android.support.v7.widget.AppCompatImageView;
import android.util.AttributeSet;
import android.widget.ImageView;
+import androidx.annotation.ColorInt;
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat;
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/TintedDrawable.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/TintedDrawable.java
index 870e84cfb4d92..36d7790975193 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/TintedDrawable.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/TintedDrawable.java
@@ -13,9 +13,9 @@ import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.VectorDrawable;
import android.os.Build;
-import android.support.annotation.DrawableRes;
import android.support.v7.content.res.AppCompatResources;
+import androidx.annotation.DrawableRes;
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
import org.chromium.base.annotations.RemovableInRelease;
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/dragreorder/DragReorderableListAdapter.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/dragreorder/DragReorderableListAdapter.java
index 96613ab7cbc68..17894c9f57e7d 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/dragreorder/DragReorderableListAdapter.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/dragreorder/DragReorderableListAdapter.java
@@ -7,8 +7,8 @@ package org.chromium.components.browser_ui.widget.dragreorder;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Color;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.core.graphics.ColorUtils;
import androidx.core.view.ViewCompat;
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/scrim/ScrimMediator.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/scrim/ScrimMediator.java
index 5143a21bad96f..030ae587e69f3 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/scrim/ScrimMediator.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/scrim/ScrimMediator.java
@@ -6,11 +6,11 @@ package org.chromium.components.browser_ui.widget.scrim;
import android.animation.Animator;
import android.animation.ValueAnimator;
-import android.support.annotation.Nullable;
import android.view.MotionEvent;
import android.view.View;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import org.chromium.base.MathUtils;
diff --git a/components/paint_preview/player/android/java/src/org/chromium/components/paintpreview/player/frame/PlayerFrameView.java b/components/paint_preview/player/android/java/src/org/chromium/components/paintpreview/player/frame/PlayerFrameView.java
index b509b72a96bcf..03cf279e8a79b 100644
--- a/components/paint_preview/player/android/java/src/org/chromium/components/paintpreview/player/frame/PlayerFrameView.java
+++ b/components/paint_preview/player/android/java/src/org/chromium/components/paintpreview/player/frame/PlayerFrameView.java
@@ -8,12 +8,13 @@ import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Rect;
-import android.support.annotation.NonNull;
import android.util.Pair;
import android.view.MotionEvent;
import android.view.View;
import android.widget.FrameLayout;
+import androidx.annotation.NonNull;
+
import java.util.List;
/**
diff --git a/components/paint_preview/player/android/junit/src/org/chromium/components/paintpreview/player/frame/PlayerFrameBitmapPainterTest.java b/components/paint_preview/player/android/junit/src/org/chromium/components/paintpreview/player/frame/PlayerFrameBitmapPainterTest.java
index 2b45897f9115f..072c18668cb72 100644
--- a/components/paint_preview/player/android/junit/src/org/chromium/components/paintpreview/player/frame/PlayerFrameBitmapPainterTest.java
+++ b/components/paint_preview/player/android/junit/src/org/chromium/components/paintpreview/player/frame/PlayerFrameBitmapPainterTest.java
@@ -8,8 +8,9 @@ import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import org.junit.Assert;
import org.junit.Test;
diff --git a/components/signin/public/android/java/src/org/chromium/components/signin/identitymanager/IdentityManager.java b/components/signin/public/android/java/src/org/chromium/components/signin/identitymanager/IdentityManager.java
index 655292281fc9b..1fdcf1874576c 100644
--- a/components/signin/public/android/java/src/org/chromium/components/signin/identitymanager/IdentityManager.java
+++ b/components/signin/public/android/java/src/org/chromium/components/signin/identitymanager/IdentityManager.java
@@ -5,9 +5,9 @@
package org.chromium.components.signin.identitymanager;
import android.accounts.Account;
-import android.support.annotation.MainThread;
-import android.support.annotation.Nullable;
+import androidx.annotation.MainThread;
+import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import org.chromium.base.ObserverList;
diff --git a/content/public/android/java/src/org/chromium/content/browser/MediaSessionImpl.java b/content/public/android/java/src/org/chromium/content/browser/MediaSessionImpl.java
index e806c14c3c993..769bb6ed5afe8 100644
--- a/content/public/android/java/src/org/chromium/content/browser/MediaSessionImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/MediaSessionImpl.java
@@ -4,7 +4,7 @@
package org.chromium.content.browser;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.chromium.base.ObserverList;
import org.chromium.base.annotations.CalledByNative;
diff --git a/net/android/java/NetError.template b/net/android/java/NetError.template
index 270283426b403..de6dd01fbfb99 100644
--- a/net/android/java/NetError.template
+++ b/net/android/java/NetError.template
@@ -4,7 +4,7 @@
package org.chromium.net;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_java_tmpl.gni
index 3e6ca43491b0d..251fe28b822d7 100644
--- a/remoting/android/client_java_tmpl.gni
+++ b/remoting/android/client_java_tmpl.gni
@@ -89,9 +89,9 @@ template("remoting_android_client_java_tmpl") {
"//remoting/proto/remoting/v1:directory_proto_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_drawerlayout_java",
"//third_party/android_deps:com_android_support_mediarouter_v7_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
"//ui/android:ui_utils_java",
]
diff --git a/tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/AndroidNullableCheck.java b/tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/AndroidNullableCheck.java
index 0af9197b38351..35e1dee895c14 100644
--- a/tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/AndroidNullableCheck.java
+++ b/tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/AndroidNullableCheck.java
@@ -14,11 +14,11 @@ import com.google.errorprone.matchers.Matchers;
import com.sun.source.tree.AnnotationTree;
/**
- * Assert android.support.annotation.Nullable is used instead of javax.annotation.Nullable.
+ * Assert androidx.annotation.Nullable is used instead of javax.annotation.Nullable.
*/
@AutoService(BugChecker.class)
@BugPattern(name = "AndroidNullableCheck",
- summary = "Use android.support.annotation.Nullable instead of javax.annotation.Nullable.",
+ summary = "Use androidx.annotation.Nullable instead of javax.annotation.Nullable.",
severity = BugPattern.SeverityLevel.ERROR, linkType = BugPattern.LinkType.CUSTOM,
link = "http://crbug.com/771683")
public class AndroidNullableCheck extends BugChecker implements BugChecker.AnnotationTreeMatcher {
diff --git a/ui/android/java/src/org/chromium/ui/drawable/StateListDrawableBuilder.java b/ui/android/java/src/org/chromium/ui/drawable/StateListDrawableBuilder.java
index eb51fd05e6777..735e6c3cfe7d0 100644
--- a/ui/android/java/src/org/chromium/ui/drawable/StateListDrawableBuilder.java
+++ b/ui/android/java/src/org/chromium/ui/drawable/StateListDrawableBuilder.java
@@ -11,9 +11,10 @@ import android.graphics.drawable.AnimatedStateListDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.StateListDrawable;
import android.os.Build;
-import android.support.annotation.DrawableRes;
import android.support.v7.content.res.AppCompatResources;
+import androidx.annotation.DrawableRes;
+
import java.util.ArrayList;
import java.util.List;