Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

chrome/browser/media/cast_transport_host_filter.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 "chrome/browser/media/cast_transport_host_filter.h"
 
+#include <utility>
+
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/cast_messages.h"
 #include "components/net_log/chrome_net_log.h"
 #include "content/public/browser/browser_thread.h"
 #include "device/power_save_blocker/power_save_blocker.h"
 #include "media/cast/net/cast_transport.h"
 
 namespace {
@@ skipping 152 matching lines @@
           local_end_point, remote_end_point,
           base::Bind(&CastTransportHostFilter::OnStatusChanged,
                      weak_factory_.GetWeakPtr(), channel_id)));
   udp_transport->SetUdpOptions(options);
   std::unique_ptr<media::cast::CastTransport> transport =
       media::cast::CastTransport::Create(
           &clock_, kSendEventsInterval,
           base::MakeUnique<TransportClient>(channel_id, this),
           std::move(udp_transport), base::ThreadTaskRunnerHandle::Get());
   transport->SetOptions(options);
-  id_map_.AddWithID(transport.release(), channel_id);
+  id_map_.AddWithID(std::move(transport), channel_id);
 }
 
 void CastTransportHostFilter::OnDelete(int32_t channel_id) {
   media::cast::CastTransport* transport = id_map_.Lookup(channel_id);
   if (transport) {
     id_map_.Remove(channel_id);
   } else {
     DVLOG(1) << "CastTransportHostFilter::Delete called "
              << "on non-existing channel";
   }
@@ skipping 18 matching lines @@
 
 void CastTransportHostFilter::OnInitializeStream(
     int32_t channel_id,
     const media::cast::CastTransportRtpConfig& config) {
   media::cast::CastTransport* transport = id_map_.Lookup(channel_id);
   if (transport) {
     if (config.rtp_payload_type == media::cast::RtpPayloadType::REMOTE_AUDIO ||
         config.rtp_payload_type == media::cast::RtpPayloadType::REMOTE_VIDEO) {
       // Create CastRemotingSender for this RTP stream.
       remoting_sender_map_.AddWithID(
-          new CastRemotingSender(
+          base::MakeUnique<CastRemotingSender>(
               transport, config, kSendEventsInterval,
               base::Bind(&CastTransportHostFilter::OnCastRemotingSenderEvents,
                          weak_factory_.GetWeakPtr(), channel_id)),
           config.rtp_stream_id);
       DVLOG(3) << "Create CastRemotingSender for stream: "
                << config.rtp_stream_id;
 
       stream_id_map_.insert(std::make_pair(channel_id, config.rtp_stream_id));
     } else {
       transport->InitializeStream(
@@ skipping 153 matching lines @@
     const std::vector<media::cast::FrameEvent>& events) {
   if (events.empty())
     return;
   // PacketEvents can only come from CastTransport via CastTransport::Client
   // interface.
   Send(new CastMsg_RawEvents(channel_id,
                              std::vector<media::cast::PacketEvent>(), events));
 }
 
 }  // namespace cast