Reland of Remove ScopedVector from all other codes in media/

chromecast/media/cdm/cast_cdm.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 "chromecast/media/cdm/cast_cdm.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 109 matching lines @@
 void CastCdm::OnSessionClosed(const std::string& session_id) {
   session_closed_cb_.Run(session_id);
 }
 
 void CastCdm::OnSessionKeysChange(const std::string& session_id,
                                   bool newly_usable_keys,
                                   ::media::CdmKeysInfo keys_info) {
   logging::LogMessage log_message(__FILE__, __LINE__, logging::LOG_INFO);
   log_message.stream() << "keystatuseschange ";
   int status_count[::media::CdmKeyInformation::KEY_STATUS_MAX] = {0};
-  for (const auto* key_info : keys_info) {
+  for (const auto& key_info : keys_info) {
     status_count[key_info->status]++;
   }
   for (int i = 0; i != ::media::CdmKeyInformation::KEY_STATUS_MAX; ++i) {
     if (status_count[i] == 0)
       continue;
     log_message.stream()
         << status_count[i] << " "
         << ::media::CdmKeyInformation::KeyStatusToString(
                static_cast<::media::CdmKeyInformation::KeyStatus>(i))
         << " ";
   }
 
   session_keys_change_cb_.Run(session_id, newly_usable_keys,
                               std::move(keys_info));
 
   if (newly_usable_keys)
     player_tracker_impl_->NotifyNewKey();
 }
 
 void CastCdm::OnSessionExpirationUpdate(const std::string& session_id,
                                         base::Time new_expiry_time) {
   session_expiration_update_cb_.Run(session_id, new_expiry_time);
 }
 
 void CastCdm::KeyIdAndKeyPairsToInfo(const ::media::KeyIdAndKeyPairs& keys,
                                      ::media::CdmKeysInfo* keys_info) {
   DCHECK(keys_info);
   for (const std::pair<std::string, std::string>& key : keys) {
-    std::unique_ptr<::media::CdmKeyInformation> cdm_key_information(
-        new ::media::CdmKeyInformation(key.first,
-                                       ::media::CdmKeyInformation::USABLE, 0));
-    keys_info->push_back(cdm_key_information.release());
+    keys_info->push_back(base::MakeUnique<::media::CdmKeyInformation>(
+        key.first, ::media::CdmKeyInformation::USABLE, 0));
   }
 }
 
 // A default empty implementation for subclasses that don't need to provide
 // any key system specific initialization.
 void CastCdm::InitializeInternal() {}
 
 }  // namespace media
 }  // namespace chromecast