Encrypted Media: Replace web_session_id with session_id

Now we don't have the integer session_id anymore,
there's no need to have a separate name.
So rename web_session_id to session_id.

BUG=440510

R=xhwang@chromium.org

Review URL: https://codereview.chromium.org/903663002

Cr-Commit-Position: refs/heads/master@{#317986}

2 files changed, 9 insertions, 9 deletions

diff --git a/chromecast/media/cdm/browser_cdm_cast.cc b/chromecast/media/cdm/browser_cdm_cast.cc
index 766365a..ded9448 100644
--- a/chromecast/media/cdm/browser_cdm_cast.cc
+++ b/chromecast/media/cdm/browser_cdm_cast.cc
@@ -57,25 +57,25 @@ void BrowserCdmCast::UnregisterPlayer(int registration_id) {
   cdm_unset_callbacks_.erase(registration_id);
 }
 
-void BrowserCdmCast::OnSessionMessage(const std::string& web_session_id,
+void BrowserCdmCast::OnSessionMessage(const std::string& session_id,
                                       const std::vector<uint8>& message,
                                       const GURL& destination_url) {
   // Note: Message type is not supported in Chromecast. Do our best guess here.
   ::media::MediaKeys::MessageType message_type =
       destination_url.is_empty() ? ::media::MediaKeys::LICENSE_REQUEST
                                  : ::media::MediaKeys::LICENSE_RENEWAL;
-  session_message_cb_.Run(web_session_id,
+  session_message_cb_.Run(session_id,
                           message_type,
                           message,
                           destination_url);
 }
 
-void BrowserCdmCast::OnSessionClosed(const std::string& web_session_id) {
-  session_closed_cb_.Run(web_session_id);
+void BrowserCdmCast::OnSessionClosed(const std::string& session_id) {
+  session_closed_cb_.Run(session_id);
 }
 
 void BrowserCdmCast::OnSessionKeysChange(
-    const std::string& web_session_id,
+    const std::string& session_id,
     const ::media::KeyIdAndKeyPairs& keys) {
   ::media::CdmKeysInfo cdm_keys_info;
   for (const std::pair<std::string, std::string>& key : keys) {
@@ -84,7 +84,7 @@ void BrowserCdmCast::OnSessionKeysChange(
     cdm_key_information->key_id.assign(key.first.begin(), key.first.end());
     cdm_keys_info.push_back(cdm_key_information.release());
   }
-  session_keys_change_cb_.Run(web_session_id, true, cdm_keys_info.Pass());
+  session_keys_change_cb_.Run(session_id, true, cdm_keys_info.Pass());
 
   // Notify listeners of a new key.
   {
diff --git a/chromecast/media/cdm/browser_cdm_cast.h b/chromecast/media/cdm/browser_cdm_cast.h
index cd1eac1..2b9f26d 100644
--- a/chromecast/media/cdm/browser_cdm_cast.h
+++ b/chromecast/media/cdm/browser_cdm_cast.h
@@ -52,11 +52,11 @@ class BrowserCdmCast : public ::media::BrowserCdm {
       const std::string& key_id) = 0;
 
  protected:
-  void OnSessionMessage(const std::string& web_session_id,
+  void OnSessionMessage(const std::string& session_id,
                         const std::vector<uint8>& message,
                         const GURL& destination_url);
-  void OnSessionClosed(const std::string& web_session_id);
-  void OnSessionKeysChange(const std::string& web_session_id,
+  void OnSessionClosed(const std::string& session_id);
+  void OnSessionKeysChange(const std::string& session_id,
                            const ::media::KeyIdAndKeyPairs& keys);
 
  private: