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

media/mojo/services/test_mojo_media_client.cc

Index: media/mojo/services/test_mojo_media_client.cc
diff --git a/media/mojo/services/test_mojo_media_client.cc b/media/mojo/services/test_mojo_media_client.cc
index 9e11d1ecad433c044eb91909b3115a0f202028a0..10c1f15de1a77c7ab19359b050ca3d3a5cd3c380 100644
--- a/media/mojo/services/test_mojo_media_client.cc
+++ b/media/mojo/services/test_mojo_media_client.cc
@@ -91,9 +91,9 @@ AudioRendererSink* TestMojoMediaClient::GetAudioRendererSink() {
 VideoRendererSink* TestMojoMediaClient::GetVideoRendererSink(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
   if (!video_renderer_sink_) {
-    video_renderer_sink_ = base::WrapUnique(
-        new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60),
-                          NullVideoSink::NewFrameCB(), task_runner));
+    video_renderer_sink_ = base::MakeUnique<NullVideoSink>(
+        false, base::TimeDelta::FromSecondsD(1.0 / 60),
+        NullVideoSink::NewFrameCB(), task_runner);
   }
 
   return video_renderer_sink_.get();
@@ -102,7 +102,7 @@ VideoRendererSink* TestMojoMediaClient::GetVideoRendererSink(
 std::unique_ptr<CdmFactory> TestMojoMediaClient::CreateCdmFactory(
     shell::mojom::InterfaceProvider* /* interface_provider */) {
   DVLOG(1) << __FUNCTION__;
-  return base::WrapUnique(new DefaultCdmFactory());
+  return base::MakeUnique<DefaultCdmFactory>();
 }
 
 }  // namespace media