Encrypted Media: Replace DecryptorClient with key event callbacks.

media/filters/decrypting_audio_decoder.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/filters/decrypting_audio_decoder.h"
 
 #include <cstdlib>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 181 matching lines @@
 
   // Success!
   const AudioDecoderConfig& config = demuxer_stream_->audio_decoder_config();
   bits_per_channel_ = config.bits_per_channel();
   channel_layout_ = config.channel_layout();
   samples_per_second_ = config.samples_per_second();
   const int kBitsPerByte = 8;
   bytes_per_sample_ = ChannelLayoutToChannelCount(channel_layout_) *
       bits_per_channel_ / kBitsPerByte;
 
-  decryptor_->RegisterKeyAddedCB(
+  decryptor_->RegisterNewKeyCB(
       Decryptor::kAudio, BIND_TO_LOOP(&DecryptingAudioDecoder::OnKeyAdded));
 
   state_ = kIdle;
   base::ResetAndReturn(&init_cb_).Run(PIPELINE_OK);
 }
 
 void DecryptingAudioDecoder::DoRead(const ReadCB& read_cb) {
   DVLOG(3) << "DoRead()";
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK(state_ == kIdle || state_ == kDecodeFinished) << state_;
@@ skipping 239 matching lines @@
 
 base::TimeDelta DecryptingAudioDecoder::NumberOfSamplesToDuration(
     int number_of_samples) const {
   DCHECK(samples_per_second_);
   return base::TimeDelta::FromMicroseconds(base::Time::kMicrosecondsPerSecond *
                                            number_of_samples /
                                            samples_per_second_);
 }
 
 }  // namespace media