aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc
blob: b23c3958b13c459fa1119446d81c976f657feb29 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
--- base/threading/scoped_blocking_call_unittest.cc.orig	2021-05-12 22:05:40 UTC
+++ base/threading/scoped_blocking_call_unittest.cc
@@ -274,7 +274,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA
 }
 
 TEST_F(ScopedBlockingCallIOJankMonitoringTest, OverlappingMultipleWindows) {
-  constexpr auto kJankTiming =
+  auto kJankTiming =
       internal::IOJankMonitoringWindow::kMonitoringWindow * 3 +
       internal::IOJankMonitoringWindow::kIOJankInterval * 5;
 
@@ -531,7 +531,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