Rename EME WD call parameters

media/cdm/aes_decryptor.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 "media/cdm/aes_decryptor.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 139 matching lines @@
     : session_created_cb_(session_created_cb),
       session_message_cb_(session_message_cb),
       session_ready_cb_(session_ready_cb),
       session_closed_cb_(session_closed_cb),
       session_error_cb_(session_error_cb) {}
 
 AesDecryptor::~AesDecryptor() {
   STLDeleteValues(&key_map_);
 }
 
-bool AesDecryptor::CreateSession(uint32 reference_id,
+bool AesDecryptor::CreateSession(uint32 session_id,
                                  const std::string& type,
                                  const uint8* init_data,
                                  int init_data_length) {
   std::string session_id_string(base::UintToString(next_session_id_++));

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

web_?

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

Done.

 
   // For now, the AesDecryptor does not care about |type|;
   // just fire the event with the |init_data| as the request.
   std::vector<uint8> message;
   if (init_data && init_data_length)
     message.assign(init_data, init_data + init_data_length);
 
-  session_created_cb_.Run(reference_id, session_id_string);
-  session_message_cb_.Run(reference_id, message, std::string());
+  session_created_cb_.Run(session_id, session_id_string);
+  session_message_cb_.Run(session_id, message, std::string());

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

just double check, do we have a DCHECK that created_cb must be fired before
message_cb somewhere?

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

SessionMessage will fail when it tries to convert session_id to web_session_id
on the way to the app. There is a DCHECK there.

   return true;
 }
 
-void AesDecryptor::UpdateSession(uint32 reference_id,
+void AesDecryptor::UpdateSession(uint32 session_id,
                                  const uint8* response,
                                  int response_length) {
   CHECK(response);
   CHECK_GT(response_length, 0);
 
   std::string key_string(reinterpret_cast<const char*>(response),
                          response_length);
   KeyIdAndKeyPairs keys;
   if (!ExtractKeysFromJWKSet(key_string, &keys)) {
-    session_error_cb_.Run(reference_id, MediaKeys::kUnknownError, 0);
+    session_error_cb_.Run(session_id, MediaKeys::kUnknownError, 0);
     return;
   }
 
   // Make sure that at least one key was extracted.
   if (keys.empty()) {
-    session_error_cb_.Run(reference_id, MediaKeys::kUnknownError, 0);
+    session_error_cb_.Run(session_id, MediaKeys::kUnknownError, 0);
     return;
   }
 
   for (KeyIdAndKeyPairs::iterator it = keys.begin(); it != keys.end(); ++it) {
     if (it->second.length() !=
         static_cast<size_t>(DecryptConfig::kDecryptionKeySize)) {
       DVLOG(1) << "Invalid key length: " << key_string.length();
-      session_error_cb_.Run(reference_id, MediaKeys::kUnknownError, 0);
+      session_error_cb_.Run(session_id, MediaKeys::kUnknownError, 0);
       return;
     }
     if (!AddDecryptionKey(it->first, it->second)) {
-      session_error_cb_.Run(reference_id, MediaKeys::kUnknownError, 0);
+      session_error_cb_.Run(session_id, MediaKeys::kUnknownError, 0);
       return;
     }
   }
 
   if (!new_audio_key_cb_.is_null())
     new_audio_key_cb_.Run();
 
   if (!new_video_key_cb_.is_null())
     new_video_key_cb_.Run();
 
-  session_ready_cb_.Run(reference_id);
+  session_ready_cb_.Run(session_id);
 }
 
-void AesDecryptor::ReleaseSession(uint32 reference_id) {
+void AesDecryptor::ReleaseSession(uint32 session_id) {
   // TODO: Implement: http://crbug.com/313412.
 }
 
 Decryptor* AesDecryptor::GetDecryptor() {
   return this;
 }
 
 void AesDecryptor::RegisterNewKeyCB(StreamType stream_type,
                                     const NewKeyCB& new_key_cb) {
   switch (stream_type) {
@@ skipping 120 matching lines @@
 bool AesDecryptor::DecryptionKey::Init() {
   CHECK(!secret_.empty());
   decryption_key_.reset(crypto::SymmetricKey::Import(
       crypto::SymmetricKey::AES, secret_));
   if (!decryption_key_)
     return false;
   return true;
 }
 
 }  // namespace media