Changes to support CDM_7

content/renderer/pepper/pepper_plugin_instance_impl.cc

Index: content/renderer/pepper/pepper_plugin_instance_impl.cc
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc
index 5568ada56be5d8506e134387e31a24357f4207ff..50b5c7f045635792823718295662ea24d8259319 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -2404,13 +2404,6 @@ void PepperPluginInstanceImpl::PromiseResolvedWithSession(
                                                             web_session_id_var);
 }
 
-void PepperPluginInstanceImpl::PromiseResolvedWithKeyIds(PP_Instance instance,
-                                                         uint32 promise_id,
-                                                         PP_Var key_ids_var) {
-  content_decryptor_delegate_->OnPromiseResolvedWithKeyIds(promise_id,
-                                                           key_ids_var);
-}
-
 void PepperPluginInstanceImpl::PromiseRejected(
     PP_Instance instance,
     uint32 promise_id,
@@ -2423,18 +2416,19 @@ void PepperPluginInstanceImpl::PromiseRejected(
 
 void PepperPluginInstanceImpl::SessionMessage(PP_Instance instance,
                                               PP_Var web_session_id_var,
-                                              PP_Var message_var,
-                                              PP_Var destination_url_var) {
-  content_decryptor_delegate_->OnSessionMessage(
-      web_session_id_var, message_var, destination_url_var);
+                                              PP_MessageType message_type,
+                                              PP_Var message_var) {
+  content_decryptor_delegate_->OnSessionMessage(web_session_id_var,
+                                                message_type, message_var);
 }
 
 void PepperPluginInstanceImpl::SessionKeysChange(
     PP_Instance instance,
     PP_Var web_session_id_var,
-    PP_Bool has_additional_usable_key) {
-  content_decryptor_delegate_->OnSessionKeysChange(web_session_id_var,
-                                                   has_additional_usable_key);
+    PP_Bool has_additional_usable_key,
+    PP_Var key_information_var) {
+  content_decryptor_delegate_->OnSessionKeysChange(
+      web_session_id_var, has_additional_usable_key, key_information_var);

[dmichael (off chromium), 2014/12/19 18:50:04]

If you haven't run git cl format, please do...  I didn't think it would format
this line this way anymore.

[jrummell, 2014/12/20 00:23:08]

This is what clang-format did.

 }
 
 void PepperPluginInstanceImpl::SessionExpirationChange(
@@ -2445,11 +2439,6 @@ void PepperPluginInstanceImpl::SessionExpirationChange(
                                                          new_expiry_time);
 }
 
-void PepperPluginInstanceImpl::SessionReady(PP_Instance instance,
-                                            PP_Var web_session_id_var) {
-  content_decryptor_delegate_->OnSessionReady(web_session_id_var);
-}
-
 void PepperPluginInstanceImpl::SessionClosed(PP_Instance instance,
                                              PP_Var web_session_id_var) {
   content_decryptor_delegate_->OnSessionClosed(web_session_id_var);