Add support for persistent sparse histograms.

base/metrics/histogram_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/metrics/histogram.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 19 matching lines @@
 // Test parameter indicates if a persistent memory allocator should be used
 // for histogram allocation. False will allocate histograms from the process
 // heap.
 class HistogramTest : public testing::TestWithParam<bool> {
  protected:
   const int32_t kAllocatorMemorySize = 8 << 20;  // 8 MiB
 
   HistogramTest() : use_persistent_histogram_allocator_(GetParam()) {}
 
   void SetUp() override {
+    if (use_persistent_histogram_allocator_)
+      CreatePersistentHistogramAllocator();
+
     // Each test will have a clean state (no Histogram / BucketRanges
     // registered).
     InitializeStatisticsRecorder();
-    if (use_persistent_histogram_allocator_)
-      CreatePersistentHistogramAllocator();
   }
 
   void TearDown() override {
     if (allocator_) {
       ASSERT_FALSE(allocator_->IsFull());
       ASSERT_FALSE(allocator_->IsCorrupt());
     }
     UninitializeStatisticsRecorder();
     DestroyPersistentHistogramAllocator();
   }
 
   void InitializeStatisticsRecorder() {
     StatisticsRecorder::ResetForTesting();
     statistics_recorder_ = new StatisticsRecorder();
   }
 
   void UninitializeStatisticsRecorder() {
     delete statistics_recorder_;
     statistics_recorder_ = NULL;
   }
 
   void CreatePersistentHistogramAllocator() {
     // By getting the results-histogram before any persistent allocator
     // is attached, that histogram is guaranteed not to be stored in
     // any persistent memory segment (which simplifies some tests).
     PersistentHistogramAllocator::GetCreateHistogramResultHistogram();
 
-    if (!allocator_memory_)
-      allocator_memory_.reset(new char[kAllocatorMemorySize]);
-
-    PersistentHistogramAllocator::ReleaseGlobalAllocatorForTesting();
-    memset(allocator_memory_.get(), 0, kAllocatorMemorySize);
-    PersistentHistogramAllocator::CreateGlobalAllocatorOnPersistentMemory(
-        allocator_memory_.get(), kAllocatorMemorySize, 0, 0,
-        "HistogramAllocatorTest");
+    PersistentHistogramAllocator::CreateGlobalAllocatorOnLocalMemory(
+        kAllocatorMemorySize, 0, "HistogramAllocatorTest");
     allocator_ =
         PersistentHistogramAllocator::GetGlobalAllocator()->memory_allocator();
   }
 
   void DestroyPersistentHistogramAllocator() {
     allocator_ = nullptr;
     PersistentHistogramAllocator::ReleaseGlobalAllocatorForTesting();
   }
 
   const bool use_persistent_histogram_allocator_;
@@ skipping 618 matching lines @@
   // CustomHistogram needs at least 1 valid range.
   custom_ranges.clear();
   custom_ranges.push_back(0);
   EXPECT_DEATH(CustomHistogram::FactoryGet("BadRangesCustom3", custom_ranges,
                                            HistogramBase::kNoFlags),
                "");
 }
 #endif
 
 }  // namespace base