Reland of Remove ScopedVector from all other codes in media/

media/blink/cdm_session_adapter.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/blink/cdm_session_adapter.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 180 matching lines @@
 
 void CdmSessionAdapter::OnSessionKeysChange(const std::string& session_id,
                                             bool has_additional_usable_key,
                                             CdmKeysInfo keys_info) {
   WebContentDecryptionModuleSessionImpl* session = GetSession(session_id);
   DLOG_IF(WARNING, !session) << __func__ << " for unknown session "
                              << session_id;
   if (session) {
     DVLOG(2) << __func__ << ": session_id = " << session_id;
     DVLOG(2) << "  - has_additional_usable_key = " << has_additional_usable_key;
-    for (const CdmKeyInformation* info : keys_info)
-      DVLOG(2) << "  - " << *info;
+    for (const auto& info : keys_info)
+      DVLOG(2) << "  - " << *(info.get());
 
     session->OnSessionKeysChange(has_additional_usable_key,
                                  std::move(keys_info));
   }
 }
 
 void CdmSessionAdapter::OnSessionExpirationUpdate(const std::string& session_id,
                                                   base::Time new_expiry_time) {
   WebContentDecryptionModuleSessionImpl* session = GetSession(session_id);
   DLOG_IF(WARNING, !session) << __func__ << " for unknown session "
@@ skipping 22 matching lines @@
 WebContentDecryptionModuleSessionImpl* CdmSessionAdapter::GetSession(
     const std::string& session_id) {
   // Since session objects may get garbage collected, it is possible that there
   // are events coming back from the CDM and the session has been unregistered.
   // We can not tell if the CDM is firing events at sessions that never existed.
   SessionMap::iterator session = sessions_.find(session_id);
   return (session != sessions_.end()) ? session->second.get() : NULL;
 }
 
 }  // namespace media