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

media/mojo/common/mojo_decoder_buffer_converter_unittest.cc

 // Copyright 2014 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/common/mojo_decoder_buffer_converter.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 93 matching lines @@
   const char kIv[] = "0123456789abcdef";
 
   std::vector<SubsampleEntry> subsamples;
   subsamples.push_back(SubsampleEntry(10, 20));
   subsamples.push_back(SubsampleEntry(30, 40));
   subsamples.push_back(SubsampleEntry(50, 60));
 
   scoped_refptr<DecoderBuffer> buffer(DecoderBuffer::CopyFrom(
       reinterpret_cast<const uint8_t*>(&kData), kDataSize));
   buffer->set_decrypt_config(
-      base::WrapUnique(new DecryptConfig(kKeyId, kIv, subsamples)));
+      base::MakeUnique<DecryptConfig>(kKeyId, kIv, subsamples));
 
   scoped_refptr<DecoderBuffer> result = ConvertDecoderBufferAndBack(buffer);
   CompareDecoderBuffer(buffer, result);
 
   // Test empty IV. This is used for clear buffer in an encrypted stream.
-  buffer->set_decrypt_config(base::WrapUnique(
-      new DecryptConfig(kKeyId, "", std::vector<SubsampleEntry>())));
+  buffer->set_decrypt_config(base::MakeUnique<DecryptConfig>(
+      kKeyId, "", std::vector<SubsampleEntry>()));
   result = ConvertDecoderBufferAndBack(buffer);
   CompareDecoderBuffer(buffer, result);
 }
 
 }  // namespace media