Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1480)

Unified Diff: media/cdm/ppapi/external_clear_key/clear_key_cdm.cc

Issue 1471043004: Convert various vector_as_array calls to vector::data. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cdm/cenc_utils.cc ('k') | media/cdm/proxy_decryptor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
index 61f082035fc8edb8155a73f6190ce2261a6c66db..de7ff9ab33d565c24e4a4dba4fdab7f4fd2943e0 100644
--- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
@@ -10,7 +10,6 @@
#include "base/bind.h"
#include "base/logging.h"
-#include "base/stl_util.h"
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
#include "media/base/cdm_callback_promise.h"
@@ -204,7 +203,7 @@ void ConvertCdmKeysInfo(const std::vector<media::CdmKeyInformation*>& keys_info,
keys_vector->reserve(keys_info.size());
for (const auto& key_info : keys_info) {
cdm::KeyInformation key;
- key.key_id = vector_as_array(&key_info->key_id);
+ 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;
@@ -747,8 +746,8 @@ void ClearKeyCdm::OnSessionKeysChange(const std::string& session_id,
std::vector<cdm::KeyInformation> keys_vector;
ConvertCdmKeysInfo(keys_info.get(), &keys_vector);
host_->OnSessionKeysChange(new_session_id.data(), new_session_id.length(),
- has_additional_usable_key,
- vector_as_array(&keys_vector), keys_vector.size());
+ has_additional_usable_key, keys_vector.data(),
+ keys_vector.size());
}
void ClearKeyCdm::OnSessionClosed(const std::string& session_id) {
@@ -812,9 +811,9 @@ void ClearKeyCdm::OnLoadSessionUpdated() {
has_received_keys_change_event_for_emulated_loadsession_ = false;
DCHECK(!keys_vector.empty());
ConvertCdmKeysInfo(keys_info.get(), &keys_vector);
- host_->OnSessionKeysChange(
- kLoadableSessionId, strlen(kLoadableSessionId), !keys_vector.empty(),
- vector_as_array(&keys_vector), keys_vector.size());
+ host_->OnSessionKeysChange(kLoadableSessionId, strlen(kLoadableSessionId),
+ !keys_vector.empty(), keys_vector.data(),
+ keys_vector.size());
}
}
« no previous file with comments | « media/cdm/cenc_utils.cc ('k') | media/cdm/proxy_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698