Changes to support CDM_7

ppapi/proxy/ppb_instance_proxy.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_PROXY_PPB_INSTANCE_PROXY_H_
 #define PPAPI_PROXY_PPB_INSTANCE_PROXY_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 118 matching lines @@
       PP_Instance instance,
       PP_URLComponents_Dev* components) override;
   virtual PP_Var GetPluginReferrerURL(
       PP_Instance instance,
       PP_URLComponents_Dev* components) override;
   virtual void PromiseResolved(PP_Instance instance,
                                uint32 promise_id) override;
   virtual void PromiseResolvedWithSession(PP_Instance instance,
                                           uint32 promise_id,
                                           PP_Var web_session_id_var) override;
-  virtual void PromiseResolvedWithKeyIds(PP_Instance instance,
-                                         uint32 promise_id,
-                                         PP_Var key_ids_var) override;
   virtual void PromiseRejected(PP_Instance instance,
                                uint32 promise_id,
                                PP_CdmExceptionCode exception_code,
                                uint32 system_code,
                                PP_Var error_description_var) override;
   virtual void SessionMessage(PP_Instance instance,
                               PP_Var web_session_id_var,
-                              PP_Var message_var,
-                              PP_Var destination_url_var) override;
-  virtual void SessionKeysChange(PP_Instance instance,
-                                 PP_Var web_session_id_var,
-                                 PP_Bool has_additional_usable_key) override;
+                              PP_CdmMessageType message_type,
+                              PP_Var message_var) override;
+  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[]) override;
   virtual void SessionExpirationChange(PP_Instance instance,
                                        PP_Var web_session_id_var,
                                        PP_Time new_expiry_time) override;
-  virtual void SessionReady(PP_Instance instance,
-                            PP_Var web_session_id_var) override;
   virtual void SessionClosed(PP_Instance instance,
                              PP_Var web_session_id_var) override;
   virtual void SessionError(PP_Instance instance,
                             PP_Var web_session_id_var,
                             PP_CdmExceptionCode exception_code,
                             uint32 system_code,
                             PP_Var error_description_var) override;
   virtual void DeliverBlock(PP_Instance instance,
                             PP_Resource decrypted_block,
                             const PP_DecryptedBlockInfo* block_info) override;
@@ skipping 93 matching lines @@
                                      SerializedVarReturnValue result);
   void OnHostMsgGetPluginReferrerURL(PP_Instance instance,
                                      SerializedVarReturnValue result);
 
   virtual void OnHostMsgPromiseResolved(PP_Instance instance,
                                         uint32_t promise_id);
   virtual void OnHostMsgPromiseResolvedWithSession(
       PP_Instance instance,
       uint32_t promise_id,
       SerializedVarReceiveInput web_session_id);
-  virtual void OnHostMsgPromiseResolvedWithKeyIds(
-      PP_Instance instance,
-      uint32 promise_id,
-      const std::vector<std::vector<uint8_t> >& key_ids);
   virtual void OnHostMsgPromiseRejected(
       PP_Instance instance,
       uint32_t promise_id,
       PP_CdmExceptionCode exception_code,
       uint32_t system_code,
       SerializedVarReceiveInput error_description);
-  virtual void OnHostMsgSessionMessage(
+  virtual void OnHostMsgSessionMessage(PP_Instance instance,
+                                       SerializedVarReceiveInput web_session_id,
+                                       PP_CdmMessageType message_type,
+                                       SerializedVarReceiveInput message);
+  virtual void OnHostMsgSessionKeysChange(
       PP_Instance instance,
-      SerializedVarReceiveInput web_session_id,
-      SerializedVarReceiveInput message,
-      SerializedVarReceiveInput destination_url);
-  virtual void OnHostMsgSessionKeysChange(PP_Instance instance,
-                                          const std::string& web_session_id,
-                                          PP_Bool has_additional_usable_key);
+      const std::string& web_session_id,
+      PP_Bool has_additional_usable_key,
+      const std::vector<PP_KeyInformation>& key_information);
   virtual void OnHostMsgSessionExpirationChange(
       PP_Instance instance,
       const std::string& web_session_id,
       PP_Time new_expiry_time);
-  virtual void OnHostMsgSessionReady(PP_Instance instance,
-                                     SerializedVarReceiveInput web_session_id);
   virtual void OnHostMsgSessionClosed(PP_Instance instance,
                                       SerializedVarReceiveInput web_session_id);
   virtual void OnHostMsgSessionError(
       PP_Instance instance,
       SerializedVarReceiveInput web_session_id,
       PP_CdmExceptionCode exception_code,
       uint32_t system_code,
       SerializedVarReceiveInput error_description);
   virtual void OnHostMsgDecoderInitializeDone(
       PP_Instance instance,
@@ skipping 27 matching lines @@
   // Other helpers.
   void CancelAnyPendingRequestSurroundingText(PP_Instance instance);
 
   ProxyCompletionCallbackFactory<PPB_Instance_Proxy> callback_factory_;
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_PPB_INSTANCE_PROXY_H_