Remove dependency to android_support_test_runner in webrtc

Make WebRTC compatible with changes introduced in https://crbug.com/1428304

Bug: chromium:1428304
Change-Id: I464a09545dc3a158ea4108bb63c7b8c4a05adc6b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/300263
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Andrey Logvin <landrey@webrtc.org>
Reviewed-by: Xavier Lepaul‎ <xalep@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39763}

DEPS

@@ -349,17 +349,6 @@ deps = {
       'dep_type': 'cipd',
   },
 
-  'src/third_party/android_support_test_runner': {
-      'packages': [
-          {
-              'package': 'chromium/third_party/android_support_test_runner',
-              'version': '96d4bf848cd210fdcbca6bcc8c1b4b39cbd93141',
-          },
-      ],
-      'condition': 'checkout_android',
-      'dep_type': 'cipd',
-  },
-
  'src/third_party/byte_buddy': {
       'packages': [
           {

examples/BUILD.gn

@@ -221,7 +221,7 @@ if (is_android) {
       "../sdk/android:peerconnection_java",
       "../sdk/android:video_api_java",
       "../sdk/android:video_java",
-      "//third_party/android_support_test_runner:runner_java",
+      "//third_party/androidx:androidx_test_monitor_java",
       "//third_party/androidx:androidx_test_runner_java",
       "//third_party/junit",
     ]

examples/aarproject/app/build.gradle

@@ -48,6 +48,6 @@ dependencies {
     implementation fileTree(dir: '../../androidapp/third_party/autobanh/lib', include: ['autobanh.jar'])
     implementation 'androidx.annotation:annotation:1.2.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'com.androidx.test:runner:1.0.1'
+    androidTestImplementation 'com.androidx.test.espresso:espresso-core:3.0.1'
 }

examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java

@@ -14,10 +14,10 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;

sdk/android/BUILD.gn

@@ -1521,9 +1521,9 @@ if (is_android) {
         "//base:base_java_test_support",
         "//rtc_base:base_java",
         "//third_party/android_deps:guava_android_java",
-        "//third_party/android_support_test_runner:rules_java",
-        "//third_party/android_support_test_runner:runner_java",
         "//third_party/androidx:androidx_annotation_annotation_java",
+        "//third_party/androidx:androidx_test_monitor_java",
+        "//third_party/androidx:androidx_test_rules_java",
         "//third_party/androidx:androidx_test_runner_java",
         "//third_party/google-truth:google_truth_java",
         "//third_party/hamcrest:hamcrest_java",
@@ -1680,7 +1680,7 @@ if (is_android) {
       ":video_api_java",
       ":video_java",
       "../../rtc_base:base_java",
-      "//third_party/android_support_test_runner:runner_java",
+      "//third_party/androidx:androidx_test_monitor_java",
       "//third_party/androidx:androidx_test_runner_java",
     ]
   }

sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java

@@ -11,7 +11,7 @@
 package org.webrtc;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SmallTest;

sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java

@@ -11,7 +11,7 @@
 package org.webrtc;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SmallTest;

sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java

@@ -18,8 +18,8 @@ import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CameraManager;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.test.InstrumentationRegistry;
 import androidx.annotation.Nullable;
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SmallTest;

sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java

@@ -21,7 +21,7 @@ import android.graphics.Bitmap;
 import android.graphics.SurfaceTexture;
 import android.opengl.GLES11Ext;
 import android.opengl.GLES20;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;

sdk/android/instrumentationtests/src/org/webrtc/LoggableTest.java

@@ -13,7 +13,7 @@ package org.webrtc;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import android.support.test.InstrumentationRegistry;
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import java.util.ArrayList;
 import org.junit.Test;

sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java

@@ -29,8 +29,8 @@ import android.net.NetworkRequest;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.test.InstrumentationRegistry;
 import androidx.annotation.Nullable;
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SmallTest;
 import java.util.Arrays;

sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java

@@ -17,8 +17,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import android.support.test.InstrumentationRegistry;
 import androidx.annotation.Nullable;
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SmallTest;
 import java.lang.ref.WeakReference;

sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionFactoryTest.java

@@ -10,7 +10,7 @@
 
 package org.webrtc;
 
-import android.support.test.InstrumentationRegistry;
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import org.junit.Test;
 

sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java

@@ -18,7 +18,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
-import android.support.test.InstrumentationRegistry;
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import java.util.Arrays;
 import java.util.List;

sdk/android/instrumentationtests/src/org/webrtc/RtpSenderTest.java

@@ -16,7 +16,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
-import android.support.test.InstrumentationRegistry;
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import java.util.Arrays;
 import org.junit.Before;

sdk/android/instrumentationtests/src/org/webrtc/RtpTransceiverTest.java

@@ -13,7 +13,7 @@ package org.webrtc;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
-import android.support.test.InstrumentationRegistry;
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import java.util.ArrayList;
 import java.util.Arrays;

sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java

@@ -15,11 +15,11 @@ import static org.junit.Assert.fail;
 
 import android.annotation.SuppressLint;
 import android.graphics.Point;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.rule.UiThreadTestRule;
 import android.view.View.MeasureSpec;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
 import androidx.test.filters.MediumTest;
+import androidx.test.rule.UiThreadTestRule;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.List;

sdk/android/instrumentationtests/src/org/webrtc/VideoTrackTest.java

@@ -13,7 +13,7 @@ package org.webrtc;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-import android.support.test.InstrumentationRegistry;
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import org.junit.Before;
 import org.junit.Test;

sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java

@@ -10,7 +10,7 @@
 
 package org.webrtc;
 
-import android.support.test.InstrumentationRegistry;
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import org.junit.Test;
 import org.webrtc.PeerConnectionFactory;