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

chrome/browser/metrics/subprocess_metrics_provider_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 "chrome/browser/metrics/subprocess_metrics_provider.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
@@ skipping 67 matching lines @@
 
   ~SubprocessMetricsProviderTest() override {
     base::GlobalHistogramAllocator::ReleaseForTesting();
   }
 
   SubprocessMetricsProvider* provider() { return &provider_; }
 
   std::unique_ptr<base::PersistentHistogramAllocator> CreateDuplicateAllocator(
       base::PersistentHistogramAllocator* allocator) {
     // Just wrap around the data segment in-use by the passed allocator.
-    return WrapUnique(new base::PersistentHistogramAllocator(
-        WrapUnique(new base::PersistentMemoryAllocator(
-            const_cast<void*>(allocator->data()), allocator->length(),
-            0, 0, "", false))));
+    return base::MakeUnique<base::PersistentHistogramAllocator>(
+        base::MakeUnique<base::PersistentMemoryAllocator>(
+            const_cast<void*>(allocator->data()), allocator->length(), 0, 0, "",

[sky, 2016/09/12 17:13:36]

""->std::string

[Adam Rice, 2016/09/13 03:02:49]

Done.

+            false));
   }
 
   size_t GetSnapshotHistogramCount() {
     // Merge the data from the allocator into the StatisticsRecorder.
     provider_.MergeHistogramDeltas();
 
     // Flatten what is known to see what has changed since the last time.
     HistogramFlattenerDeltaRecorder flattener;
     base::HistogramSnapshotManager snapshot_manager(&flattener);
     // "true" to the begin() includes histograms held in persistent storage.
@@ skipping 59 matching lines @@
   foo->Add(10);
   bar->Add(20);
   DeregisterSubprocessAllocator(123);
   EXPECT_EQ(2U, GetSnapshotHistogramCount());
 
   // Further snapshots should be empty even if things have changed.
   foo->Add(10);
   bar->Add(20);
   EXPECT_EQ(0U, GetSnapshotHistogramCount());
 }