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

media/mojo/common/media_type_converters.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/media_type_converters.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/memory/ptr_util.h"
@@ skipping 399 matching lines @@
   mojo_decrypt_config->subsamples =
       Array<media::mojom::SubsampleEntryPtr>::From(input.subsamples());
   return mojo_decrypt_config;
 }
 
 // static
 std::unique_ptr<media::DecryptConfig>
 TypeConverter<std::unique_ptr<media::DecryptConfig>,
               media::mojom::DecryptConfigPtr>::
     Convert(const media::mojom::DecryptConfigPtr& input) {
-  return base::WrapUnique(new media::DecryptConfig(
+  return base::MakeUnique<media::DecryptConfig>(
       input->key_id, input->iv,
-      input->subsamples.To<std::vector<media::SubsampleEntry>>()));
+      input->subsamples.To<std::vector<media::SubsampleEntry>>());
 }
 
 // static
 media::mojom::DecoderBufferPtr
 TypeConverter<media::mojom::DecoderBufferPtr,
               scoped_refptr<media::DecoderBuffer>>::
     Convert(const scoped_refptr<media::DecoderBuffer>& input) {
   DCHECK(input);
 
   media::mojom::DecoderBufferPtr mojo_buffer(
@@ skipping 150 matching lines @@
   info->status = static_cast<media::mojom::CdmKeyStatus>(input.status);
   info->system_code = input.system_code;
   return info;
 }
 
 // static
 std::unique_ptr<media::CdmKeyInformation>
 TypeConverter<std::unique_ptr<media::CdmKeyInformation>,
               media::mojom::CdmKeyInformationPtr>::
     Convert(const media::mojom::CdmKeyInformationPtr& input) {
-  return base::WrapUnique(new media::CdmKeyInformation(
+  return base::MakeUnique<media::CdmKeyInformation>(
       input->key_id.storage(),
       static_cast<media::CdmKeyInformation::KeyStatus>(input->status),
-      input->system_code));
+      input->system_code);
 }
 
 // static
 media::mojom::CdmConfigPtr
 TypeConverter<media::mojom::CdmConfigPtr, media::CdmConfig>::Convert(
     const media::CdmConfig& input) {
   media::mojom::CdmConfigPtr config(media::mojom::CdmConfig::New());
   config->allow_distinctive_identifier = input.allow_distinctive_identifier;
   config->allow_persistent_state = input.allow_persistent_state;
   config->use_hw_secure_codecs = input.use_hw_secure_codecs;
@@ skipping 105 matching lines @@
       static_cast<media::VideoPixelFormat>(input->format), input->coded_size,
       input->visible_rect, input->natural_size, std::move(input->frame_data),
       base::saturated_cast<size_t>(input->frame_data_size),
       base::saturated_cast<size_t>(input->y_offset),
       base::saturated_cast<size_t>(input->u_offset),
       base::saturated_cast<size_t>(input->v_offset), input->y_stride,
       input->u_stride, input->v_stride, input->timestamp);
 }
 
 }  // namespace mojo