Encrypted Media: Replace DecryptorClient with key event callbacks.

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 221 matching lines @@
   decrypted->SetDuration(encrypted->GetDuration());
   decrypt_cb.Run(kSuccess, decrypted);
 }
 
 void AesDecryptor::CancelDecrypt(StreamType stream_type) {
   // Decrypt() calls the DecryptCB synchronously so there's nothing to cancel.
 }
 
 void AesDecryptor::InitializeAudioDecoder(scoped_ptr<AudioDecoderConfig> config,
                                           const DecoderInitCB& init_cb,
-                                          const KeyAddedCB& key_added_cb) {
+                                          const OnKeyAddedCB& key_added_cb) {

[Ami GONE FROM CHROMIUM, 2012/10/23 06:52:22]

I wish you hadn't done all this renaming in a prototype CL that's meant to
gather feedback on something else...

[xhwang, 2012/10/23 07:32:13]

Sorry for the noise. I realized that I need to do this since Decryptor and
DecryptorClient both define KeyAddedCB, and ProxyDecryptor inherits both :) 
Next time I'll make a prototype CL really prototyping :)

   // AesDecryptor does not support audio decoding.
   init_cb.Run(false);
 }
 
 void AesDecryptor::InitializeVideoDecoder(scoped_ptr<VideoDecoderConfig> config,
                                           const DecoderInitCB& init_cb,
-                                          const KeyAddedCB& key_added_cb) {
+                                          const OnKeyAddedCB& key_added_cb) {
   // AesDecryptor does not support video decoding.
   init_cb.Run(false);
 }
 
 void AesDecryptor::DecryptAndDecodeAudio(
     const scoped_refptr<DecoderBuffer>& encrypted,
     const AudioDecodeCB& audio_decode_cb) {
   NOTREACHED() << "AesDecryptor does not support audio decoding";
 }
 
@@ skipping 41 matching lines @@
 bool AesDecryptor::DecryptionKey::Init() {
   CHECK(!secret_.empty());
   decryption_key_.reset(crypto::SymmetricKey::Import(
       crypto::SymmetricKey::AES, secret_));
   if (!decryption_key_.get())
     return false;
   return true;
 }
 
 }  // namespace media