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

media/mojo/services/test_mojo_media_client.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/services/test_mojo_media_client.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 73 matching lines @@
 AudioRendererSink* TestMojoMediaClient::GetAudioRendererSink() {
   if (!audio_renderer_sink_)
     audio_renderer_sink_ = new AudioOutputStreamSink();
 
   return audio_renderer_sink_.get();
 }
 
 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();
 }
 
 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