media: Replace DecryptorReadyCB with CdmReadyCB.

media/filters/decoder_selector.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_FILTERS_DECODER_SELECTOR_H_
 #define MEDIA_FILTERS_DECODER_SELECTOR_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
-#include "media/base/decryptor.h"
+#include "media/base/cdm_context.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/pipeline_status.h"
 #include "media/filters/decoder_stream_traits.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace media {
 
 class DecoderBuffer;
 class DecryptingDemuxerStream;
-class Decryptor;
 class MediaLog;
 
 // DecoderSelector (creates if necessary and) initializes the proper
 // Decoder for a given DemuxerStream. If the given DemuxerStream is
 // encrypted, a DecryptingDemuxerStream may also be created.
 // The template parameter |StreamType| is the type of stream we will be
 // selecting a decoder for.
 template<DemuxerStream::Type StreamType>
 class MEDIA_EXPORT DecoderSelector {
  public:
@@ skipping 24 matching lines @@
   // NULL and NULL immediately if it's pending.
   ~DecoderSelector();
 
   // Initializes and selects the first Decoder that can decode the |stream|.
   // The selected Decoder (and DecryptingDemuxerStream) is returned via
   // the |select_decoder_cb|.
   // Notes:
   // 1. This must not be called again before |select_decoder_cb| is run.
   // 2. Decoders that fail to initialize will be deleted. Future calls will
   //    select from the decoders following the decoder that was last returned.
-  // 3. |set_decryptor_ready_cb| is optional. If |set_decryptor_ready_cb| is
-  //    null, no decryptor will be available to perform decryption.
+  // 3. |set_cdm_ready_cb| is optional. If |set_cdm_ready_cb| is
+  //    null, no CDM will be available to perform decryption.
   void 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);
 
  private:
 #if !defined(OS_ANDROID)
   void InitializeDecryptingDecoder();
   void DecryptingDecoderInitDone(bool success);
 #endif
   void InitializeDecryptingDemuxerStream();
   void DecryptingDemuxerStreamInitDone(PipelineStatus status);
   void InitializeDecoder();
   void DecoderInitDone(bool success);
   void ReturnNullDecoder();
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   ScopedVector<Decoder> decoders_;
   scoped_refptr<MediaLog> media_log_;
 
   DemuxerStream* input_stream_;
-  SetDecryptorReadyCB set_decryptor_ready_cb_;
+  SetCdmReadyCB set_cdm_ready_cb_;
   SelectDecoderCB select_decoder_cb_;
   typename Decoder::OutputCB output_cb_;
   base::Closure waiting_for_decryption_key_cb_;
 
   scoped_ptr<Decoder> decoder_;
   scoped_ptr<DecryptingDemuxerStream> decrypted_stream_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<DecoderSelector> weak_ptr_factory_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(DecoderSelector);
 };
 
 typedef DecoderSelector<DemuxerStream::VIDEO> VideoDecoderSelector;
 typedef DecoderSelector<DemuxerStream::AUDIO> AudioDecoderSelector;
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_SELECTOR_H_