aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc')
-rw-r--r--www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc b/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc
index 43c62689cd83..755f30ed7957 100644
--- a/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc
+++ b/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc
@@ -1,4 +1,4 @@
---- base/threading/scoped_blocking_call_unittest.cc.orig 2020-07-13 13:43:07 UTC
+--- base/threading/scoped_blocking_call_unittest.cc.orig 2020-11-13 06:36:34 UTC
+++ base/threading/scoped_blocking_call_unittest.cc
@@ -273,7 +273,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA
}
@@ -9,3 +9,12 @@
internal::IOJankMonitoringWindow::kMonitoringWindow * 3 +
internal::IOJankMonitoringWindow::kIOJankInterval * 5;
+@@ -530,7 +530,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, MultiTh
+ // First one starting at 10 seconds (can't start later than that or we'll trip
+ // the kTimeDiscrepancyTimeout per TaskEnvironment's inability to RunUntilIdle()
+ // with pending blocked tasks).
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ // https://crbug.com/1071166
+ #define MAYBE_MultiThreadedOverlappedWindows \
+ DISABLED_MultiThreadedOverlappedWindows