Changes to support CDM_7

ppapi/cpp/private/content_decryptor_private.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_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_
 #define PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 19 matching lines @@
   virtual ~ContentDecryptor_Private();
 
   // PPP_ContentDecryptor_Private functions exposed as virtual functions
   // for you to override.
   // TODO(tomfinegan): This could be optimized to pass pp::Var instead of
   // strings. The change would allow the CDM wrapper to reuse vars when
   // replying to the browser.
   virtual void Initialize(const std::string& key_system) = 0;
   virtual void SetServerCertificate(uint32_t promise_id,
                                     pp::VarArrayBuffer server_certificate) = 0;
-  virtual void CreateSession(uint32_t promise_id,
-                             const std::string& init_data_type,
-                             pp::VarArrayBuffer init_data,
-                             PP_SessionType session_type) = 0;
+  virtual void CreateSessionAndGenerateRequest(
+      uint32_t promise_id,
+      PP_SessionType session_type,
+      const std::string& init_data_type,
+      pp::VarArrayBuffer init_data) = 0;
   virtual void LoadSession(uint32_t promise_id,
+                           PP_SessionType session_type,
                            const std::string& web_session_id) = 0;
   virtual void UpdateSession(uint32_t promise_id,
                              const std::string& web_session_id,
                              pp::VarArrayBuffer response) = 0;
   virtual void CloseSession(uint32_t promise_id,
                             const std::string& web_session_id) = 0;
   virtual void RemoveSession(uint32_t promise_id,
                              const std::string& web_session_id) = 0;
-  virtual void GetUsableKeyIds(uint32_t promise_id,
-                               const std::string& web_session_id) = 0;
   virtual void Decrypt(pp::Buffer_Dev encrypted_buffer,
                        const PP_EncryptedBlockInfo& encrypted_block_info) = 0;
   virtual void InitializeAudioDecoder(
       const PP_AudioDecoderConfig& decoder_config,
       pp::Buffer_Dev extra_data_resource) = 0;
   virtual void InitializeVideoDecoder(
       const PP_VideoDecoderConfig& decoder_config,
       pp::Buffer_Dev extra_data_resource) = 0;
   virtual void DeinitializeDecoder(PP_DecryptorStreamType decoder_type,
                                    uint32_t request_id) = 0;
   virtual void ResetDecoder(PP_DecryptorStreamType decoder_type,
                             uint32_t request_id) = 0;
   // Null |encrypted_frame| means end-of-stream buffer.
   virtual void DecryptAndDecode(
       PP_DecryptorStreamType decoder_type,
       pp::Buffer_Dev encrypted_buffer,
       const PP_EncryptedBlockInfo& encrypted_block_info) = 0;
 
   // PPB_ContentDecryptor_Private methods for passing data from the decryptor
   // to the browser.
   void PromiseResolved(uint32_t promise_id);
   void PromiseResolvedWithSession(uint32_t promise_id,
                                   const std::string& web_session_id);
-  void PromiseResolvedWithKeyIds(
-      uint32_t promise_id,
-      const std::vector<std::vector<uint8_t> >& key_ids);
   void PromiseRejected(uint32_t promise_id,
                        PP_CdmExceptionCode exception_code,
                        uint32_t system_code,
                        const std::string& error_description);
   void SessionMessage(const std::string& web_session_id,
-                      pp::VarArrayBuffer message,
-                      const std::string& destination_url);
+                      PP_CdmMessageType message_type,
+                      pp::VarArrayBuffer message);
   void SessionKeysChange(const std::string& web_session_id,
-                         bool has_additional_usable_key);
+                         bool has_additional_usable_key,
+                         const std::vector<PP_KeyInformation>& key_information);
   void SessionExpirationChange(const std::string& web_session_id,
                                PP_Time new_expiry_time);
-  void SessionReady(const std::string& web_session_id);
   void SessionClosed(const std::string& web_session_id);
   void SessionError(const std::string& web_session_id,
                     PP_CdmExceptionCode exception_code,
                     uint32_t system_code,
                     const std::string& error_description);
 
   // The plugin must not hold a reference to the encrypted buffer resource
   // provided to Decrypt() when it calls this method. The browser will reuse
   // the buffer in a subsequent Decrypt() call.
   void DeliverBlock(pp::Buffer_Dev decrypted_block,
@@ skipping 19 matching lines @@
   void DeliverSamples(pp::Buffer_Dev audio_frames,
                       const PP_DecryptedSampleInfo& decrypted_sample_info);
 
  private:
   InstanceHandle associated_instance_;
 };
 
 }  // namespace pp
 
 #endif  // PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_