diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2017-07-26 20:29:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-26 20:29:06 +0000 |
| commit | 38bc769bac923a216e9381d720ba730bd7b2f5ef (patch) | |
| tree | 0987cb51d27d74f7ff76c75683d6b504bac0e6d4 /base/task_scheduler/test_utils.h | |
| parent | a29e6994243913703862fdbe17c059150c9ae149 (diff) | |
| parent | 54cfa4a2bacc9c43b06c1582d929da42bb165100 (diff) | |
| download | libchrome-38bc769bac923a216e9381d720ba730bd7b2f5ef.tar.gz | |
Revert "libchrome: Uprev the library to r456626 from Chromium" am: e5b2c6fa6f
am: 54cfa4a2ba
Change-Id: I651f5f9421f53c4c10798749155641b3e8bde687
Diffstat (limited to 'base/task_scheduler/test_utils.h')
| -rw-r--r-- | base/task_scheduler/test_utils.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/base/task_scheduler/test_utils.h b/base/task_scheduler/test_utils.h index dbd1227f52..bafd09aa2a 100644 --- a/base/task_scheduler/test_utils.h +++ b/base/task_scheduler/test_utils.h @@ -5,16 +5,15 @@ #ifndef BASE_TASK_SCHEDULER_TEST_UTILS_H_ #define BASE_TASK_SCHEDULER_TEST_UTILS_H_ -namespace base { -namespace internal { -namespace test { +#include "base/logging.h" +#include "build/build_config.h" +#include "testing/gtest/include/gtest/gtest.h" -// An enumeration of possible task scheduler TaskRunner types. Used to -// parametrize relevant task_scheduler tests. -enum class ExecutionMode { PARALLEL, SEQUENCED, SINGLE_THREADED }; - -} // namespace test -} // namespace internal -} // namespace base +// Death tests misbehave on Android. +#if DCHECK_IS_ON() && defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID) +#define EXPECT_DCHECK_DEATH(statement, regex) EXPECT_DEATH(statement, regex) +#else +#define EXPECT_DCHECK_DEATH(statement, regex) +#endif #endif // BASE_TASK_SCHEDULER_TEST_UTILS_H_ |