diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/base/test/gtest_util.h | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/test/gtest_util.h')
| -rw-r--r-- | chromium/base/test/gtest_util.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chromium/base/test/gtest_util.h b/chromium/base/test/gtest_util.h index 1db1fae1e2d..443fa1ad829 100644 --- a/chromium/base/test/gtest_util.h +++ b/chromium/base/test/gtest_util.h @@ -9,8 +9,8 @@ #include <utility> #include <vector> +#include "base/check_op.h" #include "base/compiler_specific.h" -#include "base/logging.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,15 +27,8 @@ // is part of the error message), but intentionally do not expose the gtest // death test's full |regex| parameter to avoid users having to verify the exact // syntax of the error message produced by the DCHECK. - -// Official builds will eat stream parameters, so don't check the error message. -#if defined(OFFICIAL_BUILD) && defined(NDEBUG) -#define EXPECT_DCHECK_DEATH(statement) EXPECT_DEATH(statement, "") -#define ASSERT_DCHECK_DEATH(statement) ASSERT_DEATH(statement, "") -#else #define EXPECT_DCHECK_DEATH(statement) EXPECT_DEATH(statement, "Check failed") #define ASSERT_DCHECK_DEATH(statement) ASSERT_DEATH(statement, "Check failed") -#endif // defined(OFFICIAL_BUILD) && defined(NDEBUG) #else // DCHECK_IS_ON() && defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID) |