Update annotations to androidx.

Bug: 1052460
Change-Id: Iae243b05cdbdacc4997059bbc3a9ee555365cc10
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2099323
Commit-Queue: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749652}

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.
  */

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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 {

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;

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;

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;

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;

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;

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;

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;

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;
 

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 {
     /**

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;

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;

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;

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;

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;

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;
 

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;
 

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;

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;

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;

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",

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;

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;

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;
 

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;
 

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,

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.

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.

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.

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})

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.

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.

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

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.

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. */

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;

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 {

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 {

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;

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 {

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 {

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 {

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,

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;
 
 /**

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;

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;

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;
 

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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}.

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 androidx.annotation.IntDef;
-import android.support.annotation.VisibleForTesting;
-
 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;

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. */

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;

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},

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;