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

media/filters/audio_decoder_unittest.cc

 // 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.
 
 #include <deque>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/md5.h"
@@ skipping 152 matching lines @@
     InitializeDecoder(config);
   }
 
   void InitializeDecoder(const AudioDecoderConfig& config) {
     InitializeDecoderWithResult(config, true);
   }
 
   void InitializeDecoderWithResult(const AudioDecoderConfig& config,
                                    bool success) {
     decoder_->Initialize(
-        config, SetCdmReadyCB(), NewExpectedBoolCB(success),
+        config, NewExpectedBoolCB(success),
         base::Bind(&AudioDecoderTest::OnDecoderOutput, base::Unretained(this)));
     base::RunLoop().RunUntilIdle();
   }
 
   void Decode() {
     AVPacket packet;
     ASSERT_TRUE(reader_->ReadPacketForTesting(&packet));
 
     // Split out packet metadata before making a copy.
     av_packet_split_side_data(&packet);
@@ skipping 340 matching lines @@
 };
 
 INSTANTIATE_TEST_CASE_P(FFmpegAudioDecoderTest,
                         AudioDecoderTest,
                         testing::ValuesIn(kFFmpegTests));
 INSTANTIATE_TEST_CASE_P(FFmpegAudioDecoderBehavioralTest,
                         FFmpegAudioDecoderBehavioralTest,
                         testing::ValuesIn(kFFmpegBehavioralTest));
 
 }  // namespace media