Migrate test filters to androidx.

Bug: 1005891
Change-Id: I0e7b9fe291ebca3b797a27cd7db6dfbe788d2645
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2247122Reviewed-by: Richard Coles <torne@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@chromium.org>
Cr-Commit-Position: refs/heads/master@{#778960}

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/BrowserControlsTest.java

@@ -6,12 +6,13 @@ package org.chromium.weblayer.test;
 
 import android.os.Build;
 import android.os.RemoteException;
-import android.support.test.filters.SmallTest;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
+import androidx.test.filters.SmallTest;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/BrowserFragmentLifecycleTest.java

@@ -6,10 +6,10 @@ package org.chromium.weblayer.test;
 
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.test.filters.SmallTest;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentManager;
+import androidx.test.filters.SmallTest;
 
 import org.junit.Assert;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/BundleLanguageTest.java

@@ -8,9 +8,10 @@ import android.content.Context;
 import android.content.res.AssetManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.support.test.filters.SmallTest;
 import android.util.SparseArray;
 
+import androidx.test.filters.SmallTest;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/CookieManagerTest.java

@@ -5,9 +5,9 @@
 package org.chromium.weblayer.test;
 
 import android.net.Uri;
-import android.support.test.filters.SmallTest;
 
 import androidx.fragment.app.FragmentManager;
+import androidx.test.filters.SmallTest;
 
 import org.junit.Assert;
 import org.junit.Before;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/CrashReporterTest.java

@@ -6,7 +6,8 @@ package org.chromium.weblayer.test;
 
 import android.os.Bundle;
 import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import org.junit.After;
 import org.junit.Assert;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/DataClearingTest.java

@@ -8,9 +8,8 @@ import static org.chromium.content_public.browser.test.util.TestThreadUtils.runO
 import static org.chromium.weblayer.BrowsingDataType.CACHE;
 import static org.chromium.weblayer.BrowsingDataType.COOKIES_AND_SITE_DATA;
 
-import android.support.test.filters.SmallTest;
-
 import androidx.fragment.app.FragmentManager;
+import androidx.test.filters.SmallTest;
 
 import org.junit.Rule;
 import org.junit.Test;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/DowngradeTest.java

@@ -13,7 +13,8 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import org.junit.After;
 import org.junit.Before;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/DownloadCallbackTest.java

@@ -6,10 +6,11 @@ package org.chromium.weblayer.test;
 
 import android.net.Uri;
 import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
 import android.util.Pair;
 import android.webkit.ValueCallback;
 
+import androidx.test.filters.SmallTest;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/ErrorPageCallbackTest.java

@@ -5,7 +5,8 @@
 package org.chromium.weblayer.test;
 
 import android.net.Uri;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import org.junit.After;
 import org.junit.Assert;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/ExecuteScriptTest.java

@@ -4,7 +4,7 @@
 
 package org.chromium.weblayer.test;
 
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import org.json.JSONObject;
 import org.junit.Assert;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/ExternalNavigationTest.java

@@ -8,9 +8,9 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.test.filters.SmallTest;
 
 import androidx.fragment.app.Fragment;
+import androidx.test.filters.SmallTest;
 
 import org.junit.Assert;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/FindInPageTest.java

@@ -5,7 +5,8 @@
 package org.chromium.weblayer.test;
 
 import android.net.Uri;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import org.junit.Assert;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/FullscreenCallbackTest.java

@@ -4,7 +4,7 @@
 
 package org.chromium.weblayer.test;
 
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import org.junit.Assert;
 import org.junit.Before;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/GeolocationTest.java

@@ -5,7 +5,8 @@
 package org.chromium.weblayer.test;
 
 import android.net.Uri;
-import android.support.test.filters.MediumTest;
+
+import androidx.test.filters.MediumTest;
 
 import org.junit.After;
 import org.junit.Assert;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/InputTypesTest.java

@@ -16,10 +16,10 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Parcelable;
 import android.provider.MediaStore;
-import android.support.test.filters.SmallTest;
 
 import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.Fragment;
+import androidx.test.filters.SmallTest;
 
 import org.junit.After;
 import org.junit.Assert;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/MediaCaptureTest.java

@@ -11,9 +11,10 @@ import android.content.Context;
 import android.os.Build;
 import android.service.notification.StatusBarNotification;
 import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
 import android.webkit.ValueCallback;
 
+import androidx.test.filters.MediumTest;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/NavigationTest.java

@@ -13,7 +13,8 @@ import static org.junit.Assert.assertTrue;
 import static org.chromium.content_public.browser.test.util.TestThreadUtils.runOnUiThreadBlocking;
 
 import android.net.Uri;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import org.hamcrest.Matchers;
 import org.junit.Assert;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/NetworkChangeNotifierTest.java

@@ -5,7 +5,8 @@
 package org.chromium.weblayer.test;
 
 import android.os.RemoteException;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import org.json.JSONException;
 import org.junit.Assert;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/NewTabCallbackTest.java

@@ -4,7 +4,7 @@
 
 package org.chromium.weblayer.test;
 
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import org.junit.Assert;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/ProfileTest.java

@@ -5,9 +5,10 @@
 package org.chromium.weblayer.test;
 
 import android.net.Uri;
-import android.support.test.filters.SmallTest;
 import android.webkit.ValueCallback;
 
+import androidx.test.filters.SmallTest;
+
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/RenderingTest.java

@@ -4,7 +4,7 @@
 
 package org.chromium.weblayer.test;
 
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import org.junit.Assert;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/ResourceLoadingTest.java

@@ -6,12 +6,13 @@ package org.chromium.weblayer.test;
 
 import android.content.Context;
 import android.graphics.drawable.ColorDrawable;
-import android.support.test.filters.SmallTest;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 
+import androidx.test.filters.SmallTest;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/SiteSettingsTest.java

@@ -9,7 +9,7 @@ import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import org.junit.Rule;
 import org.junit.Test;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/SmokeTest.java

@@ -4,9 +4,8 @@
 
 package org.chromium.weblayer.test;
 
-import android.support.test.filters.SmallTest;
-
 import androidx.fragment.app.Fragment;
+import androidx.test.filters.SmallTest;
 
 import org.junit.Assert;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TabCallbackTest.java

@@ -6,7 +6,8 @@ package org.chromium.weblayer.test;
 
 import android.net.Uri;
 import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import org.hamcrest.Matchers;
 import org.junit.Assert;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TabListCallbackTest.java

@@ -4,7 +4,7 @@
 
 package org.chromium.weblayer.test;
 
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import org.junit.Assert;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TabTest.java

@@ -6,7 +6,8 @@ package org.chromium.weblayer.test;
 
 import android.graphics.Bitmap;
 import android.graphics.Color;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import org.junit.Assert;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TopControlsTest.java

@@ -4,10 +4,10 @@
 
 package org.chromium.weblayer.test;
 
-import android.support.test.filters.SmallTest;
 import android.widget.FrameLayout;
 
 import androidx.fragment.app.Fragment;
+import androidx.test.filters.SmallTest;
 
 import org.junit.Rule;
 import org.junit.Test;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/WebLayerLoadingTest.java

@@ -9,7 +9,8 @@ import static org.junit.Assert.assertNotNull;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import org.junit.Before;
 import org.junit.Test;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/WebLayerTest.java

@@ -4,7 +4,7 @@
 
 package org.chromium.weblayer.test;
 
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import org.junit.Assert;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/WebViewCompatibilityTest.java

@@ -5,10 +5,11 @@
 package org.chromium.weblayer.test;
 
 import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import androidx.test.filters.SmallTest;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;

weblayer/public/javatests/org/chromium/weblayer/ObserverListTest.java

@@ -4,7 +4,7 @@
 
 package org.chromium.weblayer;
 
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import org.junit.Assert;
 import org.junit.Test;

weblayer/public/javatests/org/chromium/weblayer/WebViewCompatibilityHelperTest.java

@@ -7,9 +7,10 @@ package org.chromium.weblayer;
 import android.content.Context;
 import android.os.Build;
 import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
 import android.util.Pair;
 
+import androidx.test.filters.SmallTest;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;