Rename EME WD call parameters

media/cdm/ppapi/clear_key_cdm.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_CLEAR_KEY_CDM_H_
 #define MEDIA_CDM_PPAPI_CLEAR_KEY_CDM_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 54 matching lines @@
       const cdm::PlatformChallengeResponse& response) OVERRIDE;
   virtual void OnQueryOutputProtectionStatus(
       uint32_t link_mask, uint32_t output_protection_mask) OVERRIDE;
 
  private:
   // TODO(xhwang): After we removed DecryptorClient. We probably can also remove
   // this Client class as well. Investigate this possibility.
   class Client {
    public:
     // TODO(jrummell): Remove bitmask and rename kNone to kInvalid once CDM
-    // interface supports reference_id passing completely.
+    // interface supports session_id passing completely.
     enum Status {
       kNone = 0,
       kCreated = 1 << 0,
       kMessage = 1 << 1,
       kReady = 1 << 2,
       kClosed = 1 << 3,
       kError = 1 << 4
     };
 
     Client();
     virtual ~Client();
 
     Status status() { return status_; }
-    const std::string& session_id() { return session_id_; }
+    const std::string& web_session_id() { return web_session_id_; }
     const std::vector<uint8>& message() { return message_; }
     const std::string& destination_url() { return destination_url_; }
     MediaKeys::KeyError error_code() { return error_code_; }
     int system_code() { return system_code_; }
 
     // Resets the Client to a clean state.
     void Reset();
 
-    void OnSessionCreated(uint32 reference_id, const std::string& session_id);
-    void OnSessionMessage(uint32 reference_id,
+    void OnSessionCreated(uint32 session_id, const std::string& web_session_id);
+    void OnSessionMessage(uint32 session_id,
                           const std::vector<uint8>& message,
                           const std::string& destination_url);
-    void OnSessionReady(uint32 reference_id);
-    void OnSessionClosed(uint32 reference_id);
-    void OnSessionError(uint32 reference_id,
+    void OnSessionReady(uint32 session_id);
+    void OnSessionClosed(uint32 session_id);
+    void OnSessionError(uint32 session_id,
                         MediaKeys::KeyError error_code,
                         int system_code);
 
    private:
     Status status_;
-    std::string session_id_;
+    std::string web_session_id_;
     std::vector<uint8> message_;
     std::string destination_url_;
     MediaKeys::KeyError error_code_;
     int system_code_;
   };
 
   // Prepares next heartbeat message and sets a timer for it.
   void ScheduleNextHeartBeat();
 
   // Decrypts the |encrypted_buffer| and puts the result in |decrypted_buffer|.
@@ skipping 56 matching lines @@
 #endif  // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
 
   scoped_ptr<CdmVideoDecoder> video_decoder_;
 
   DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_PPAPI_CLEAR_KEY_CDM_H_