Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7038)

Unified Diff: base/metrics/sparse_histogram_unittest.cc

Issue 1779503002: Fix StatisticsRecorder to handle re-entry during tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: always do global UninitializeForTesting when uninitializing Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/metrics/histogram_unittest.cc ('k') | base/metrics/statistics_recorder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/metrics/sparse_histogram_unittest.cc
diff --git a/base/metrics/sparse_histogram_unittest.cc b/base/metrics/sparse_histogram_unittest.cc
index 42c116786df2a375bc6719b5b0feb395edf51431..0946a67b766329296ecbc2ade2f454fd387eecf2 100644
--- a/base/metrics/sparse_histogram_unittest.cc
+++ b/base/metrics/sparse_histogram_unittest.cc
@@ -47,13 +47,12 @@ class SparseHistogramTest : public testing::TestWithParam<bool> {
}
void InitializeStatisticsRecorder() {
- StatisticsRecorder::ResetForTesting();
- statistics_recorder_ = new StatisticsRecorder();
+ DCHECK(!statistics_recorder_);
+ statistics_recorder_.reset(new StatisticsRecorder());
}
void UninitializeStatisticsRecorder() {
- delete statistics_recorder_;
- statistics_recorder_ = NULL;
+ statistics_recorder_.reset();
}
void CreatePersistentMemoryAllocator() {
@@ -78,7 +77,7 @@ class SparseHistogramTest : public testing::TestWithParam<bool> {
const bool use_persistent_histogram_allocator_;
- StatisticsRecorder* statistics_recorder_;
+ std::unique_ptr<StatisticsRecorder> statistics_recorder_;
PersistentMemoryAllocator* allocator_ = nullptr;
private:
« no previous file with comments | « base/metrics/histogram_unittest.cc ('k') | base/metrics/statistics_recorder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698