Update Pepper interface for EME

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 40 matching lines @@
 
   // pp::Instance implementation.
   virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]) {
     return true;
   }
 
   // PPP_ContentDecryptor_Private implementation.
   // Note: Results of calls to these methods must be reported through the
   // PPB_ContentDecryptor_Private interface.
   virtual void Initialize(const std::string& key_system) OVERRIDE;
+  virtual void SetServerCertificate(
+      uint32_t promise_id,
+      pp::VarArrayBuffer server_certificate) OVERRIDE;
   virtual void CreateSession(uint32_t promise_id,
                              const std::string& init_data_type,
                              pp::VarArrayBuffer init_data,
                              PP_SessionType session_type) OVERRIDE;
   virtual void LoadSession(uint32_t promise_id,
                            const std::string& web_session_id) OVERRIDE;
   virtual void UpdateSession(uint32_t promise_id,
                              const std::string& web_session_id,
                              pp::VarArrayBuffer response) OVERRIDE;
-  // TODO(jrummell): Rename to CloseSession().
-  virtual void ReleaseSession(uint32_t promise_id,
-                              const std::string& web_session_id) OVERRIDE;
-  // TODO(jrummell): Pass these 2 functions through Pepper and add OVERRIDE.
+  virtual void GetUsableKeyIds(uint32_t promise_id,

[ddorwin, 2014/08/22 20:49:20]

ditto

[jrummell, 2014/08/25 21:54:36]

Done.

+                               const std::string& web_session_id) OVERRIDE;
+  virtual void CloseSession(uint32_t promise_id,
+                            const std::string& web_session_id) OVERRIDE;
   virtual void RemoveSession(uint32_t promise_id,
-                             const std::string& web_session_id);
-  virtual void GetUsableKeyIds(uint32_t promise_id,
-                               const std::string& web_session_id);
+                             const std::string& web_session_id) OVERRIDE;
   virtual void Decrypt(
       pp::Buffer_Dev encrypted_buffer,
       const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE;
   virtual void InitializeAudioDecoder(
       const PP_AudioDecoderConfig& decoder_config,
       pp::Buffer_Dev extra_data_buffer) OVERRIDE;
   virtual void InitializeVideoDecoder(
       const PP_VideoDecoderConfig& decoder_config,
       pp::Buffer_Dev extra_data_buffer) OVERRIDE;
   virtual void DeinitializeDecoder(PP_DecryptorStreamType decoder_type,
@@ skipping 222 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_