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

media/filters/opus_audio_decoder.cc

 // Copyright 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/opus_audio_decoder.h"
 
 #include <cmath>
 
 #include "base/single_thread_task_runner.h"
 #include "base/sys_byteorder.h"
@@ skipping 114 matching lines @@
 
 OpusAudioDecoder::OpusAudioDecoder(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner)
     : task_runner_(task_runner), opus_decoder_(nullptr) {}
 
 std::string OpusAudioDecoder::GetDisplayName() const {
   return "OpusAudioDecoder";
 }
 
 void OpusAudioDecoder::Initialize(const AudioDecoderConfig& config,
-                                  const SetCdmReadyCB& /* set_cdm_ready_cb */,
                                   const InitCB& init_cb,
                                   const OutputCB& output_cb) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   InitCB bound_init_cb = BindToCurrentLoop(init_cb);
 
   if (config.is_encrypted()) {
     bound_init_cb.Run(false);
     return;
   }
 
@@ skipping 207 matching lines @@
     output_buffer->get()->TrimEnd(trim_frames);
 
   // Handles discards and timestamping.  Discard the buffer if more data needed.
   if (!discard_helper_->ProcessBuffers(input, *output_buffer))
     *output_buffer = nullptr;
 
   return true;
 }
 
 }  // namespace media