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

base/debug/activity_analyzer.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 "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/logging.h"
@@ skipping 34 matching lines @@
   // Map the file read-write so it can guarantee consistency between
   // the analyzer and any trackers that my still be active.
   std::unique_ptr<MemoryMappedFile> mmfile(new MemoryMappedFile());
   mmfile->Initialize(file_path, MemoryMappedFile::READ_WRITE);
   if (!mmfile->IsValid())
     return nullptr;
 
   if (!FilePersistentMemoryAllocator::IsFileAcceptable(*mmfile, true))
     return nullptr;
 
-  return WrapUnique(new GlobalActivityAnalyzer(
-             WrapUnique(new FilePersistentMemoryAllocator(
-                            std::move(mmfile), 0, 0, base::StringPiece(),
-                            true))));
+  return WrapUnique(
+      new GlobalActivityAnalyzer(MakeUnique<FilePersistentMemoryAllocator>(
+          std::move(mmfile), 0, 0, base::StringPiece(), true)));
 }
 #endif  // !defined(OS_NACL)
 
 ThreadActivityAnalyzer* GlobalActivityAnalyzer::GetFirstAnalyzer() {
   PrepareAllAnalyzers();
   analyzers_iterator_ = analyzers_.begin();
   if (analyzers_iterator_ == analyzers_.end())
     return nullptr;
   return analyzers_iterator_->second.get();
 }
@@ skipping 51 matching lines @@
     // Add this analyzer to the map of known ones, indexed by a unique thread
     // identifier.
     DCHECK(!base::ContainsKey(analyzers_, analyzer->GetThreadKey()));
     analyzer->allocator_reference_ = ref;
     analyzers_[analyzer->GetThreadKey()] = std::move(analyzer);
   }
 }
 
 }  // namespace debug
 }  // namespace base