Reland of Remove ScopedVector from all other codes in media/

media/cdm/ppapi/external_clear_key/clear_key_cdm.cc

 // Copyright 2013 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/cdm/ppapi/external_clear_key/clear_key_cdm.h"
 
 #include <algorithm>
 #include <cstring>
 #include <sstream>
 #include <utility>
@@ skipping 188 matching lines @@
     case media::CdmKeyInformation::KeyStatus::RELEASED:
       return cdm::kReleased;
   }
   NOTREACHED();
   return cdm::kInternalError;
 }
 
 // Shallow copy all the key information from |keys_info| into |keys_vector|.
 // |keys_vector| is only valid for the lifetime of |keys_info| because it
 // contains pointers into the latter.
-void ConvertCdmKeysInfo(const std::vector<media::CdmKeyInformation*>& keys_info,
+void ConvertCdmKeysInfo(const media::CdmKeysInfo& keys_info,
                         std::vector<cdm::KeyInformation>* keys_vector) {
   keys_vector->reserve(keys_info.size());
   for (const auto& key_info : keys_info) {
     cdm::KeyInformation key;
     key.key_id = key_info->key_id.data();
     key.key_id_size = key_info->key_id.size();
     key.status = ConvertKeyStatus(key_info->status);
     key.system_code = key_info->system_code;
     keys_vector->push_back(key);
   }
@@ skipping 641 matching lines @@
       keys_info_for_emulated_loadsession_.swap(keys_info);
       return;
     }
 
     // Loadable session has already been created, so pass this event on,
     // using the session_id callers expect to see.
     new_session_id = std::string(kLoadableSessionId);
   }
 
   std::vector<cdm::KeyInformation> keys_vector;
-  ConvertCdmKeysInfo(keys_info.get(), &keys_vector);
+  ConvertCdmKeysInfo(keys_info, &keys_vector);
   host_->OnSessionKeysChange(new_session_id.data(), new_session_id.length(),
                              has_additional_usable_key, keys_vector.data(),
                              keys_vector.size());
 }
 
 void ClearKeyCdm::OnSessionClosed(const std::string& session_id) {
   std::string new_session_id = session_id;
   if (new_session_id == session_id_for_emulated_loadsession_)
     new_session_id = std::string(kLoadableSessionId);
   host_->OnSessionClosed(new_session_id.data(), new_session_id.length());
@@ skipping 54 matching lines @@
   // was seen.
   // TODO(jrummell): Once the order of events is fixed in the spec, either
   // require the keyschange event to have happened, or remove this code.
   // http://crbug.com/448225
   if (has_received_keys_change_event_for_emulated_loadsession_) {
     std::vector<cdm::KeyInformation> keys_vector;
     CdmKeysInfo keys_info;
     keys_info.swap(keys_info_for_emulated_loadsession_);
     has_received_keys_change_event_for_emulated_loadsession_ = false;
     DCHECK(!keys_vector.empty());
-    ConvertCdmKeysInfo(keys_info.get(), &keys_vector);
+    ConvertCdmKeysInfo(keys_info, &keys_vector);
     host_->OnSessionKeysChange(kLoadableSessionId, strlen(kLoadableSessionId),
                                !keys_vector.empty(), keys_vector.data(),
                                keys_vector.size());
   }
 }
 
 void ClearKeyCdm::OnPromiseResolved(uint32_t promise_id) {
   host_->OnResolvePromise(promise_id);
 }
 
@@ skipping 106 matching lines @@
                                challenge.data(), challenge.size());
 }
 
 void ClearKeyCdm::VerifyCdmHostTest() {
   // VerifyCdmHost() should have already been called and test result stored
   // in |g_verify_host_files_result|.
   OnUnitTestComplete(g_verify_host_files_result);
 }
 
 }  // namespace media