Revert 276344 "Add callback in VideoDecoder and AudioDecoder to ..."

media/filters/decoder_selector.cc

Index: media/filters/decoder_selector.cc
===================================================================
--- media/filters/decoder_selector.cc	(revision 277175)
+++ media/filters/decoder_selector.cc	(working copy)
@@ -69,8 +69,7 @@
 void DecoderSelector<StreamType>::SelectDecoder(
     DemuxerStream* stream,
     bool low_delay,
-    const SelectDecoderCB& select_decoder_cb,
-    const typename Decoder::OutputCB& output_cb) {
+    const SelectDecoderCB& select_decoder_cb) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(stream);
@@ -86,7 +85,6 @@
 
   input_stream_ = stream;
   low_delay_ = low_delay;
-  output_cb_ = output_cb;
 
   if (!IsStreamEncrypted(input_stream_)) {
     InitializeDecoder();
@@ -107,8 +105,7 @@
       StreamTraits::GetDecoderConfig(*input_stream_),
       low_delay_,
       base::Bind(&DecoderSelector<StreamType>::DecryptingDecoderInitDone,
-                 weak_ptr_factory_.GetWeakPtr()),
-      output_cb_);
+                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 template <DemuxerStream::Type StreamType>
@@ -203,8 +200,7 @@
       StreamTraits::GetDecoderConfig(*input_stream_),
       low_delay_,
       base::Bind(&DecoderSelector<StreamType>::DecoderInitDone,
-                 weak_ptr_factory_.GetWeakPtr()),
-      output_cb_);
+                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 template <DemuxerStream::Type StreamType>