Rename EME WD call parameters

content/renderer/media/webcontentdecryptionmodulesession_impl.cc

 // 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.
 
 #include "content/renderer/media/webcontentdecryptionmodulesession_impl.h"
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 
 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);
 
 WebContentDecryptionModuleSessionImpl::WebContentDecryptionModuleSessionImpl(
     media::MediaKeys* media_keys,
     Client* client,
     const SessionClosedCB& session_closed_cb)
     : 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_);
 }
 
 WebContentDecryptionModuleSessionImpl::
 ~WebContentDecryptionModuleSessionImpl() {
 }
 
 blink::WebString WebContentDecryptionModuleSessionImpl::sessionId() const {
-  return blink::WebString::fromUTF8(session_id_);
+  return blink::WebString::fromUTF8(web_session_id_);
 }
 
 void WebContentDecryptionModuleSessionImpl::generateKeyRequest(
     const blink::WebString& mime_type,
     const uint8* init_data, size_t init_data_length) {
   // TODO(ddorwin): Guard against this in supported types check and remove this.
   // Chromium only supports ASCII MIME types.
   if (!IsStringASCII(mime_type)) {
     NOTREACHED();
     OnSessionError(media::MediaKeys::kUnknownError, 0);
     return;
   }
 
   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(
     const std::vector<uint8>& message,
     const std::string& destination_url) {
   client_->keyMessage(message.empty() ? NULL : &message[0],
                       message.size(),
                       GURL(destination_url));
 }
 
 void WebContentDecryptionModuleSessionImpl::OnSessionReady() {
   // TODO(jrummell): Blink APIs need to be updated to the new EME API. For now,
   // convert the response to the old v0.1b API.
   client_->keyAdded();
 }
 
 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(
     media::MediaKeys::KeyError error_code,
     int system_code) {
   client_->keyError(static_cast<Client::MediaKeyErrorCode>(error_code),
                     system_code);
 }
 
 }  // namespace content