| Index: base/metrics/statistics_recorder_unittest.cc
|
| diff --git a/base/metrics/statistics_recorder_unittest.cc b/base/metrics/statistics_recorder_unittest.cc
|
| index 29caf49110d9c799a944f587a055a7b23b7da2c4..d6027ca364c1d9643225e921cd507475baefd530 100644
|
| --- a/base/metrics/statistics_recorder_unittest.cc
|
| +++ b/base/metrics/statistics_recorder_unittest.cc
|
| @@ -8,6 +8,7 @@
|
| #include "base/json/json_reader.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/metrics/histogram_macros.h"
|
| +#include "base/metrics/histogram_persistence.h"
|
| #include "base/metrics/sparse_histogram.h"
|
| #include "base/metrics/statistics_recorder.h"
|
| #include "base/values.h"
|
| @@ -23,7 +24,10 @@ class StatisticsRecorderTest : public testing::Test {
|
| InitializeStatisticsRecorder();
|
| }
|
|
|
| - void TearDown() override { UninitializeStatisticsRecorder(); }
|
| + void TearDown() override {
|
| + UninitializeStatisticsRecorder();
|
| + SetPersistentHistogramMemoryAllocator(nullptr);
|
| + }
|
|
|
| void InitializeStatisticsRecorder() {
|
| statistics_recorder_ = new StatisticsRecorder();
|
| @@ -313,6 +317,23 @@ TEST_F(StatisticsRecorderTest, ToJSON) {
|
| EXPECT_TRUE(json.empty());
|
| }
|
|
|
| +TEST_F(StatisticsRecorderTest, IterationTest) {
|
| + StatisticsRecorder::Histograms registered_histograms;
|
| + LOCAL_HISTOGRAM_COUNTS("TestHistogram.IterationTest1", 30);
|
| + SetPersistentHistogramMemoryAllocator(
|
| + new LocalPersistentMemoryAllocator(64 << 10, 0, std::string()));
|
| + LOCAL_HISTOGRAM_COUNTS("TestHistogram.IterationTest2", 30);
|
| +
|
| + StatisticsRecorder::HistogramIterator i1 = StatisticsRecorder::begin(true);
|
| + EXPECT_NE(StatisticsRecorder::end(), i1);
|
| + EXPECT_NE(StatisticsRecorder::end(), ++i1);
|
| + EXPECT_EQ(StatisticsRecorder::end(), ++i1);
|
| +
|
| + StatisticsRecorder::HistogramIterator i2 = StatisticsRecorder::begin(false);
|
| + EXPECT_NE(StatisticsRecorder::end(), i2);
|
| + EXPECT_EQ(StatisticsRecorder::end(), ++i2);
|
| +}
|
| +
|
| namespace {
|
|
|
| // CallbackCheckWrapper is simply a convenient way to check and store that
|
|
|