Remove CDM_5

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 10 matching lines @@
 #include "ppapi/cpp/private/content_decryptor_private.h"
 #include "ppapi/cpp/var.h"
 #include "ppapi/cpp/var_array_buffer.h"
 #include "ppapi/utility/completion_callback_factory.h"
 
 #if defined(OS_CHROMEOS)
 #include "ppapi/cpp/private/output_protection_private.h"
 #include "ppapi/cpp/private/platform_verification.h"
 #endif
 
-#if defined(GetCurrentTime)
-// winbase.h defines this which messes up calls to Host_5::GetCurrentTime.
-#undef GetCurrentTime
-#endif
-
 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_4,
-                   public cdm::Host_5,
                    public cdm::Host_6 {
  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;
   }
 
@@ skipping 30 matching lines @@
       pp::Buffer_Dev extra_data_buffer) OVERRIDE;
   virtual void DeinitializeDecoder(PP_DecryptorStreamType decoder_type,
                                    uint32_t request_id) OVERRIDE;
   virtual void ResetDecoder(PP_DecryptorStreamType decoder_type,
                             uint32_t request_id) OVERRIDE;
   virtual void DecryptAndDecode(
       PP_DecryptorStreamType decoder_type,
       pp::Buffer_Dev encrypted_buffer,
       const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE;
 
-  // cdm::Host_4, cdm::Host_5 and cdm::Host_6 implementation.
+  // cdm::Host_4 and cdm::Host_6 implementation.
   virtual cdm::Buffer* Allocate(uint32_t capacity) OVERRIDE;
   virtual void SetTimer(int64_t delay_ms, void* context) OVERRIDE;
 
   // cdm::Host_4 implementation.
   virtual double GetCurrentWallTimeInSeconds() OVERRIDE;
   virtual void OnSessionCreated(uint32_t session_id,
                                 const char* web_session_id,
                                 uint32_t web_session_id_length) OVERRIDE;
   virtual void OnSessionMessage(uint32_t session_id,
                                 const char* message,
                                 uint32_t message_length,
                                 const char* destination_url,
                                 uint32_t destination_url_length) OVERRIDE;
   virtual void OnSessionReady(uint32_t session_id) OVERRIDE;
   virtual void OnSessionClosed(uint32_t session_id) OVERRIDE;
   virtual void OnSessionError(uint32_t session_id,
                               cdm::MediaKeyError error_code,
                               uint32_t system_code) OVERRIDE;
 
-  // cdm::Host_5 implementation.
-  virtual cdm::Time GetCurrentTime() OVERRIDE;
+  // cdm::Host_6 implementation.
+  virtual cdm::Time GetCurrentWallTime() OVERRIDE;
   virtual void OnResolveNewSessionPromise(
       uint32_t promise_id,
       const char* web_session_id,
       uint32_t web_session_id_length) OVERRIDE;
   virtual void OnResolvePromise(uint32_t promise_id) OVERRIDE;
+  virtual void OnResolveKeyIdsPromise(uint32_t promise_id,
+                                      const cdm::BinaryData* usable_key_ids,
+                                      uint32_t usable_key_ids_length) OVERRIDE;
   virtual void OnRejectPromise(uint32_t promise_id,
                                cdm::Error error,
                                uint32_t system_code,
                                const char* error_message,
                                uint32_t error_message_length) OVERRIDE;
   virtual void OnSessionMessage(const char* web_session_id,
                                 uint32_t web_session_id_length,
                                 const char* message,
                                 uint32_t message_length,
                                 const char* destination_url,
                                 uint32_t destination_url_length) OVERRIDE;
-  virtual void OnSessionKeysChange(const char* web_session_id,
-                                   uint32_t web_session_id_length,
-                                   bool has_additional_usable_key) OVERRIDE;
+  virtual void OnSessionUsableKeysChange(
+      const char* web_session_id,
+      uint32_t web_session_id_length,
+      bool has_additional_usable_key) OVERRIDE;
   virtual void OnExpirationChange(const char* web_session_id,
                                   uint32_t web_session_id_length,
                                   cdm::Time new_expiry_time) OVERRIDE;
-  virtual void OnSessionReady(const char* web_session_id,
-                              uint32_t web_session_id_length) OVERRIDE;
   virtual void OnSessionClosed(const char* web_session_id,
                                uint32_t web_session_id_length) OVERRIDE;
   virtual void OnSessionError(const char* web_session_id,
                               uint32_t web_session_id_length,
                               cdm::Error error,
                               uint32_t system_code,
                               const char* error_message,
                               uint32_t error_message_length) OVERRIDE;
 
-  // cdm::Host_6 implementation.
-  virtual cdm::Time GetCurrentWallTime() OVERRIDE;
-  virtual void OnResolveKeyIdsPromise(uint32_t promise_id,
-                                      const cdm::BinaryData* usable_key_ids,
-                                      uint32_t usable_key_ids_length) OVERRIDE;
-  virtual void OnSessionUsableKeysChange(
-      const char* web_session_id,
-      uint32_t web_session_id_length,
-      bool has_additional_usable_key) OVERRIDE;
-
-  // cdm::Host_4, cdm::Host_5 and cdm::Host_6 implementation.
+  // cdm::Host_4 and cdm::Host_6 implementation.
   virtual void SendPlatformChallenge(const char* service_id,
                                      uint32_t service_id_length,
                                      const char* challenge,
                                      uint32_t challenge_length) OVERRIDE;
   virtual void EnableOutputProtection(
       uint32_t desired_protection_mask) OVERRIDE;
   virtual void QueryOutputProtectionStatus() OVERRIDE;
   virtual void OnDeferredInitializationDone(
       cdm::StreamType stream_type,
       cdm::Status decoder_status) OVERRIDE;
@@ skipping 138 matching lines @@
   uint32_t deferred_audio_decoder_config_id_;
   bool deferred_initialize_video_decoder_;
   uint32_t deferred_video_decoder_config_id_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmAdapter);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_PPAPI_CDM_ADAPTER_H_