media: Replace DecryptorReadyCB with CdmReadyCB.

media/filters/decoder_selector.cc

Index: media/filters/decoder_selector.cc
diff --git a/media/filters/decoder_selector.cc b/media/filters/decoder_selector.cc
index 7fcc234b66afe01a9fe095373c17691ce49b54ac..0f99e798f92ebe28fe39746db9f13f9b8721a447 100644
--- a/media/filters/decoder_selector.cc
+++ b/media/filters/decoder_selector.cc
@@ -78,7 +78,7 @@ DecoderSelector<StreamType>::~DecoderSelector() {
 template <DemuxerStream::Type StreamType>
 void DecoderSelector<StreamType>::SelectDecoder(
     DemuxerStream* stream,
-    const SetDecryptorReadyCB& set_decryptor_ready_cb,
+    const SetCdmReadyCB& set_cdm_ready_cb,
     const SelectDecoderCB& select_decoder_cb,
     const typename Decoder::OutputCB& output_cb,
     const base::Closure& waiting_for_decryption_key_cb) {
@@ -87,7 +87,7 @@ void DecoderSelector<StreamType>::SelectDecoder(
   DCHECK(stream);
   DCHECK(select_decoder_cb_.is_null());
 
-  set_decryptor_ready_cb_ = set_decryptor_ready_cb;
+  set_cdm_ready_cb_ = set_cdm_ready_cb;
   waiting_for_decryption_key_cb_ = waiting_for_decryption_key_cb;
 
   // Make sure |select_decoder_cb| runs on a different execution stack.
@@ -109,7 +109,7 @@ void DecoderSelector<StreamType>::SelectDecoder(
 
   // This could be null during fallback after decoder reinitialization failure.
   // See DecoderStream<StreamType>::OnDecoderReinitialized().
-  if (set_decryptor_ready_cb_.is_null()) {
+  if (set_cdm_ready_cb_.is_null()) {
     ReturnNullDecoder();
     return;
   }
@@ -125,7 +125,7 @@ void DecoderSelector<StreamType>::SelectDecoder(
 template <DemuxerStream::Type StreamType>
 void DecoderSelector<StreamType>::InitializeDecryptingDecoder() {
   decoder_.reset(new typename StreamTraits::DecryptingDecoderType(
-      task_runner_, media_log_, set_decryptor_ready_cb_,
+      task_runner_, media_log_, set_cdm_ready_cb_,
       waiting_for_decryption_key_cb_));
 
   DecoderStreamTraits<StreamType>::InitializeDecoder(
@@ -156,9 +156,9 @@ void DecoderSelector<StreamType>::DecryptingDecoderInitDone(bool success) {
 
 template <DemuxerStream::Type StreamType>
 void DecoderSelector<StreamType>::InitializeDecryptingDemuxerStream() {
-  decrypted_stream_.reset(new DecryptingDemuxerStream(
-      task_runner_, media_log_, set_decryptor_ready_cb_,
-      waiting_for_decryption_key_cb_));
+  decrypted_stream_.reset(
+      new DecryptingDemuxerStream(task_runner_, media_log_, set_cdm_ready_cb_,
+                                  waiting_for_decryption_key_cb_));
 
   decrypted_stream_->Initialize(
       input_stream_,