Commit d9cd08d0 authored by Wei Lee's avatar Wei Lee Committed by Commit Bot

Fix WebUIWorkerTest on Android

Bug: 980846, 1127464, 1132235
Test: run WebUIWorkerTest
Change-Id: I3689724e0ab4ccb83d38b6d64f0ed86fcda8bb46
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2430690
Commit-Queue: Wei Lee <wtlee@chromium.org>
Reviewed-by: default avatarMatt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810657}
parent 944ce1e6
...@@ -45,6 +45,8 @@ namespace { ...@@ -45,6 +45,8 @@ namespace {
using WebUIImplBrowserTest = ContentBrowserTest; using WebUIImplBrowserTest = ContentBrowserTest;
// TODO(crbug.com/154571): Shared workers are not available on Android.
#if !defined(OS_ANDROID)
const char kLoadSharedWorkerScript[] = R"( const char kLoadSharedWorkerScript[] = R"(
new Promise((resolve) => { new Promise((resolve) => {
const sharedWorker = new SharedWorker($1); const sharedWorker = new SharedWorker($1);
...@@ -54,6 +56,7 @@ const char kLoadSharedWorkerScript[] = R"( ...@@ -54,6 +56,7 @@ const char kLoadSharedWorkerScript[] = R"(
sharedWorker.port.postMessage('ping'); sharedWorker.port.postMessage('ping');
}); });
)"; )";
#endif // !defined(OS_ANDROID)
class TestWebUIMessageHandler : public WebUIMessageHandler { class TestWebUIMessageHandler : public WebUIMessageHandler {
public: public:
...@@ -548,18 +551,7 @@ class WebUIWorkerTest : public ContentBrowserTest { ...@@ -548,18 +551,7 @@ class WebUIWorkerTest : public ContentBrowserTest {
}; };
// TODO(crbug.com/154571): Shared workers are not available on Android. // TODO(crbug.com/154571): Shared workers are not available on Android.
#if defined(OS_ANDROID) #if !defined(OS_ANDROID)
#define MAYBE_CanCreateWebUISharedWorkerForWebUI \
DISABLED_CanCreateWebUISharedWorkerForWebUI
#define MAYBE_CannotCreateWebUISharedWorkerForNonWebUI \
DISABLED_CannotCreateWebUISharedWorkerForNonWebUI
#else
#define MAYBE_CanCreateWebUISharedWorkerForWebUI \
CanCreateWebUISharedWorkerForWebUI
#define MAYBE_CannotCreateWebUISharedWorkerForNonWebUI \
CannotCreateWebUISharedWorkerForNonWebUI
#endif
// Verify that we can create SharedWorker with scheme "chrome://" under // Verify that we can create SharedWorker with scheme "chrome://" under
// WebUI page. // WebUI page.
IN_PROC_BROWSER_TEST_F(WebUIWorkerTest, CanCreateWebUISharedWorkerForWebUI) { IN_PROC_BROWSER_TEST_F(WebUIWorkerTest, CanCreateWebUISharedWorkerForWebUI) {
...@@ -598,5 +590,6 @@ IN_PROC_BROWSER_TEST_F(WebUIWorkerTest, ...@@ -598,5 +590,6 @@ IN_PROC_BROWSER_TEST_F(WebUIWorkerTest,
Error: Failed to construct 'SharedWorker')"; Error: Failed to construct 'SharedWorker')";
EXPECT_THAT(result.error, ::testing::StartsWith(expected_failure)); EXPECT_THAT(result.error, ::testing::StartsWith(expected_failure));
} }
#endif // !defined(OS_ANDROID)
} // namespace content } // namespace content
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment