diff options
| author | Hidehiko Abe <hidehiko@google.com> | 2018-02-22 15:17:33 +0900 |
|---|---|---|
| committer | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-22 16:11:59 +0000 |
| commit | d2e5e07e17255851b7985e0696ac92322a5e813a (patch) | |
| tree | 088506d9df716165e2d61c0774cc112a4ca6cda7 /base/metrics/sample_map_unittest.cc | |
| parent | d922ff7bb031e80f5ff9359a556227d0a3810e1e (diff) | |
| download | libchrome-d2e5e07e17255851b7985e0696ac92322a5e813a.tar.gz | |
Remove modification related DEATH_TEST.
Defer DEATH_TEST handling to the Chrome implementation.
Bug: 73270448
Test: Built locally and ran libchrome_test. Treehugger.
Change-Id: I2fd07559e22317898ee2ff65a2bc7e0436c8955d
Diffstat (limited to 'base/metrics/sample_map_unittest.cc')
| -rw-r--r-- | base/metrics/sample_map_unittest.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/base/metrics/sample_map_unittest.cc b/base/metrics/sample_map_unittest.cc index 9d7e818bb7..91a9dcf40f 100644 --- a/base/metrics/sample_map_unittest.cc +++ b/base/metrics/sample_map_unittest.cc @@ -145,8 +145,6 @@ TEST(SampleMapIteratorTest, SkipEmptyRanges) { EXPECT_TRUE(it->Done()); } -#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST - TEST(SampleMapIteratorDeathTest, IterateDoneTest) { SampleMap samples(1); @@ -157,17 +155,14 @@ TEST(SampleMapIteratorDeathTest, IterateDoneTest) { HistogramBase::Sample min; HistogramBase::Sample max; HistogramBase::Count count; - EXPECT_DEATH(it->Get(&min, &max, &count), ""); + EXPECT_DCHECK_DEATH(it->Get(&min, &max, &count)); - EXPECT_DEATH(it->Next(), ""); + EXPECT_DCHECK_DEATH(it->Next()); samples.Accumulate(1, 100); it = samples.Iterator(); EXPECT_FALSE(it->Done()); } -#endif -// (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST - } // namespace } // namespace base |