Add support for cdm::ContentDecryptionModule_8, remove CDM_6

media/cdm/ppapi/cdm_adapter.h

 // Copyright 2013 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 MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
 #define MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 19 matching lines @@
 
 namespace media {
 
 // GetCdmHostFunc implementation.
 void* GetCdmHost(int host_interface_version, void* user_data);
 
 // An adapter class for abstracting away PPAPI interaction and threading for a
 // Content Decryption Module (CDM).
 class CdmAdapter : public pp::Instance,
                    public pp::ContentDecryptor_Private,
-                   public cdm::Host_6,
-                   public cdm::Host_7 {
+                   public cdm::Host_7,
+                   public cdm::Host_8 {
  public:
   CdmAdapter(PP_Instance instance, pp::Module* module);
   virtual ~CdmAdapter();
 
   // pp::Instance implementation.
   virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]) {
     return true;
   }
 
   // PPP_ContentDecryptor_Private implementation.
@@ skipping 25 matching lines @@
                               pp::Buffer_Dev extra_data_buffer) override;
   void DeinitializeDecoder(PP_DecryptorStreamType decoder_type,
                            uint32_t request_id) override;
   void ResetDecoder(PP_DecryptorStreamType decoder_type,
                     uint32_t request_id) override;
   void DecryptAndDecode(
       PP_DecryptorStreamType decoder_type,
       pp::Buffer_Dev encrypted_buffer,
       const PP_EncryptedBlockInfo& encrypted_block_info) override;
 
-  // cdm::Host_6 and cdm::Host_7 implementation.
+  // cdm::Host_7 and cdm::Host_8 implementation.
   cdm::Buffer* Allocate(uint32_t capacity) override;
   void SetTimer(int64_t delay_ms, void* context) override;
   cdm::Time GetCurrentWallTime() override;
   void OnResolveNewSessionPromise(uint32_t promise_id,
                                   const char* session_id,
                                   uint32_t session_id_size) override;
   void OnResolvePromise(uint32_t promise_id) override;
   void OnRejectPromise(uint32_t promise_id,
                        cdm::Error error,
                        uint32_t system_code,
                        const char* error_message,
                        uint32_t error_message_size) override;
-  void OnExpirationChange(const char* session_id,
-                          uint32_t session_id_size,
-                          cdm::Time new_expiry_time) override;
-  void OnSessionClosed(const char* session_id,
-                       uint32_t session_id_size) override;
-  void SendPlatformChallenge(const char* service_id,
-                             uint32_t service_id_size,
-                             const char* challenge,
-                             uint32_t challenge_size) override;
-  void EnableOutputProtection(uint32_t desired_protection_mask) override;
-  void QueryOutputProtectionStatus() override;
-  void OnDeferredInitializationDone(cdm::StreamType stream_type,
-                                    cdm::Status decoder_status) override;
-  cdm::FileIO* CreateFileIO(cdm::FileIOClient* client) override;
-
-  // cdm::Host_7 implementation.
   void OnSessionMessage(const char* session_id,
                         uint32_t session_id_size,
                         cdm::MessageType message_type,
                         const char* message,
                         uint32_t message_size,
                         const char* legacy_destination_url,
                         uint32_t legacy_destination_url_size) override;
   void OnSessionKeysChange(const char* session_id,
                            uint32_t session_id_size,
                            bool has_additional_usable_key,
                            const cdm::KeyInformation* keys_info,
                            uint32_t keys_info_count) override;
+  void OnExpirationChange(const char* session_id,
+                          uint32_t session_id_size,
+                          cdm::Time new_expiry_time) override;
+  void OnSessionClosed(const char* session_id,
+                       uint32_t session_id_size) override;
   void OnLegacySessionError(const char* session_id,
                             uint32_t session_id_size,
                             cdm::Error error,
                             uint32_t system_code,
                             const char* error_message,
                             uint32_t error_message_size) override;
-
-  // cdm::Host_6 implementation.
-  void OnResolveKeyIdsPromise(uint32_t promise_id,
-                              const cdm::BinaryData* usable_key_ids,
-                              uint32_t usable_key_ids_size) override;
-  void OnSessionMessage(const char* session_id,
-                        uint32_t session_id_size,
-                        const char* message,
-                        uint32_t message_size,
-                        const char* destination_url,
-                        uint32_t destination_url_size) override;
-  void OnSessionUsableKeysChange(const char* session_id,
-                                 uint32_t session_id_size,
-                                 bool has_additional_usable_key) override;
-  void OnSessionError(const char* session_id,
-                      uint32_t session_id_size,
-                      cdm::Error error,
-                      uint32_t system_code,
-                      const char* error_message,
-                      uint32_t error_message_size) override;
+  void SendPlatformChallenge(const char* service_id,
+                             uint32_t service_id_size,
+                             const char* challenge,
+                             uint32_t challenge_size) override;
+  void EnableOutputProtection(uint32_t desired_protection_mask) override;
+  void QueryOutputProtectionStatus() override;
+  void OnDeferredInitializationDone(cdm::StreamType stream_type,
+                                    cdm::Status decoder_status) override;
+  cdm::FileIO* CreateFileIO(cdm::FileIOClient* client) override;
 
  private:
   // These are reported to UMA server. Do not change the existing values!
   enum OutputProtectionStatus {
     OUTPUT_PROTECTION_QUERIED = 0,
     OUTPUT_PROTECTION_NO_EXTERNAL_LINK = 1,
     OUTPUT_PROTECTION_ALL_EXTERNAL_LINKS_PROTECTED = 2,
     OUTPUT_PROTECTION_MAX = 3
   };
 
@@ skipping 139 matching lines @@
 
   uint32_t last_read_file_size_kb_;
   bool file_size_uma_reported_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmAdapter);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_PPAPI_CDM_ADAPTER_H_