media: Remove SetCdmReadyCB and CdmReadyCB (part 1).

media/filters/decoder_stream_traits.h

Index: media/filters/decoder_stream_traits.h
diff --git a/media/filters/decoder_stream_traits.h b/media/filters/decoder_stream_traits.h
index 920aefc4853e3adc87fce97b2324d4571e3084b8..e098906b840990d16a4d378dbd2ae48ba94729ba 100644
--- a/media/filters/decoder_stream_traits.h
+++ b/media/filters/decoder_stream_traits.h
@@ -13,6 +13,7 @@ namespace media {
 
 class AudioBuffer;
 class AudioDecoder;
+class CdmContext;
 class DecryptingAudioDecoder;
 class DecryptingVideoDecoder;
 class DemuxerStream;
@@ -33,7 +34,7 @@ struct DecoderStreamTraits<DemuxerStream::AUDIO> {
   static std::string ToString();
   static void InitializeDecoder(DecoderType* decoder,
                                 DemuxerStream* stream,
-                                const SetCdmReadyCB& set_cdm_ready_cb,
+                                CdmContext* cdm_context,
                                 const InitCB& init_cb,
                                 const OutputCB& output_cb);
   static bool NeedsBitstreamConversion(DecoderType* decoder) { return false; }
@@ -53,7 +54,7 @@ struct DecoderStreamTraits<DemuxerStream::VIDEO> {
   static std::string ToString();
   static void InitializeDecoder(DecoderType* decoder,
                                 DemuxerStream* stream,
-                                const SetCdmReadyCB& set_cdm_ready_cb,
+                                CdmContext* cdm_context,
                                 const InitCB& init_cb,
                                 const OutputCB& output_cb);
   static bool NeedsBitstreamConversion(DecoderType* decoder);