summaryrefslogtreecommitdiffstats
path: root/chromecast
diff options
context:
space:
mode:
authorjrummell <jrummell@chromium.org>2015-10-30 19:33:26 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-31 02:34:12 +0000
commita04c521e8be2db2644e5ed19fdb3979f458e86b1 (patch)
treebdf9fffd5117bca2a15a8f1568ba08e433ffbed6 /chromecast
parenta5ee6277d60307ce8998670b1b4914d64816498b (diff)
downloadchromium_src-a04c521e8be2db2644e5ed19fdb3979f458e86b1.zip
chromium_src-a04c521e8be2db2644e5ed19fdb3979f458e86b1.tar.gz
chromium_src-a04c521e8be2db2644e5ed19fdb3979f458e86b1.tar.bz2
Add constructors for CdmKeyInformation
Add constructors so that the object can be created with all the values specified. TEST=compiles Review URL: https://codereview.chromium.org/1422713006 Cr-Commit-Position: refs/heads/master@{#357261}
Diffstat (limited to 'chromecast')
-rw-r--r--chromecast/media/cdm/browser_cdm_cast.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chromecast/media/cdm/browser_cdm_cast.cc b/chromecast/media/cdm/browser_cdm_cast.cc
index fa4195a..92a0022 100644
--- a/chromecast/media/cdm/browser_cdm_cast.cc
+++ b/chromecast/media/cdm/browser_cdm_cast.cc
@@ -136,10 +136,8 @@ void BrowserCdmCast::OnSessionKeysChange(
const ::media::KeyIdAndKeyPairs& keys) {
::media::CdmKeysInfo cdm_keys_info;
for (const std::pair<std::string, std::string>& key : keys) {
- scoped_ptr< ::media::CdmKeyInformation> cdm_key_information(
- new ::media::CdmKeyInformation());
- cdm_key_information->key_id.assign(key.first.begin(), key.first.end());
- cdm_keys_info.push_back(cdm_key_information.release());
+ cdm_keys_info.push_back(new ::media::CdmKeyInformation(
+ key.first, ::media::CdmKeyInformation::USABLE, 0));
}
session_keys_change_cb_.Run(session_id, true, cdm_keys_info.Pass());