From 44b919c10a85d85d32e92b2fb2bb5b3e793d2c17 Mon Sep 17 00:00:00 2001
From: Byoungchan Lee <daniel.l@hpcnt.com>
Date: Thu, 26 Aug 2021 09:21:22 +0900
Subject: [PATCH] Remove use of UiThreadTestRule and migrate to UiThreadTest in
 chromium
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove android.support.test.rule.UiThreadTestRule as chromium did in [1] and
Replace android.support.test.annotation.UiThreadTest
with org.chromium.base.test.UiThreadTest.

Also remove unused uiThreadHandler from NetworkMonitorTest.

[1] https://crrev.com/c/2332301

Bug: webrtc:11962
Change-Id: I8f3781d43d4d53d8158c39c81568d8b09b2bec6a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/230220
Reviewed-by: Xavier Lepaul‎ <xalep@webrtc.org>
Commit-Queue: Byoungchan Lee <daniel.l@hpcnt.com>
Cr-Commit-Position: refs/heads/main@{#34864}
---
 sdk/android/BUILD.gn                           |  1 -
 .../src/org/webrtc/NetworkMonitorTest.java     | 18 +-----------------
 .../SurfaceViewRendererOnMeasureTest.java      |  5 +----
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index ec3454e135..9ccf002fc3 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -1450,7 +1450,6 @@ 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_runner_java",
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
index b9d1a01311..a30292c5cb 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
@@ -25,13 +25,12 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.rule.UiThreadTestRule;
 import androidx.annotation.Nullable;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SmallTest;
 import java.util.List;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
+import org.chromium.base.test.UiThreadTest;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -51,8 +50,6 @@ import org.webrtc.NetworkMonitorAutoDetect.NetworkState;
 @SuppressLint("NewApi")
 @RunWith(BaseJUnit4ClassRunner.class)
 public class NetworkMonitorTest {
-  @Rule public UiThreadTestRule uiThreadTestRule = new UiThreadTestRule();
-
   private static final long INVALID_NET_ID = -1;
   private NetworkChangeDetector detector;
 
@@ -164,23 +161,10 @@ public class NetworkMonitorTest {
     }
   }
 
-  private static final Object lock = new Object();
-  private static @Nullable Handler uiThreadHandler;
-
   private NetworkMonitorAutoDetect receiver;
   private MockConnectivityManagerDelegate connectivityDelegate;
   private MockWifiManagerDelegate wifiDelegate;
 
-  private static Handler getUiThreadHandler() {
-    synchronized (lock) {
-      Handler handler = uiThreadHandler;
-      if (handler != null) {
-        return handler;
-      }
-      return uiThreadHandler = new Handler(Looper.getMainLooper());
-    }
-  }
-
   /**
    * Helper method to create a network monitor and delegates for testing.
    */
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java b/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
index a4938d7939..6c30610de8 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
@@ -16,22 +16,19 @@ 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.filters.MediumTest;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.List;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
+import org.chromium.base.test.UiThreadTest;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(BaseJUnit4ClassRunner.class)
 public class SurfaceViewRendererOnMeasureTest {
-  @Rule public UiThreadTestRule uiThreadTestRule = new UiThreadTestRule();
-
   /**
    * List with all possible scaling types.
    */