Convert KeyInformation from Pepper type to MediaKeys

content/renderer/pepper/content_decryptor_delegate.cc

 // Copyright (c) 2012 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 "content/renderer/pepper/content_decryptor_delegate.h"
 
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/sparse_histogram.h"
@@ skipping 274 matching lines @@
     case PP_CDMEXCEPTIONCODE_CLIENTERROR:
       return MediaKeys::CLIENT_ERROR;
     case PP_CDMEXCEPTIONCODE_OUTPUTERROR:
       return MediaKeys::OUTPUT_ERROR;
     default:
       NOTREACHED();
       return MediaKeys::UNKNOWN_ERROR;
   }
 }
 
+media::CdmKeyInformation::KeyStatus PpCdmKeyStatusToCdmKeyInformationKeyStatus(
+    PP_CdmKeyStatus status) {
+  switch (status) {
+    case PP_CDMKEYSTATUS_USABLE:
+      return media::CdmKeyInformation::USABLE;
+    case PP_CDMKEYSTATUS_INVALID:

[ddorwin, 2015/01/09 03:27:36]

We should fix the naming sometime.

[jrummell, 2015/01/09 17:24:28]

Acknowledged.

+      return media::CdmKeyInformation::INTERNAL_ERROR;
+    case PP_CDMKEYSTATUS_EXPIRED:
+      return media::CdmKeyInformation::EXPIRED;
+    case PP_CDMKEYSTATUS_OUTPUTNOTALLOWED:

[ddorwin, 2015/01/09 03:27:35]

And this probably shouldn't be one word.

[jrummell, 2015/01/09 17:24:28]

Acknowledged.

+      return media::CdmKeyInformation::OUTPUT_NOT_ALLOWED;
+    default:
+      NOTREACHED();
+      return media::CdmKeyInformation::INTERNAL_ERROR;
+  }
+}
+
 // TODO(xhwang): Unify EME UMA reporting code when prefixed EME is deprecated.
 // See http://crbug.com/412987 for details.
 void ReportSystemCodeUMA(const std::string& key_system, uint32 system_code) {
   // Sparse histogram macro does not cache the histogram, so it's safe to use
   // macro with non-static histogram name here.
   UMA_HISTOGRAM_SPARSE_SLOWLY(
       "Media.EME." + media::GetKeySystemNameForUMA(key_system) + ".SystemCode",
       system_code);
 }
 
@@ skipping 442 matching lines @@
   std::vector<uint8> message_vector;
   if (message_array_buffer) {
     const uint8* data = static_cast<const uint8*>(message_array_buffer->Map());
     message_vector.assign(data, data + message_array_buffer->ByteLength());
   }
 
   session_message_cb_.Run(web_session_id_string->value(), message_vector,
                           GURL::EmptyGURL());
 }
 
-// TODO(jrummell): Decode |key_information| and pass it to the callback.
 void ContentDecryptorDelegate::OnSessionKeysChange(
     PP_Var web_session_id,
     PP_Bool has_additional_usable_key,
     uint32_t key_count,
     const struct PP_KeyInformation key_information[]) {
   if (session_keys_change_cb_.is_null())
     return;
 
   StringVar* web_session_id_string = StringVar::FromPPVar(web_session_id);
   DCHECK(web_session_id_string);
 
-  // TODO(jrummell): Pass key information through Pepper.
+  media::CdmKeysInfo keys_info;
+  keys_info.reserve(key_count);
+  for (uint32_t i = 0; i < key_count; ++i) {
+    scoped_ptr<media::CdmKeyInformation> key_info(new media::CdmKeyInformation);
+    key_info->key_id.assign(
+        key_information[i].key_id,

[ddorwin, 2015/01/09 03:27:36]

nit: With 5 references to it, you might consider making an alias (const ref) to
key_information[i]. Something like "info" might make this short enough to fit,
but it's also ambiguous with all the key_info[s] names.

[jrummell, 2015/01/09 17:24:28]

Done. I would think the compilers are smart enough these days to do it, but I'll
make it explicit.

+        key_information[i].key_id + key_information[i].key_id_size);
+    key_info->status = PpCdmKeyStatusToCdmKeyInformationKeyStatus(
+        key_information[i].key_status);
+    key_info->system_code = key_information[i].system_code;
+    keys_info.push_back(key_info.release());
+  }
+
   session_keys_change_cb_.Run(web_session_id_string->value(),
                               PP_ToBool(has_additional_usable_key),
-                              media::CdmKeysInfo());
+                              keys_info.Pass());
 }
 
 void ContentDecryptorDelegate::OnSessionExpirationChange(
     PP_Var web_session_id,
     PP_Time new_expiry_time) {
   if (session_expiration_update_cb_.is_null())
     return;
 
   StringVar* web_session_id_string = StringVar::FromPPVar(web_session_id);
   DCHECK(web_session_id_string);
@@ skipping 475 matching lines @@
 
 scoped_ptr<CdmPromise> ContentDecryptorDelegate::TakePromise(
     uint32_t promise_id) {
   PromiseMap::iterator it = promises_.find(promise_id);
   if (it == promises_.end())
     return scoped_ptr<CdmPromise>();
   return promises_.take_and_erase(it);
 }
 
 }  // namespace content