Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf

1 files changed, 2 insertions, 4 deletions

diff --git a/media/filters/decoder_stream_traits.cc b/media/filters/decoder_stream_traits.cc
index 0eb4aa30b1..4eb2e48a28 100644
--- a/media/filters/decoder_stream_traits.cc
+++ b/media/filters/decoder_stream_traits.cc
@@ -53,14 +53,12 @@ bool DecoderStreamTraits<DemuxerStream::VIDEO>::FinishInitialization(
     DemuxerStream* stream) {
   DCHECK(stream);
   if (!decoder) {
-    init_cb.Run(false, false);
+    init_cb.Run(false);
     return false;
   }
   if (decoder->NeedsBitstreamConversion())
     stream->EnableBitstreamConverter();
-  // TODO(xhwang): We assume |decoder_->HasAlpha()| does not change after
-  // reinitialization. Check this condition.
-  init_cb.Run(true, decoder->HasAlpha());
+  init_cb.Run(true);
   return true;
 }