| Index: base/metrics/sparse_histogram_unittest.cc
|
| diff --git a/base/metrics/sparse_histogram_unittest.cc b/base/metrics/sparse_histogram_unittest.cc
|
| index 5d5dbcbb9b1fb6bc79871c83f84de0e4f748d703..23e9c34782199387d8af864ed828d3da3b86c466 100644
|
| --- a/base/metrics/sparse_histogram_unittest.cc
|
| +++ b/base/metrics/sparse_histogram_unittest.cc
|
| @@ -60,17 +60,16 @@ class SparseHistogramTest : public testing::TestWithParam<bool> {
|
| // 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();
|
| + GlobalHistogramAllocator::GetCreateHistogramResultHistogram();
|
|
|
| - PersistentHistogramAllocator::CreateGlobalAllocatorOnLocalMemory(
|
| + GlobalHistogramAllocator::CreateWithLocalMemory(
|
| kAllocatorMemorySize, 0, "SparseHistogramAllocatorTest");
|
| - allocator_ =
|
| - PersistentHistogramAllocator::GetGlobalAllocator()->memory_allocator();
|
| + allocator_ = GlobalHistogramAllocator::Get()->memory_allocator();
|
| }
|
|
|
| void DestroyPersistentMemoryAllocator() {
|
| allocator_ = nullptr;
|
| - PersistentHistogramAllocator::ReleaseGlobalAllocatorForTesting();
|
| + GlobalHistogramAllocator::ReleaseForTesting();
|
| }
|
|
|
| scoped_ptr<SparseHistogram> NewSparseHistogram(const std::string& name) {
|
| @@ -80,7 +79,6 @@ class SparseHistogramTest : public testing::TestWithParam<bool> {
|
| const bool use_persistent_histogram_allocator_;
|
|
|
| StatisticsRecorder* statistics_recorder_;
|
| - scoped_ptr<char[]> allocator_memory_;
|
| PersistentMemoryAllocator* allocator_ = nullptr;
|
|
|
| private:
|
|
|