From f87d678736bc79c8af6af3d275632c006668c545 Mon Sep 17 00:00:00 2001
From: Mohamed Heikal <mheikal@chromium.org>
Date: Fri, 17 Mar 2023 16:57:30 +0000
Subject: [PATCH] Fix weblayer/webengine tests from test runner upgrade
Weblayer/webengine has the same issue as webview in that tests run out of process (so cant set InMemorySharedPrefs).
Bug: 1223832
Change-Id: I67e675e06d26a420f51a5c0fd9a3854d1b184f0f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4349075
Reviewed-by: Richard Coles <torne@chromium.org>
Commit-Queue: Richard Coles <torne@chromium.org>
Auto-Submit: Mohamed Heikal <mheikal@chromium.org>
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1118719}
---
.../org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java b/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java
index 0ead0bbcc3814..ee9785a6952a1 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java
@@ -764,7 +764,8 @@ public class BaseChromiumAndroidJUnitRunner extends AndroidJUnitRunner {
&& !f.getName().equals("WebViewChromiumPrefs.xml")
&& !f.getName().equals("org.chromium.android_webview.devui.MainActivity.xml")
&& !f.getName().equals("AwComponentUpdateServicePreferences.xml")
- && !f.getName().equals("ComponentsProviderServicePreferences.xml")) {
+ && !f.getName().equals("ComponentsProviderServicePreferences.xml")
+ && !f.getName().equals("org.chromium.webengine.shell_preferences.xml")) {
if (check) {
badFiles.add(f);
} else {