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

media/mojo/services/mojo_cdm_allocator.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 "media/mojo/services/mojo_cdm_allocator.h"
 
 #include <limits>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 180 matching lines @@
   // memory available for another MojoCdmBuffer.
   return MojoCdmBuffer::Create(
       std::move(buffer), capacity,
       base::Bind(&MojoCdmAllocator::AddBufferToAvailableMap,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 // Creates a new MojoCdmVideoFrame on every request.
 std::unique_ptr<VideoFrameImpl> MojoCdmAllocator::CreateCdmVideoFrame() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  return base::WrapUnique(new MojoCdmVideoFrame(
+  return base::MakeUnique<MojoCdmVideoFrame>(
       base::Bind(&MojoCdmAllocator::AddBufferToAvailableMap,
-                 weak_ptr_factory_.GetWeakPtr())));
+                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 mojo::ScopedSharedBufferHandle MojoCdmAllocator::AllocateNewBuffer(
     size_t* capacity) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Always pad new allocated buffer so that we don't need to reallocate
   // buffers frequently if requested sizes fluctuate slightly.
   static const size_t kBufferPadding = 512;
 
@@ skipping 29 matching lines @@
 MojoHandle MojoCdmAllocator::GetHandleForTesting(cdm::Buffer* buffer) {
   MojoCdmBuffer* mojo_buffer = static_cast<MojoCdmBuffer*>(buffer);
   return mojo_buffer->Handle().value();
 }
 
 size_t MojoCdmAllocator::GetAvailableBufferCountForTesting() {
   return available_buffers_.size();
 }
 
 }  // namespace media