Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

media/crypto/aes_decryptor.cc

 // Copyright (c) 2012 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/crypto/aes_decryptor.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 120 matching lines @@
     : key_added_cb_(key_added_cb),
       key_error_cb_(key_error_cb),
       key_message_cb_(key_message_cb),
       need_key_cb_(need_key_cb) {
 }
 
 AesDecryptor::~AesDecryptor() {
   STLDeleteValues(&key_map_);
 }
 
-bool AesDecryptor::GenerateKeyRequest(const std::string& key_system,
-                                      const std::string& type,
+bool AesDecryptor::GenerateKeyRequest(const std::string& type,
                                       const uint8* init_data,
                                       int init_data_length) {
   std::string session_id_string(base::UintToString(next_session_id_++));
 
-  // For now, the AesDecryptor does not care about |key_system| and |type|;
+  // For now, the AesDecryptor does not care about |type|;
   // just fire the event with the |init_data| as the request.
   std::string message;
   if (init_data && init_data_length) {
     message = std::string(reinterpret_cast<const char*>(init_data),
                           init_data_length);
   }
 
-  key_message_cb_.Run(key_system, session_id_string, message, std::string());
+  key_message_cb_.Run(session_id_string, message, std::string());
   return true;
 }
 
-void AesDecryptor::AddKey(const std::string& key_system,
-                          const uint8* key,
+void AesDecryptor::AddKey(const uint8* key,
                           int key_length,
                           const uint8* init_data,
                           int init_data_length,
                           const std::string& session_id) {
   CHECK(key);
   CHECK_GT(key_length, 0);
 
   // TODO(xhwang): Add |session_id| check after we figure out how:
   // https://www.w3.org/Bugs/Public/show_bug.cgi?id=16550
   if (key_length != DecryptConfig::kDecryptionKeySize) {
     DVLOG(1) << "Invalid key length: " << key_length;
-    key_error_cb_.Run(key_system, session_id, MediaKeys::kUnknownError, 0);
+    key_error_cb_.Run(session_id, MediaKeys::kUnknownError, 0);
     return;
   }
 
   // TODO(xhwang): Fix the decryptor to accept no |init_data|. See
   // http://crbug.com/123265. Until then, ensure a non-empty value is passed.
   static const uint8 kDummyInitData[1] = { 0 };
   if (!init_data) {
     init_data = kDummyInitData;
     init_data_length = arraysize(kDummyInitData);
   }
 
   // TODO(xhwang): For now, use |init_data| for key ID. Make this more spec
   // compliant later (http://crbug.com/123262, http://crbug.com/123265).
   std::string key_id_string(reinterpret_cast<const char*>(init_data),
                             init_data_length);
   std::string key_string(reinterpret_cast<const char*>(key) , key_length);
   scoped_ptr<DecryptionKey> decryption_key(new DecryptionKey(key_string));
   if (!decryption_key) {
     DVLOG(1) << "Could not create key.";
-    key_error_cb_.Run(key_system, session_id, MediaKeys::kUnknownError, 0);
+    key_error_cb_.Run(session_id, MediaKeys::kUnknownError, 0);
     return;
   }
 
   if (!decryption_key->Init()) {
     DVLOG(1) << "Could not initialize decryption key.";
-    key_error_cb_.Run(key_system, session_id, MediaKeys::kUnknownError, 0);
+    key_error_cb_.Run(session_id, MediaKeys::kUnknownError, 0);
     return;
   }
 
   SetKey(key_id_string, decryption_key.Pass());
 
   if (!new_audio_key_cb_.is_null())
     new_audio_key_cb_.Run();
 
   if (!new_video_key_cb_.is_null())
     new_video_key_cb_.Run();
 
-  key_added_cb_.Run(key_system, session_id);
+  key_added_cb_.Run(session_id);
 }
 
-void AesDecryptor::CancelKeyRequest(const std::string& key_system,
-                                    const std::string& session_id) {
+void AesDecryptor::CancelKeyRequest(const std::string& session_id) {
 }
 
 MediaKeys* AesDecryptor::GetMediaKeys() {
   return this;
 }
 
 void AesDecryptor::RegisterNewKeyCB(StreamType stream_type,
                                     const NewKeyCB& new_key_cb) {
   switch (stream_type) {
     case kAudio:
@@ skipping 107 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