Changes to support CDM_7

ppapi/thunk/ppb_instance_api.h

 // 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.
 
 #ifndef PPAPI_THUNK_INSTANCE_API_H_
 #define PPAPI_THUNK_INSTANCE_API_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/dev/ppb_messaging_deprecated.h"
@@ skipping 148 matching lines @@
                                  double maximum_factor) = 0;
   // Testing and URLUtil.
   virtual PP_Var GetDocumentURL(PP_Instance instance,
                                 PP_URLComponents_Dev* components) = 0;
 #if !defined(OS_NACL)
   // Content Decryptor.
   virtual void PromiseResolved(PP_Instance instance, uint32 promise_id) = 0;
   virtual void PromiseResolvedWithSession(PP_Instance instance,
                                           uint32 promise_id,
                                           PP_Var web_session_id_var) = 0;
-  virtual void PromiseResolvedWithKeyIds(PP_Instance instance,
-                                         uint32 promise_id,
-                                         PP_Var key_ids_var) = 0;
   virtual void PromiseRejected(PP_Instance instance,
                                uint32 promise_id,
                                PP_CdmExceptionCode exception_code,
                                uint32 system_code,
                                PP_Var error_description_var) = 0;
   virtual void SessionMessage(PP_Instance instance,
                               PP_Var web_session_id_var,
-                              PP_Var message_var,
-                              PP_Var destination_url_var) = 0;
-  virtual void SessionKeysChange(PP_Instance instance,
-                                 PP_Var web_session_id_var,
-                                 PP_Bool has_additional_usable_key) = 0;
+                              PP_CdmMessageType message_type,
+                              PP_Var message_var) = 0;
+  virtual void SessionKeysChange(
+      PP_Instance instance,
+      PP_Var web_session_id_var,
+      PP_Bool has_additional_usable_key,
+      uint32_t key_count,
+      const struct PP_KeyInformation key_information[]) = 0;
   virtual void SessionExpirationChange(PP_Instance instance,
                                        PP_Var web_session_id_var,
                                        PP_Time new_expiry_time) = 0;
-  virtual void SessionReady(PP_Instance instance,
-                            PP_Var web_session_id_var) = 0;
   virtual void SessionClosed(PP_Instance instance,
                              PP_Var web_session_id_var) = 0;
   virtual void SessionError(PP_Instance instance,
                             PP_Var web_session_id_var,
                             PP_CdmExceptionCode exception_code,
                             uint32 system_code,
                             PP_Var error_description_var) = 0;
   virtual void DeliverBlock(PP_Instance instance,
                             PP_Resource decrypted_block,
                             const PP_DecryptedBlockInfo* block_info) = 0;
@@ skipping 28 matching lines @@
                                       PP_URLComponents_Dev* components) = 0;
 #endif  // !defined(OS_NACL)
 
   static const ApiID kApiID = API_ID_PPB_INSTANCE;
 };
 
 }  // namespace thunk
 }  // namespace ppapi
 
 #endif  // PPAPI_THUNK_INSTANCE_API_H_