Minor cleanup of DecoderStreamTraits.

media/filters/decoder_stream_traits.cc

Index: media/filters/decoder_stream_traits.cc
diff --git a/media/filters/decoder_stream_traits.cc b/media/filters/decoder_stream_traits.cc
index c86862f7fa4e4dd1ebf6f9fd9d68da5142e4debd..19672b22698e45f5b5fa1320e52aa5e9c13b0eaa 100644
--- a/media/filters/decoder_stream_traits.cc
+++ b/media/filters/decoder_stream_traits.cc
@@ -27,19 +27,6 @@ void DecoderStreamTraits<DemuxerStream::AUDIO>::Initialize(
   decoder->Initialize(config, status_cb, output_cb);
 }
 
-bool DecoderStreamTraits<DemuxerStream::AUDIO>::FinishInitialization(
-    const StreamInitCB& init_cb,
-    DecoderType* decoder,
-    DemuxerStream* stream) {
-  DCHECK(stream);
-  if (!decoder) {
-    init_cb.Run(false);
-    return false;
-  }
-  init_cb.Run(true);
-  return true;
-}
-
 void DecoderStreamTraits<DemuxerStream::AUDIO>::ReportStatistics(
     const StatisticsCB& statistics_cb,
     int bytes_decoded) {
@@ -72,19 +59,10 @@ void DecoderStreamTraits<DemuxerStream::VIDEO>::Initialize(
   decoder->Initialize(config, low_delay, status_cb, output_cb);
 }
 
-bool DecoderStreamTraits<DemuxerStream::VIDEO>::FinishInitialization(
-    const StreamInitCB& init_cb,
-    DecoderType* decoder,
-    DemuxerStream* stream) {
-  DCHECK(stream);
-  if (!decoder) {
-    init_cb.Run(false);
-    return false;
-  }
-  if (decoder->NeedsBitstreamConversion())
-    stream->EnableBitstreamConverter();
-  init_cb.Run(true);
-  return true;
+bool DecoderStreamTraits<DemuxerStream::VIDEO>::NeedsBitstreamConversion(
+    DecoderType* decoder) {
+  DCHECK(decoder);

[scherkus (not reviewing), 2014/08/20 17:26:54]

nit: these types of checks where we immediately dereference a pointer aren't
needed

+  return decoder->NeedsBitstreamConversion();
 }
 
 void DecoderStreamTraits<DemuxerStream::VIDEO>::ReportStatistics(