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

media/filters/ffmpeg_audio_decoder.cc

 // Copyright (c) 2012 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 "media/filters/ffmpeg_audio_decoder.h"
 
 #include "base/callback_helpers.h"
 #include "base/single_thread_task_runner.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/audio_bus.h"
@@ skipping 128 matching lines @@
 
   if (state_ != kUninitialized)
     ReleaseFFmpegResources();
 }
 
 std::string FFmpegAudioDecoder::GetDisplayName() const {
   return "FFmpegAudioDecoder";
 }
 
 void FFmpegAudioDecoder::Initialize(const AudioDecoderConfig& config,
-                                    const SetCdmReadyCB& /* set_cdm_ready_cb */,
                                     const InitCB& init_cb,
                                     const OutputCB& output_cb) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(config.IsValidConfig());
 
   InitCB bound_init_cb = BindToCurrentLoop(init_cb);
 
   if (config.is_encrypted()) {
     bound_init_cb.Run(false);
     return;
@@ skipping 224 matching lines @@
   return true;
 }
 
 void FFmpegAudioDecoder::ResetTimestampState() {
   discard_helper_.reset(new AudioDiscardHelper(config_.samples_per_second(),
                                                config_.codec_delay()));
   discard_helper_->Reset(config_.codec_delay());
 }
 
 }  // namespace media