Separate DemuxerStream and VideoDecoder.

media/filters/decrypting_demuxer_stream.h

Index: media/filters/decrypting_demuxer_stream.h
diff --git a/media/filters/decrypting_demuxer_stream.h b/media/filters/decrypting_demuxer_stream.h
index 27ed736f82be9b74862aa7d1f9cbbbfc8479061b..bd75d665baf21028195571f36721f3da11c96cb8 100644
--- a/media/filters/decrypting_demuxer_stream.h
+++ b/media/filters/decrypting_demuxer_stream.h
@@ -37,12 +37,6 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
                   const PipelineStatusCB& status_cb);
   void Reset(const base::Closure& closure);
 
-  // Creates and initializes either |audio_config_| or |video_config_| based on
-  // |demuxer_stream_|.
-  // TODO(xhwang): Make this private after the hack in VideoFrameStream is
-  // removed.
-  void InitializeDecoderConfig();
-
   // DemuxerStream implementation.
   virtual void Read(const ReadCB& read_cb) OVERRIDE;
   virtual AudioDecoderConfig audio_decoder_config() OVERRIDE;
@@ -87,6 +81,10 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
   // Returns Decryptor::StreamType converted from |stream_type_|.
   Decryptor::StreamType GetDecryptorStreamType() const;
 
+  // Creates and initializes either |audio_config_| or |video_config_| based on
+  // |demuxer_stream_|.
+  void InitializeDecoderConfig();
+
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   base::WeakPtrFactory<DecryptingDemuxerStream> weak_factory_;
   base::WeakPtr<DecryptingDemuxerStream> weak_this_;