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

media/cast/test/simulator.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.
 
 // Simulate end to end streaming.
 //
 // Input:
 // --source=
 //   WebM used as the source of video and audio frames.
 // --output=
@@ skipping 372 matching lines @@
   video_receiver_config.rtp_max_delay_ms =
       video_sender_config.max_playout_delay.InMilliseconds();
 
   // Loopback transport. Owned by CastTransport.
   LoopBackTransport* receiver_to_sender = new LoopBackTransport(receiver_env);
   LoopBackTransport* sender_to_receiver = new LoopBackTransport(sender_env);
 
   PacketProxy packet_proxy;
 
   // Cast receiver.
-  std::unique_ptr<CastTransport> transport_receiver(
-      new CastTransportImpl(&testing_clock, base::TimeDelta::FromSeconds(1),
-                            base::WrapUnique(new TransportClient(
-                                receiver_env->logger(), &packet_proxy)),
-                            base::WrapUnique(receiver_to_sender), task_runner));
+  std::unique_ptr<CastTransport> transport_receiver(new CastTransportImpl(
+      &testing_clock, base::TimeDelta::FromSeconds(1),
+      base::MakeUnique<TransportClient>(receiver_env->logger(), &packet_proxy),
+      base::WrapUnique(receiver_to_sender), task_runner));
   std::unique_ptr<CastReceiver> cast_receiver(
       CastReceiver::Create(receiver_env, audio_receiver_config,
                            video_receiver_config, transport_receiver.get()));
 
   packet_proxy.receiver = cast_receiver.get();
 
   // Cast sender and transport sender.
   std::unique_ptr<CastTransport> transport_sender(new CastTransportImpl(
       &testing_clock, base::TimeDelta::FromSeconds(1),
-      base::WrapUnique(new TransportClient(sender_env->logger(), nullptr)),
+      base::MakeUnique<TransportClient>(sender_env->logger(), nullptr),
       base::WrapUnique(sender_to_receiver), task_runner));
   std::unique_ptr<CastSender> cast_sender(
       CastSender::Create(sender_env, transport_sender.get()));
 
   // Initialize network simulation model.
   const bool use_network_simulation =
       model.type() == media::cast::proto::INTERRUPTED_POISSON_PROCESS;
   std::unique_ptr<test::InterruptedPoissonProcess> ipp;
   if (use_network_simulation) {
     LOG(INFO) << "Running Poisson based network simulation.";
@@ skipping 316 matching lines @@
   values.SetString("sim-id", sim_id);
 
   std::string extra_data;
   base::JSONWriter::Write(values, &extra_data);
 
   // Run.
   media::cast::RunSimulation(source_path, log_output_path, metrics_output_path,
                              yuv_output_path, extra_data, model);
   return 0;
 }