| Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
|
| diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
|
| index 4dd1894a4e3e5955245a08695261ab8fc35b1e8b..24bf77363416d9b977e279807eb5114658120404 100644
|
| --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
|
| +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
|
| @@ -30,7 +30,7 @@ import org.chromium.base.annotations.SuppressFBWarnings;
|
| import org.chromium.base.test.util.CallbackHelper;
|
| import org.chromium.base.test.util.CommandLineFlags;
|
| import org.chromium.base.test.util.Feature;
|
| -import org.chromium.base.test.util.parameter.ParameterizedTest;
|
| +import org.chromium.base.test.util.parameter.SkipParameterization;
|
| import org.chromium.content.browser.BindingManager;
|
| import org.chromium.content.browser.ChildProcessConnection;
|
| import org.chromium.content.browser.ChildProcessLauncherHelper;
|
| @@ -615,7 +615,7 @@ public class AwContentsTest extends AwTestBase {
|
| @Feature({"AndroidWebView"})
|
| @SmallTest
|
| @CommandLineFlags.Add(AwSwitches.WEBVIEW_SANDBOXED_RENDERER)
|
| - @ParameterizedTest.Set
|
| + @SkipParameterization
|
| public void testSandboxedRendererWorks() throws Throwable {
|
| MockBindingManager bindingManager = new MockBindingManager();
|
| ChildProcessLauncherHelper.setBindingManagerForTesting(bindingManager);
|
| @@ -644,7 +644,7 @@ public class AwContentsTest extends AwTestBase {
|
| @Feature({"AndroidWebView"})
|
| @SmallTest
|
| @CommandLineFlags.Add(AwSwitches.WEBVIEW_SANDBOXED_RENDERER)
|
| - @ParameterizedTest.Set
|
| + @SkipParameterization
|
| public void testRendererPriorityStartsHigh() throws Throwable {
|
| MockBindingManager bindingManager = new MockBindingManager();
|
| ChildProcessLauncherHelper.setBindingManagerForTesting(bindingManager);
|
| @@ -666,7 +666,7 @@ public class AwContentsTest extends AwTestBase {
|
| @Feature({"AndroidWebView"})
|
| @SmallTest
|
| @CommandLineFlags.Add(AwSwitches.WEBVIEW_SANDBOXED_RENDERER)
|
| - @ParameterizedTest.Set
|
| + @SkipParameterization
|
| public void testRendererPriorityLow() throws Throwable {
|
| MockBindingManager bindingManager = new MockBindingManager();
|
| ChildProcessLauncherHelper.setBindingManagerForTesting(bindingManager);
|
| @@ -696,7 +696,7 @@ public class AwContentsTest extends AwTestBase {
|
| @Feature({"AndroidWebView"})
|
| @SmallTest
|
| @CommandLineFlags.Add(AwSwitches.WEBVIEW_SANDBOXED_RENDERER)
|
| - @ParameterizedTest.Set
|
| + @SkipParameterization
|
| public void testRendererPriorityManaged() throws Throwable {
|
| MockBindingManager bindingManager = new MockBindingManager();
|
| ChildProcessLauncherHelper.setBindingManagerForTesting(bindingManager);
|
| @@ -729,7 +729,7 @@ public class AwContentsTest extends AwTestBase {
|
| @SmallTest
|
| @UiThreadTest
|
| @CommandLineFlags.Add(AwSwitches.WEBVIEW_SANDBOXED_RENDERER)
|
| - @ParameterizedTest.Set
|
| + @SkipParameterization
|
| public void testPauseDestroyResume() throws Throwable {
|
| AwContents awContents;
|
| awContents = createAwTestContainerView(mContentsClient).getAwContents();
|
|
|