From 47701c8c9b8a902b0660550a2729527d7951fbba Mon Sep 17 00:00:00 2001
From: Jeremy Leconte <jleconte@google.com>
Date: Mon, 24 Apr 2023 12:33:45 +0200
Subject: [PATCH] Chromium LocalRobolectricTestRunner has been removed.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow up on https://chromium-review.googlesource.com/c/chromium/src/+/44503.

Change-Id: I28a0789a0af43cfac27081c9b5bcf695e9798910
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/303020
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#39933}
---
 .../src/org/appspot/apprtc/BluetoothManagerTest.java          | 4 ++--
 .../src/org/appspot/apprtc/DirectRTCClientTest.java           | 4 ++--
 .../src/org/appspot/apprtc/TCPChannelClientTest.java          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java b/examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java
index 3060bd7a56..d7c190518c 100644
--- a/examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java
+++ b/examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java
@@ -33,12 +33,12 @@ import androidx.test.core.app.ApplicationProvider;
 import java.util.ArrayList;
 import java.util.List;
 import org.appspot.apprtc.AppRTCBluetoothManager.State;
-import org.chromium.testing.local.LocalRobolectricTestRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
+import org.robolectric.RobolectricTestRunner;
 
 /**
  * Verifies basic behavior of the AppRTCBluetoothManager class.
@@ -46,7 +46,7 @@ import org.robolectric.shadows.ShadowLog;
  * but a mocked version is used instead. Hence, the parts "driven" by the AppRTC
  * audio manager are not included in this test.
  */
-@RunWith(LocalRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class BluetoothManagerTest {
   private static final String TAG = "BluetoothManagerTest";
diff --git a/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java b/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java
index 2da8164ec7..1ee0e41390 100644
--- a/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java
+++ b/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java
@@ -20,12 +20,12 @@ import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-import org.chromium.testing.local.LocalRobolectricTestRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
+import org.robolectric.RobolectricTestRunner;
 import org.webrtc.IceCandidate;
 import org.webrtc.SessionDescription;
 
@@ -33,7 +33,7 @@ import org.webrtc.SessionDescription;
  * Test for DirectRTCClient. Test is very simple and only tests the overall sanity of the class
  * behaviour.
  */
-@RunWith(LocalRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class DirectRTCClientTest {
   private static final String ROOM_URL = "";
diff --git a/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java b/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java
index b301d6317c..ce550b35e4 100644
--- a/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java
+++ b/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java
@@ -15,7 +15,6 @@ import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-import org.chromium.testing.local.LocalRobolectricTestRunner;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -24,12 +23,13 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
+import org.robolectric.RobolectricTestRunner;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-@RunWith(LocalRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class TCPChannelClientTest {
   private static final int PORT = 8888;