AesDecryptor callbacks now used in a thread-safe manner

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 270 matching lines @@
       DVLOG(1) << "Invalid key length: " << key_string.length();
       session_error_cb_.Run(session_id, MediaKeys::kUnknownError, 0);
       return;
     }
     if (!AddDecryptionKey(session_id, it->first, it->second)) {
       session_error_cb_.Run(session_id, MediaKeys::kUnknownError, 0);
       return;
     }
   }
 
+  base::AutoLock auto_lock(key_cb_lock_);

[ddorwin, 2013/12/19 19:34:16]

Should we put this in {} down to 298 so session_ready_cb_ is not inside this
lock?

[jrummell, 2013/12/19 23:15:40]

Done.

+
   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(session_id);
 }
 
 void AesDecryptor::ReleaseSession(uint32 session_id) {
   // Validate that this is a reference to an active session and then forget it.
   std::set<uint32>::iterator it = valid_sessions_.find(session_id);
   DCHECK(it != valid_sessions_.end());
   valid_sessions_.erase(it);
 
   DeleteKeysForSession(session_id);
   session_closed_cb_.Run(session_id);
 }
 
 Decryptor* AesDecryptor::GetDecryptor() {
   return this;
 }
 
 void AesDecryptor::RegisterNewKeyCB(StreamType stream_type,
                                     const NewKeyCB& new_key_cb) {
+  base::AutoLock auto_lock(key_cb_lock_);
+
   switch (stream_type) {
     case kAudio:
       new_audio_key_cb_ = new_key_cb;
       break;
     case kVideo:
       new_video_key_cb_ = new_key_cb;
       break;
     default:
       NOTREACHED();
   }
@@ skipping 138 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