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

media/filters/decrypting_video_decoder_unittest.cc

Index: media/filters/decrypting_video_decoder_unittest.cc
diff --git a/media/filters/decrypting_video_decoder_unittest.cc b/media/filters/decrypting_video_decoder_unittest.cc
index 5fcb74e196796967a59f89386ca3ee66c9997beb..dba3e2e8d54bf0ec937e4050159c6ab0c633c427 100644
--- a/media/filters/decrypting_video_decoder_unittest.cc
+++ b/media/filters/decrypting_video_decoder_unittest.cc
@@ -57,6 +57,8 @@
       : decoder_(new DecryptingVideoDecoder(
             message_loop_.task_runner(),
             new MediaLog(),
+            base::Bind(&DecryptingVideoDecoderTest::RequestCdmNotification,
+                       base::Unretained(this)),
             base::Bind(&DecryptingVideoDecoderTest::OnWaitingForDecryptionKey,
                        base::Unretained(this)))),
         cdm_context_(new StrictMock<MockCdmContext>()),
@@ -95,13 +97,9 @@
   // can succeed or fail.
   void InitializeAndExpectResult(const VideoDecoderConfig& config,
                                  bool success) {
-    decoder_->Initialize(
-        config, false,
-        base::Bind(&DecryptingVideoDecoderTest::RequestCdmNotification,
-                   base::Unretained(this)),
-        NewExpectedBoolCB(success),
-        base::Bind(&DecryptingVideoDecoderTest::FrameReady,
-                   base::Unretained(this)));
+    decoder_->Initialize(config, false, NewExpectedBoolCB(success),
+                         base::Bind(&DecryptingVideoDecoderTest::FrameReady,
+                                    base::Unretained(this)));
     message_loop_.RunUntilIdle();
   }
 
@@ -430,13 +428,10 @@
   CdmReadyCB cdm_ready_cb;
   EXPECT_CALL(*this, RequestCdmNotification(_))
       .WillOnce(SaveArg<0>(&cdm_ready_cb));
-  decoder_->Initialize(
-      TestVideoConfig::NormalEncrypted(), false,
-      base::Bind(&DecryptingVideoDecoderTest::RequestCdmNotification,
-                 base::Unretained(this)),
-      NewExpectedBoolCB(false),
-      base::Bind(&DecryptingVideoDecoderTest::FrameReady,
-                 base::Unretained(this)));
+  decoder_->Initialize(TestVideoConfig::NormalEncrypted(), false,
+                       NewExpectedBoolCB(false),
+                       base::Bind(&DecryptingVideoDecoderTest::FrameReady,
+                                  base::Unretained(this)));
   message_loop_.RunUntilIdle();
   // |cdm_ready_cb| is saved but not called here.
   EXPECT_FALSE(cdm_ready_cb.is_null());