Re-write many calls to WrapUnique() with MakeUnique()

base/metrics/persistent_histogram_allocator_unittest.cc

 // Copyright 2016 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/persistent_histogram_allocator.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/bucket_ranges.h"
@@ skipping 84 matching lines @@
   PersistentMemoryAllocator::Iterator iter(allocator_);
   uint32_t type;
   EXPECT_NE(0U, iter.GetNext(&type));  // Histogram
   EXPECT_NE(0U, iter.GetNext(&type));  // LinearHistogram
   EXPECT_NE(0U, iter.GetNext(&type));  // BooleanHistogram
   EXPECT_NE(0U, iter.GetNext(&type));  // CustomHistogram
   EXPECT_EQ(0U, iter.GetNext(&type));
 
   // Create a second allocator and have it access the memory of the first.
   std::unique_ptr<HistogramBase> recovered;
-  PersistentHistogramAllocator recovery(
-      WrapUnique(new PersistentMemoryAllocator(
-          allocator_memory_.get(), kAllocatorMemorySize, 0, 0, "", false)));
+  PersistentHistogramAllocator recovery(MakeUnique<PersistentMemoryAllocator>(
+      allocator_memory_.get(), kAllocatorMemorySize, 0, 0, "", false));
   PersistentHistogramAllocator::Iterator histogram_iter(&recovery);
 
   recovered = histogram_iter.GetNext();
   ASSERT_TRUE(recovered);
   recovered->CheckName("TestHistogram");
 
   recovered = histogram_iter.GetNext();
   ASSERT_TRUE(recovered);
   recovered->CheckName("TestLinearHistogram");
 
@@ skipping 56 matching lines @@
   histogram->Add(4);
   histogram->Add(1);
   histogram->Add(6);
 
   // Destroy the local SR and ensure that we're back to the initial state.
   local_sr.reset();
   EXPECT_EQ(starting_sr_count, StatisticsRecorder::GetHistogramCount());
 
   // Create a second allocator and have it access the memory of the first.
   std::unique_ptr<HistogramBase> recovered;
-  PersistentHistogramAllocator recovery(
-      WrapUnique(new PersistentMemoryAllocator(
-          allocator_memory_.get(), kAllocatorMemorySize, 0, 0, "", false)));
+  PersistentHistogramAllocator recovery(MakeUnique<PersistentMemoryAllocator>(
+      allocator_memory_.get(), kAllocatorMemorySize, 0, 0, "", false));
   PersistentHistogramAllocator::Iterator histogram_iter(&recovery);
 
   recovered = histogram_iter.GetNext();
   ASSERT_TRUE(recovered);
 
   // Merge the recovered histogram to the SR. It will always be a new object.
   recovery.MergeHistogramDeltaToStatisticsRecorder(recovered.get());
   EXPECT_EQ(starting_sr_count + 1, StatisticsRecorder::GetHistogramCount());
   HistogramBase* found =
       StatisticsRecorder::FindHistogram(recovered->histogram_name());
   ASSERT_TRUE(found);
   EXPECT_NE(recovered.get(), found);
 
   // Ensure that the data got merged, too.
   std::unique_ptr<HistogramSamples> snapshot = found->SnapshotSamples();
   EXPECT_EQ(recovered->SnapshotSamples()->TotalCount(), snapshot->TotalCount());
   EXPECT_EQ(1, snapshot->GetCount(3));
   EXPECT_EQ(2, snapshot->GetCount(1));
   EXPECT_EQ(1, snapshot->GetCount(4));
   EXPECT_EQ(1, snapshot->GetCount(6));
 }
 
 }  // namespace base