Changes to support CDM_7

ppapi/cpp/private/content_decryptor_private.h

Index: ppapi/cpp/private/content_decryptor_private.h
diff --git a/ppapi/cpp/private/content_decryptor_private.h b/ppapi/cpp/private/content_decryptor_private.h
index 25aba52c1f8b00bcf963a42406b8401db0d1f805..0117c72dfa3332243805bf1790b938cd817e6299 100644
--- a/ppapi/cpp/private/content_decryptor_private.h
+++ b/ppapi/cpp/private/content_decryptor_private.h
@@ -37,11 +37,13 @@ class ContentDecryptor_Private {
   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,
@@ -50,8 +52,6 @@ class ContentDecryptor_Private {
                             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(
@@ -75,21 +75,18 @@ class ContentDecryptor_Private {
   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,