From 18a86bfcc1aff2f1df54ccac9363b29dcff238bd Mon Sep 17 00:00:00 2001
From: Andrew Luo <aluo@chromium.org>
Date: Wed, 15 Aug 2018 18:15:19 -0700
Subject: [PATCH] Reland "Default runner to junit4"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a reland of 902093493b608a1172248b85510bea291419c6ca
(the breakage was unrelated)

Original change's description:
> Default runner to junit4
>
> Bug: chromium:868610
> Change-Id: Ifc457d8e74cf42e9ba4d21807721f86c521b35e9
> Reviewed-on: https://webrtc-review.googlesource.com/94440
> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
> Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
> Commit-Queue: Andrew Luo <aluo@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#24350}

TBR: phoglund@webrtc.org, sakal@webrtc.org
Cq-Include-Trybots: master.internal.tryserver.corp.webrtc:linux_internal
Bug: chromium:868610
Change-Id: Ie67829ccca8b652b0231952159ddbc1dae6b2cde
Reviewed-on: https://webrtc-review.googlesource.com/95200
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24367}
---
 examples/androidtests/AndroidManifest.xml            | 5 +----
 sdk/android/instrumentationtests/AndroidManifest.xml | 5 +----
 test/android/AndroidManifest.xml                     | 3 ++-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/examples/androidtests/AndroidManifest.xml b/examples/androidtests/AndroidManifest.xml
index 7ce02dc415..7cd52bc531 100644
--- a/examples/androidtests/AndroidManifest.xml
+++ b/examples/androidtests/AndroidManifest.xml
@@ -20,11 +20,8 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
-    <!-- tools:ignore needed for chromium-junit4 tag. crbug.com/640116
-         TODO(sakal): Remove once the tag is no longer needed. -->
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
         tools:ignore="MissingPrefix"
         android:targetPackage="org.appspot.apprtc"
-        android:label="Tests for AppRTCMobile"
-        chromium-junit4="true"/>
+        android:label="Tests for AppRTCMobile"/>
 </manifest>
diff --git a/sdk/android/instrumentationtests/AndroidManifest.xml b/sdk/android/instrumentationtests/AndroidManifest.xml
index 591932c38e..75df968f13 100644
--- a/sdk/android/instrumentationtests/AndroidManifest.xml
+++ b/sdk/android/instrumentationtests/AndroidManifest.xml
@@ -31,11 +31,8 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
-    <!-- tools:ignore needed for chromium-junit4 tag. crbug.com/640116
-         TODO(sakal): Remove once the tag is no longer needed. -->
     <instrumentation android:name="org.chromium.base.test.BaseChromiumAndroidJUnitRunner"
         tools:ignore="MissingPrefix"
         android:targetPackage="org.webrtc"
-        android:label="Tests for WebRTC Android SDK"
-        chromium-junit4="true"/>
+        android:label="Tests for WebRTC Android SDK"/>
 </manifest>
diff --git a/test/android/AndroidManifest.xml b/test/android/AndroidManifest.xml
index f8eb2e500c..c1ddfd4a02 100644
--- a/test/android/AndroidManifest.xml
+++ b/test/android/AndroidManifest.xml
@@ -41,6 +41,7 @@ be found in the AUTHORS file in the root of the source tree.
 
     <instrumentation android:name="org.chromium.native_test.NativeTestInstrumentationTestRunner"
             android:targetPackage="org.webrtc.native_test"
-            android:label="Instrumentation entry point for org.webrtc.native_test"/>
+            android:label="Instrumentation entry point for org.webrtc.native_test"
+            chromium-junit3="true"/>
 
 </manifest>