Commit 80f732a5 authored by Minggang Wang's avatar Minggang Wang Committed by Commit Bot

Re-enable SplitCacheDedicatedWorkers and SplitCacheDedicatedWorkersScripts

This patch re-enables SplitCacheDedicatedWorkers and
SplitCacheDedicatedWorkersScripts tests on Windows platform.

Bug: 1104847
Change-Id: Ibc0741fdadcbca6ce8db265ceb805a23928bb3aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2417496Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Minggang Wang <minggang.wang@intel.com>
Cr-Commit-Position: refs/heads/master@{#808688}
parent 7a5a696b
...@@ -619,14 +619,8 @@ IN_PROC_BROWSER_TEST_F(SplitCacheContentBrowserTestDisabled, NonSplitCache) { ...@@ -619,14 +619,8 @@ IN_PROC_BROWSER_TEST_F(SplitCacheContentBrowserTestDisabled, NonSplitCache) {
GenURL("c.com", "/title1.html"))); GenURL("c.com", "/title1.html")));
} }
// TODO(http://crbug.com/1104847): Flaky on Win10.
#if defined(OS_WIN)
#define MAYBE_SplitCacheDedicatedWorkers DISABLED_SplitCacheDedicatedWorkers
#else
#define MAYBE_SplitCacheDedicatedWorkers SplitCacheDedicatedWorkers
#endif
IN_PROC_BROWSER_TEST_F(SplitCacheWithFrameOriginContentBrowserTest, IN_PROC_BROWSER_TEST_F(SplitCacheWithFrameOriginContentBrowserTest,
MAYBE_SplitCacheDedicatedWorkers) { SplitCacheDedicatedWorkers) {
// Load 3p.com/script from a.com's worker. The first time it's loaded from the // Load 3p.com/script from a.com's worker. The first time it's loaded from the
// network and the second it's cached. // network and the second it's cached.
EXPECT_FALSE(TestResourceLoadFromDedicatedWorker( EXPECT_FALSE(TestResourceLoadFromDedicatedWorker(
...@@ -768,16 +762,8 @@ IN_PROC_BROWSER_TEST_P(SplitCacheContentBrowserTestEnabled, ...@@ -768,16 +762,8 @@ IN_PROC_BROWSER_TEST_P(SplitCacheContentBrowserTestEnabled,
GenURL("e.com", "/worker.js"))); GenURL("e.com", "/worker.js")));
} }
#if defined(OS_WIN)
// Flaky on Windows: https://crbug.com/1104847
#define MAYBE_SplitCacheDedicatedWorkersScripts \
DISABLED_SplitCacheDedicatedWorkersScripts
#else
#define MAYBE_SplitCacheDedicatedWorkersScripts \
SplitCacheDedicatedWorkersScripts
#endif
IN_PROC_BROWSER_TEST_P(SplitCacheContentBrowserTestEnabled, IN_PROC_BROWSER_TEST_P(SplitCacheContentBrowserTestEnabled,
MAYBE_SplitCacheDedicatedWorkersScripts) { SplitCacheDedicatedWorkersScripts) {
// Load a.com's worker. The first time the worker script is loaded from the // Load a.com's worker. The first time the worker script is loaded from the
// network and the second it's cached. // network and the second it's cached.
EXPECT_FALSE(DedicatedWorkerScriptCached( EXPECT_FALSE(DedicatedWorkerScriptCached(
......
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