| Index: base/metrics/persistent_histogram_allocator_unittest.cc
|
| diff --git a/base/metrics/persistent_histogram_allocator_unittest.cc b/base/metrics/persistent_histogram_allocator_unittest.cc
|
| index 64abdec73ea340daebec78a76aa864baade67f34..48d4dbdd9f2d6f696c0201f5b3ac51955ecf5cc1 100644
|
| --- a/base/metrics/persistent_histogram_allocator_unittest.cc
|
| +++ b/base/metrics/persistent_histogram_allocator_unittest.cc
|
| @@ -24,19 +24,18 @@ class PersistentHistogramAllocatorTest : public testing::Test {
|
| void CreatePersistentHistogramAllocator() {
|
| allocator_memory_.reset(new char[kAllocatorMemorySize]);
|
|
|
| - PersistentHistogramAllocator::ReleaseGlobalAllocatorForTesting();
|
| + GlobalHistogramAllocator::ReleaseForTesting();
|
| memset(allocator_memory_.get(), 0, kAllocatorMemorySize);
|
| - PersistentHistogramAllocator::GetCreateHistogramResultHistogram();
|
| - PersistentHistogramAllocator::CreateGlobalAllocatorOnPersistentMemory(
|
| + GlobalHistogramAllocator::GetCreateHistogramResultHistogram();
|
| + GlobalHistogramAllocator::CreateWithPersistentMemory(
|
| allocator_memory_.get(), kAllocatorMemorySize, 0, 0,
|
| "PersistentHistogramAllocatorTest");
|
| - allocator_ =
|
| - PersistentHistogramAllocator::GetGlobalAllocator()->memory_allocator();
|
| + allocator_ = GlobalHistogramAllocator::Get()->memory_allocator();
|
| }
|
|
|
| void DestroyPersistentHistogramAllocator() {
|
| allocator_ = nullptr;
|
| - PersistentHistogramAllocator::ReleaseGlobalAllocatorForTesting();
|
| + GlobalHistogramAllocator::ReleaseForTesting();
|
| }
|
|
|
| scoped_ptr<char[]> allocator_memory_;
|
|
|