android_webview: Make system_webview_shell_layout_test_apk and...

android_webview: Make system_webview_shell_layout_test_apk and webview_ui_test_app_test_apk use BaseChromiumAndroidJUnitRunner

Using this instrumentation class will soon be required when using Base's
test runner.

Bug: 441859
Change-Id: I4e1df9abb143bbd5440bcbfd1c1384e9a039ea78
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1625014
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#662233}

android_webview/tools/automated_ui_tests/javatests/AndroidManifest.xml

@@ -19,7 +19,7 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+    <instrumentation android:name="org.chromium.base.test.BaseChromiumAndroidJUnitRunner"
         android:targetPackage="org.chromium.webview_ui_test"
         android:label="Tests for org.chromium.webview_ui_test"/>
 </manifest>

android_webview/tools/system_webview_shell/layout_tests/AndroidManifest.xml

@@ -30,7 +30,7 @@
             android:exported="true"/>
     </application>
 
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+    <instrumentation android:name="org.chromium.base.test.BaseChromiumAndroidJUnitRunner"
         android:targetPackage="org.chromium.webview_shell"
         android:label="Layout tests for org.chromium.webview_shell"/>
 </manifest>