Rename EME WD call parameters

content/renderer/media/webcontentdecryptionmodulesession_impl.cc

Index: content/renderer/media/webcontentdecryptionmodulesession_impl.cc
diff --git a/content/renderer/media/webcontentdecryptionmodulesession_impl.cc b/content/renderer/media/webcontentdecryptionmodulesession_impl.cc
index 6b304699bcc6419c096dc13199472f92bf50fd05..70b78badc584cfad9ac3f298c16b6f1f7de0543a 100644
--- a/content/renderer/media/webcontentdecryptionmodulesession_impl.cc
+++ b/content/renderer/media/webcontentdecryptionmodulesession_impl.cc
@@ -12,7 +12,7 @@
 namespace content {
 
 static const uint32 kStartingReferenceId = 1;

[xhwang, 2013/12/05 18:51:37]

no need to have static here.

[jrummell, 2013/12/06 23:42:35]

Done.

-uint32 WebContentDecryptionModuleSessionImpl::next_reference_id_ =
+uint32 WebContentDecryptionModuleSessionImpl::next_session_id_ =
     kStartingReferenceId;
 COMPILE_ASSERT(kStartingReferenceId != media::MediaKeys::kInvalidReferenceId,
                invalid_starting_value);
@@ -24,7 +24,7 @@ WebContentDecryptionModuleSessionImpl::WebContentDecryptionModuleSessionImpl(
     : media_keys_(media_keys),
       client_(client),
       session_closed_cb_(session_closed_cb),
-      reference_id_(next_reference_id_++) {
+      session_id_(next_session_id_++) {
   DCHECK(media_keys_);
 }
 
@@ -33,7 +33,7 @@ WebContentDecryptionModuleSessionImpl::
 }
 
 blink::WebString WebContentDecryptionModuleSessionImpl::sessionId() const {
-  return blink::WebString::fromUTF8(session_id_);
+  return blink::WebString::fromUTF8(web_session_id_);
 }
 
 void WebContentDecryptionModuleSessionImpl::generateKeyRequest(
@@ -48,29 +48,29 @@ void WebContentDecryptionModuleSessionImpl::generateKeyRequest(
   }
 
   media_keys_->CreateSession(
-      reference_id_, UTF16ToASCII(mime_type), init_data, init_data_length);
+      session_id_, UTF16ToASCII(mime_type), init_data, init_data_length);
 }
 
 void WebContentDecryptionModuleSessionImpl::update(const uint8* response,
                                                    size_t response_length) {
   DCHECK(response);
-  media_keys_->UpdateSession(reference_id_, response, response_length);
+  media_keys_->UpdateSession(session_id_, response, response_length);
 }
 
 void WebContentDecryptionModuleSessionImpl::close() {
-  media_keys_->ReleaseSession(reference_id_);
+  media_keys_->ReleaseSession(session_id_);
 }
 
 void WebContentDecryptionModuleSessionImpl::OnSessionCreated(
-    const std::string& session_id) {
+    const std::string& web_session_id) {
   // Due to heartbeat messages, OnSessionCreated() can get called multiple
   // times.
   // TODO(jrummell): Once all CDMs are updated to support reference ids,
   // OnSessionCreated() should only be called once, and the second check can be
   // removed.
-  DCHECK(session_id_.empty() || session_id_ == session_id)
+  DCHECK(web_session_id_.empty() || web_session_id_ == web_session_id)
       << "Session ID may not be changed once set.";
-  session_id_ = session_id;
+  web_session_id_ = web_session_id;

[ddorwin, 2013/12/05 00:44:52]

If we don't need the accessor, only sessionId() uses this. We can probably just
convert this to a WebString here. That also makes it even more obvious what it
is.

[jrummell, 2013/12/06 23:42:35]

Done.

 }
 
 void WebContentDecryptionModuleSessionImpl::OnSessionMessage(
@@ -89,7 +89,7 @@ void WebContentDecryptionModuleSessionImpl::OnSessionReady() {
 
 void WebContentDecryptionModuleSessionImpl::OnSessionClosed() {
   if (!session_closed_cb_.is_null())
-    base::ResetAndReturn(&session_closed_cb_).Run(reference_id_);
+    base::ResetAndReturn(&session_closed_cb_).Run(session_id_);
 }
 
 void WebContentDecryptionModuleSessionImpl::OnSessionError(