Verify promise type before casting.

content/renderer/pepper/content_decryptor_delegate.cc

Index: content/renderer/pepper/content_decryptor_delegate.cc
diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc
index e1b0b1ba3e5d1100275908abf15dd578ec1b86a9..3d8bc0156150c55fa1f3bc8e53e4a6fcb23dbfd4 100644
--- a/content/renderer/pepper/content_decryptor_delegate.cc
+++ b/content/renderer/pepper/content_decryptor_delegate.cc
@@ -625,7 +625,10 @@ bool ContentDecryptorDelegate::DecryptAndDecodeVideo(
 
 void ContentDecryptorDelegate::OnPromiseResolved(uint32 promise_id) {
   scoped_ptr<CdmPromise> promise = TakePromise(promise_id);
-  if (promise) {
+  DCHECK(promise &&
+         promise->GetResolveParameterType() == media::CdmPromise::VOID_TYPE);
+  if (promise &&
+      promise->GetResolveParameterType() == media::CdmPromise::VOID_TYPE) {
     SimpleCdmPromise* simple_promise(
         static_cast<SimpleCdmPromise*>(promise.get()));
     simple_promise->resolve();
@@ -640,7 +643,10 @@ void ContentDecryptorDelegate::OnPromiseResolvedWithSession(
   StringVar* web_session_id_string = StringVar::FromPPVar(web_session_id);
   DCHECK(web_session_id_string);
 
-  if (promise) {
+  DCHECK(promise &&
+         promise->GetResolveParameterType() == media::CdmPromise::STRING_TYPE);
+  if (promise &&
+      promise->GetResolveParameterType() == media::CdmPromise::STRING_TYPE) {

[xhwang, 2014/08/27 22:49:26]

ditto

[jrummell, 2014/08/27 23:05:13]

Done.

     NewSessionCdmPromise* session_promise(
         static_cast<NewSessionCdmPromise*>(promise.get()));
     session_promise->resolve(web_session_id_string->value());