Changes to support CDM_7

content/renderer/pepper/pepper_plugin_instance_impl.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/pepper_plugin_instance_impl.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 2386 matching lines @@
 }
 
 void PepperPluginInstanceImpl::PromiseResolvedWithSession(
     PP_Instance instance,
     uint32 promise_id,
     PP_Var web_session_id_var) {
   content_decryptor_delegate_->OnPromiseResolvedWithSession(promise_id,
                                                             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,
     PP_CdmExceptionCode exception_code,
     uint32 system_code,
     PP_Var error_description_var) {
   content_decryptor_delegate_->OnPromiseRejected(
       promise_id, exception_code, system_code, error_description_var);
 }
 
 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(
     PP_Instance instance,
     PP_Var web_session_id_var,
     PP_Time new_expiry_time) {
   content_decryptor_delegate_->OnSessionExpirationChange(web_session_id_var,
                                                          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);
 }
 
 void PepperPluginInstanceImpl::SessionError(PP_Instance instance,
                                             PP_Var web_session_id_var,
                                             PP_CdmExceptionCode exception_code,
                                             uint32 system_code,
                                             PP_Var error_description_var) {
@@ skipping 820 matching lines @@
     // Running out-of-process. Initiate an IPC call to notify the plugin
     // process.
     ppapi::proxy::HostDispatcher* dispatcher =
         ppapi::proxy::HostDispatcher::GetForInstance(pp_instance());
     dispatcher->Send(new PpapiMsg_PPPInstance_HandleDocumentLoad(
         ppapi::API_ID_PPP_INSTANCE, pp_instance(), pending_host_id, data));
   }
 }
 
 }  // namespace content