Support LoadSession() in MediaKeys and PPP_ContentDecryptor_Private interface.

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 <list>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 213 matching lines @@
       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() {
   key_map_.clear();
 }
 
 bool AesDecryptor::CreateSession(uint32 session_id,
-                                 const std::string& type,
+                                 const std::string& content_type,
                                  const uint8* init_data,
                                  int init_data_length) {
   // Validate that this is a new session.
   DCHECK(valid_sessions_.find(session_id) == valid_sessions_.end());
   valid_sessions_.insert(session_id);
 
   std::string web_session_id_string(base::UintToString(next_web_session_id_++));
 
-  // For now, the AesDecryptor does not care about |type|;
+  // For now, the AesDecryptor does not care about |content_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(session_id, web_session_id_string);
   session_message_cb_.Run(session_id, message, std::string());
   return true;
 }
 
+bool AesDecryptor::LoadSession(uint32 session_id,
+                               const std::string& web_session_id) {
+  session_error_cb_.Run(session_id, MediaKeys::kUnknownError, 0);

[ddorwin, 2014/02/10 19:05:25]

I don't think we need this error. For prefixed, we have the return. For WD, we
need to throw an exception earlier, which should make this a NOTREACHED().

[xhwang, 2014/02/10 22:30:55]

Done.

+  return false;
+}
+
 void AesDecryptor::UpdateSession(uint32 session_id,
                                  const uint8* response,
                                  int response_length) {
   CHECK(response);
   CHECK_GT(response_length, 0);
   DCHECK(valid_sessions_.find(session_id) != valid_sessions_.end());
 
   std::string key_string(reinterpret_cast<const char*>(response),
                          response_length);
   KeyIdAndKeyPairs keys;
@@ skipping 202 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