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

base/metrics/persistent_sample_map_unittest.cc

Index: base/metrics/persistent_sample_map_unittest.cc
diff --git a/base/metrics/persistent_sample_map_unittest.cc b/base/metrics/persistent_sample_map_unittest.cc
index c3f2474b8617ef30a6cb60c12626cc836b70987d..8e070689053099a17d3e62c9722691318b507f8d 100644
--- a/base/metrics/persistent_sample_map_unittest.cc
+++ b/base/metrics/persistent_sample_map_unittest.cc
@@ -16,16 +16,16 @@ namespace {
 
 std::unique_ptr<PersistentHistogramAllocator> CreateHistogramAllocator(
     size_t bytes) {
-  return WrapUnique(new PersistentHistogramAllocator(
-      WrapUnique(new LocalPersistentMemoryAllocator(bytes, 0, ""))));
+  return MakeUnique<PersistentHistogramAllocator>(
+      WrapUnique(new LocalPersistentMemoryAllocator(bytes, 0, "")));

[Nico, 2016/09/12 14:10:17]

The inner WrapUnique() can't be a MakeUnique()? (I think your 'might use private
ctor' bit from the cl description doesn't apply here)

[Adam Rice, 2016/09/13 06:35:32]

Just a quirk of the conversion process. I assumed that nested
WrapUnique()s would be rare. I was wrong.

Fixed.

 }
 
 std::unique_ptr<PersistentHistogramAllocator> DuplicateHistogramAllocator(
     PersistentHistogramAllocator* original) {
-  return WrapUnique(
-      new PersistentHistogramAllocator(WrapUnique(new PersistentMemoryAllocator(
+  return MakeUnique<PersistentHistogramAllocator>(
+      WrapUnique(new PersistentMemoryAllocator(

[Nico, 2016/09/12 14:10:17]

ditto

[Adam Rice, 2016/09/13 06:35:32]

Done.

           const_cast<void*>(original->data()), original->length(), 0,
-          original->Id(), original->Name(), false))));
+          original->Id(), original->Name(), false)));
 }
 
 TEST(PersistentSampleMapTest, AccumulateTest) {