aw: Batch AwSettingsTest

Need to ensure AwBrowserProcess.start isn't called multiple
times for a single process. Also add an annotation to disable
batching and use it for app cache tests, since app cache
can only be set once and the setting is global.

Bug: 989569
Change-Id: I360230ac612a004bda94dded1d9dd6cb2e3f14cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2335673Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796424}

android_webview/javatests/src/org/chromium/android_webview/test/AwActivityTestRule.java

@@ -60,6 +60,8 @@ public class AwActivityTestRule extends ActivityTestRule<AwTestRunnerActivity> {
 
     private static final Pattern MAYBE_QUOTED_STRING = Pattern.compile("^(\"?)(.*)\\1$");
 
+    private static boolean sBrowserProcessStarted;
+
     /**
      * An interface to call onCreateWindow(AwContents).
      */
@@ -98,6 +100,9 @@ public class AwActivityTestRule extends ActivityTestRule<AwTestRunnerActivity> {
         }
         if (needsBrowserProcessStarted()) {
             startBrowserProcess();
+        } else {
+            assert !sBrowserProcessStarted
+                : "needsBrowserProcessStarted false and @Batch are incompatible";
         }
     }
 
@@ -171,7 +176,10 @@ public class AwActivityTestRule extends ActivityTestRule<AwTestRunnerActivity> {
     public void startBrowserProcess() {
         // The Activity must be launched in order for proper webview statics to be setup.
         launchActivity();
-        TestThreadUtils.runOnUiThreadBlocking(() -> AwBrowserProcess.start());
+        if (!sBrowserProcessStarted) {
+            sBrowserProcessStarted = true;
+            TestThreadUtils.runOnUiThreadBlocking(() -> AwBrowserProcess.start());
+        }
         if (mBrowserContext != null) {
             TestThreadUtils.runOnUiThreadBlocking(
                     () -> mBrowserContext.setNativePointer(

android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java

@@ -39,10 +39,12 @@ import org.chromium.android_webview.test.util.VideoTestUtil;
 import org.chromium.android_webview.test.util.VideoTestWebServer;
 import org.chromium.base.Callback;
 import org.chromium.base.FileUtils;
+import org.chromium.base.test.util.Batch;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RequiresRestart;
 import org.chromium.base.test.util.TestFileUtil;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.content_public.browser.WebContents;
@@ -72,6 +74,7 @@ import java.util.regex.Pattern;
 @RunWith(AwJUnit4ClassRunner.class)
 @CommandLineFlags.Add({ContentSwitches.HOST_RESOLVER_RULES + "=MAP * 127.0.0.1",
         "enable-features=WebViewOriginCheckForStreamReader"})
+@Batch(Batch.PER_CLASS)
 public class AwSettingsTest {
     @Rule
     public AwActivityTestRule mActivityTestRule =
@@ -2851,6 +2854,7 @@ public class AwSettingsTest {
         }
     }
 
+    @RequiresRestart("Enabling appcache is global and cannot be reversed.")
     @Test
     @SmallTest
     @Feature({"AndroidWebView", "Preferences", "AppCache"})
@@ -2884,6 +2888,7 @@ public class AwSettingsTest {
         }
     }
 
+    @RequiresRestart("Enabling appcache is global and cannot be reversed.")
     @Test
     @SmallTest
     @Feature({"AndroidWebView", "Preferences", "AppCache"})

base/BUILD.gn

@@ -3775,6 +3775,7 @@ if (is_android) {
       "test/android/javatests/src/org/chromium/base/test/util/MetricsUtils.java",
       "test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevel.java",
       "test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheck.java",
+      "test/android/javatests/src/org/chromium/base/test/util/RequiresRestart.java",
       "test/android/javatests/src/org/chromium/base/test/util/Restriction.java",
       "test/android/javatests/src/org/chromium/base/test/util/RestrictionSkipCheck.java",
       "test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java",

base/test/android/javatests/src/org/chromium/base/test/util/RequiresRestart.java

+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.base.test.util;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Overrides a Batch annotation on a class and still require process restart for a particular test
+ * method. This should be used on individual methods only. See comments on Batch for more details.
+ * Optionally supply a message explaining why restart is needed as the value.
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RequiresRestart {
+    String value() default "";
+}

build/android/pylib/local/device/local_device_instrumentation_test_run.py

@@ -471,7 +471,8 @@ class LocalDeviceInstrumentationTestRun(
     batched_tests = dict()
     other_tests = []
     for test in tests:
-      if 'Batch' in test['annotations']:
+      if 'Batch' in test['annotations'] and 'RequiresRestart' not in test[
+          'annotations']:
         batch_name = test['annotations']['Batch']['value']
         if not batch_name:
           batch_name = test['class']