weblayer: run WebLayerBrowserTestsActivity in a separate process.

Bug: 1048790
Change-Id: Id9cecf0c6a621c4688fe8b4a8961d7dee5f466d5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2038079
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#739195}

weblayer/shell/android/browsertests_apk/AndroidManifest.xml

@@ -24,7 +24,8 @@
                   android:launchMode="singleTask"
                   android:theme="@android:style/Theme.Holo.Light.NoActionBar"
                   android:configChanges="orientation|keyboardHidden|keyboard|screenSize"
-                  android:windowSoftInputMode="adjustPan|stateUnspecified">
+                  android:windowSoftInputMode="adjustPan|stateUnspecified"
+                  android:process=":test_process">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -37,6 +38,5 @@
 
     <instrumentation android:name="org.chromium.native_test.NativeTestInstrumentationTestRunner"
             android:label="WebLayerBrowserTests"
-            android:targetPackage="org.chromium.weblayer_browsertests_apk"
-            chromium-junit3="true"/>
+            android:targetPackage="org.chromium.weblayer_browsertests_apk"/>
 </manifest>

weblayer/shell/android/browsertests_apk/DEPS

 include_rules = [
+  "+components/embedder_support",
   "+components/metrics",
   "+content/public/android",
   "+content/public/app",

weblayer/shell/android/browsertests_apk/src/org/chromium/weblayer_browsertests_apk/WebLayerBrowserTestsApplication.java

@@ -6,9 +6,10 @@ package org.chromium.weblayer_browsertests_apk;
 
 import android.content.Context;
 
+import org.chromium.base.ContextUtils;
 import org.chromium.base.PathUtils;
+import org.chromium.components.embedder_support.application.ClassLoaderContextWrapperFactory;
 import org.chromium.native_test.NativeBrowserTestApplication;
-import org.chromium.ui.base.ResourceBundle;
 
 /**
  * A basic weblayer_public.browser.tests {@link android.app.Application}.
@@ -23,7 +24,6 @@ public class WebLayerBrowserTestsApplication extends NativeBrowserTestApplicatio
         if (isBrowserProcess()) {
             // Test-only stuff, see also NativeUnitTest.java.
             PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
-            ResourceBundle.setNoAvailableLocalePaks();
         }
     }
 
@@ -31,5 +31,8 @@ public class WebLayerBrowserTestsApplication extends NativeBrowserTestApplicatio
     protected void setLibraryProcessType() {}
 
     @Override
-    protected void initApplicationContext() {}
+    protected void initApplicationContext() {
+        // Matches the initApplicationContext call in WebLayerImpl.minimalInitForContext.
+        ContextUtils.initApplicationContext(ClassLoaderContextWrapperFactory.get(this));
+    }
 }

weblayer/test/BUILD.gn

@@ -34,6 +34,7 @@ if (is_android) {
       "//base:base_java",
       "//base:base_java_test_support",
       "//base:jni_java",
+      "//components/embedder_support/android:application_java",
       "//components/safe_browsing/android:safe_browsing_java",
       "//content/public/android:content_java",
       "//content/public/test/android:content_java_test_support",