Rename EME WD call parameters

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 35 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 CreateSession(uint32_t reference_id,
+  virtual void CreateSession(uint32_t session_id,
                              const std::string& type,
                              pp::VarArrayBuffer init_data) OVERRIDE;
-  virtual void UpdateSession(uint32_t reference_id,
+  virtual void UpdateSession(uint32_t session_id,
                              pp::VarArrayBuffer response) OVERRIDE;
-  virtual void ReleaseSession(uint32_t reference_id) OVERRIDE;
+  virtual void ReleaseSession(uint32_t 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 25 matching lines @@
       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;
 
   // cdm::Host_3 implementation.
-  virtual void OnSessionCreated(uint32_t reference_id,
-                                const char* session_id,
-                                uint32_t session_id_length) OVERRIDE;
-  virtual void OnSessionMessage(uint32_t reference_id,
+  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 reference_id) OVERRIDE;
-  virtual void OnSessionClosed(uint32_t reference_id) OVERRIDE;
-  virtual void OnSessionError(uint32_t reference_id,
+  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;
 
  private:
   typedef linked_ptr<DecryptedBlockImpl> LinkedDecryptedBlock;
   typedef linked_ptr<VideoFrameImpl> LinkedVideoFrame;
   typedef linked_ptr<AudioFramesImpl> LinkedAudioFrames;
 
   bool CreateCdmInstance(const std::string& key_system);
 
   // <code>PPB_ContentDecryptor_Private</code> dispatchers. These are passed to
   // <code>callback_factory_</code> to ensure that calls into
   // <code>PPP_ContentDecryptor_Private</code> are asynchronous.
   void SendSessionCreatedInternal(int32_t result,
-                                  uint32_t reference_id,
-                                  const std::string& session_id);
+                                  uint32_t session_id,
+                                  const std::string& web_session_id);
   void SendSessionMessageInternal(int32_t result,
-                                  uint32_t reference_id,
+                                  uint32_t session_id,
                                   const std::vector<uint8>& message,
                                   const std::string& default_url);
-  void SendSessionReadyInternal(int32_t result, uint32_t reference_id);
-  void SendSessionClosedInternal(int32_t result, uint32_t reference_id);
+  void SendSessionReadyInternal(int32_t result, uint32_t session_id);
+  void SendSessionClosedInternal(int32_t result, uint32_t session_id);
   void SendSessionErrorInternal(int32_t result,
-                                uint32_t reference_id,
+                                uint32_t session_id,
                                 cdm::MediaKeyError error_code,
                                 uint32_t system_code);
 
   void DeliverBlock(int32_t result,
                     const cdm::Status& status,
                     const LinkedDecryptedBlock& decrypted_block,
                     const PP_DecryptTrackingInfo& tracking_info);
   void DecoderInitializeDone(int32_t result,
                              PP_DecryptorStreamType decoder_type,
                              uint32_t request_id,
@@ skipping 52 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_