Revert of media: Pass SetCdmReadyCB in {Audio|Video}Decoder::Initialize().

media/filters/decrypting_demuxer_stream_unittest.cc

Index: media/filters/decrypting_demuxer_stream_unittest.cc
diff --git a/media/filters/decrypting_demuxer_stream_unittest.cc b/media/filters/decrypting_demuxer_stream_unittest.cc
index 87c5d5efbb00582d4fe8c2dd4310ede1dd953625..72750295008e59ebcc717d247a40fef60bed64fd 100644
--- a/media/filters/decrypting_demuxer_stream_unittest.cc
+++ b/media/filters/decrypting_demuxer_stream_unittest.cc
@@ -63,6 +63,8 @@
       : demuxer_stream_(new DecryptingDemuxerStream(
             message_loop_.task_runner(),
             new MediaLog(),
+            base::Bind(&DecryptingDemuxerStreamTest::RequestCdmNotification,
+                       base::Unretained(this)),
             base::Bind(&DecryptingDemuxerStreamTest::OnWaitingForDecryptionKey,
                        base::Unretained(this)))),
         cdm_context_(new StrictMock<MockCdmContext>()),
@@ -86,22 +88,16 @@
   void InitializeAudioAndExpectStatus(const AudioDecoderConfig& config,
                                       PipelineStatus status) {
     input_audio_stream_->set_audio_decoder_config(config);
-    demuxer_stream_->Initialize(
-        input_audio_stream_.get(),
-        base::Bind(&DecryptingDemuxerStreamTest::RequestCdmNotification,
-                   base::Unretained(this)),
-        NewExpectedStatusCB(status));
+    demuxer_stream_->Initialize(input_audio_stream_.get(),
+                                NewExpectedStatusCB(status));
     message_loop_.RunUntilIdle();
   }
 
   void InitializeVideoAndExpectStatus(const VideoDecoderConfig& config,
                                       PipelineStatus status) {
     input_video_stream_->set_video_decoder_config(config);
-    demuxer_stream_->Initialize(
-        input_video_stream_.get(),
-        base::Bind(&DecryptingDemuxerStreamTest::RequestCdmNotification,
-                   base::Unretained(this)),
-        NewExpectedStatusCB(status));
+    demuxer_stream_->Initialize(input_video_stream_.get(),
+                                NewExpectedStatusCB(status));
     message_loop_.RunUntilIdle();
   }