media: Remove SetCdmReadyCB and CdmReadyCB (part 1).

media/base/video_decoder.h

Index: media/base/video_decoder.h
diff --git a/media/base/video_decoder.h b/media/base/video_decoder.h
index 68737c7328d9e8e756e0fca852d857fd2ff0a6a0..c150bc62f72ccd443525903c0ecd9df2b7e56db6 100644
--- a/media/base/video_decoder.h
+++ b/media/base/video_decoder.h
@@ -10,13 +10,13 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "media/base/cdm_context.h"
 #include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace media {
 
+class CdmContext;
 class DecoderBuffer;
 class VideoDecoderConfig;
 class VideoFrame;
@@ -65,9 +65,8 @@ class MEDIA_EXPORT VideoDecoder {
   // Initialization should fail if |low_delay| is true and the decoder cannot
   // satisfy the requirements above.
   //
-  // |set_cdm_ready_cb| can be used to set/cancel a CdmReadyCB with which the
-  // decoder can be notified when a CDM is ready. The decoder can use the CDM to
-  // handle encrypted video stream.
+  // |cdm_context| can be used to handle encrypted buffers. May be null if the
+  // stream is not encrypted.
   //
   // Note:
   // 1) The VideoDecoder will be reinitialized if it was initialized before.
@@ -76,7 +75,7 @@ class MEDIA_EXPORT VideoDecoder {
   // 3) No VideoDecoder calls should be made before |init_cb| is executed.
   virtual void Initialize(const VideoDecoderConfig& config,
                           bool low_delay,
-                          const SetCdmReadyCB& set_cdm_ready_cb,
+                          CdmContext* cdm_context,
                           const InitCB& init_cb,
                           const OutputCB& output_cb) = 0;