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

base/debug/activity_analyzer_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/debug/activity_analyzer.h"
 
 #include <atomic>
 #include <memory>
 
 #include "base/bind.h"
@@ skipping 43 matching lines @@
   ~ActivityAnalyzerTest() override {
     GlobalActivityTracker* global_tracker = GlobalActivityTracker::Get();
     if (global_tracker) {
       global_tracker->ReleaseTrackerForCurrentThreadForTesting();
       delete global_tracker;
     }
   }
 
   std::unique_ptr<ThreadActivityTracker> CreateActivityTracker() {
     std::unique_ptr<char[]> memory(new char[kStackSize]);
-    return WrapUnique(new TestActivityTracker(std::move(memory), kStackSize));
+    return MakeUnique<TestActivityTracker>(std::move(memory), kStackSize);
   }
 
   static void DoNothing() {}
 };
 
 TEST_F(ActivityAnalyzerTest, ThreadAnalyzerConstruction) {
   std::unique_ptr<ThreadActivityTracker> tracker = CreateActivityTracker();
   {
     ThreadActivityAnalyzer analyzer(*tracker);
     EXPECT_TRUE(analyzer.IsValid());
@@ skipping 60 matching lines @@
   ConditionVariable exit_condition_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleActivityThread);
 };
 
 TEST_F(ActivityAnalyzerTest, GlobalAnalyzerConstruction) {
   GlobalActivityTracker::CreateWithLocalMemory(kMemorySize, 0, "", 3);
 
   PersistentMemoryAllocator* allocator =
       GlobalActivityTracker::Get()->allocator();
-  GlobalActivityAnalyzer analyzer(WrapUnique(
-      new PersistentMemoryAllocator(const_cast<void*>(allocator->data()),
-                                    allocator->size(), 0, 0, "", true)));
+  GlobalActivityAnalyzer analyzer(MakeUnique<PersistentMemoryAllocator>(
+      const_cast<void*>(allocator->data()), allocator->size(), 0, 0, "", true));
 
   // The only thread at thois point is the test thread.
   ThreadActivityAnalyzer* ta1 = analyzer.GetFirstAnalyzer();
   ASSERT_TRUE(ta1);
   EXPECT_FALSE(analyzer.GetNextAnalyzer());
   ThreadActivityAnalyzer::ThreadKey tk1 = ta1->GetThreadKey();
   EXPECT_EQ(ta1, analyzer.GetAnalyzerForThread(tk1));
 
   // Create a second thread that will do something.
   SimpleActivityThread t2("t2", nullptr, Activity::ACT_TASK,
@@ skipping 15 matching lines @@
   ThreadActivityAnalyzer* ta2 = analyzer.GetFirstAnalyzer();
   ASSERT_TRUE(ta2);
   EXPECT_FALSE(analyzer.GetNextAnalyzer());
   ThreadActivityAnalyzer::ThreadKey tk2 = ta2->GetThreadKey();
   EXPECT_EQ(ta2, analyzer.GetAnalyzerForThread(tk2));
   EXPECT_EQ(tk1, tk2);
 }
 
 }  // namespace debug
 }  // namespace base