Clean up media::DecryptingDemuxerStream.

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 b51ce3e8b7a08a9f6b091c0a0ca8973a8824dd1a..0da4368b5194170a0db8153b8711a0039cf5cac3 100644
--- a/media/filters/decrypting_demuxer_stream.h
+++ b/media/filters/decrypting_demuxer_stream.h
@@ -56,10 +56,6 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
     kWaitingForKey,
   };
 
-  // Carries out the initialization operation scheduled by Initialize().
-  void DoInitialize(const scoped_refptr<DemuxerStream>& stream,
-                    const PipelineStatusCB& status_cb);
-
   // Callback for DecryptorHost::RequestDecryptor().
   void SetDecryptor(Decryptor* decryptor);
 
@@ -67,20 +63,12 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
   void DecryptBuffer(DemuxerStream::Status status,
                      const scoped_refptr<DecoderBuffer>& buffer);
 
-  // Carries out the buffer decryption operation scheduled by DecryptBuffer().
-  void DoDecryptBuffer(DemuxerStream::Status status,
-                       const scoped_refptr<DecoderBuffer>& buffer);
-
   void DecryptPendingBuffer();
 
   // Callback for Decryptor::Decrypt().
   void DeliverBuffer(Decryptor::Status status,
                      const scoped_refptr<DecoderBuffer>& decrypted_buffer);
 
-  // Carries out the frame delivery operation scheduled by DeliverBuffer().
-  void DoDeliverBuffer(Decryptor::Status status,
-                       const scoped_refptr<DecoderBuffer>& decrypted_buffer);
-
   // Callback for the |decryptor_| to notify this object that a new key has been
   // added.
   void OnKeyAdded();
@@ -91,8 +79,9 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
   // Returns Decryptor::StreamType converted from |stream_type_|.
   Decryptor::StreamType GetDecryptorStreamType() const;
 
-  // Sets |{audio|video}_config_| from |stream|.
-  void SetDecoderConfig(const scoped_refptr<DemuxerStream>& stream);
+  // Creates and initializes either |audio_config_| or |video_config_| based on
+  // |demuxer_stream_|.
+  void InitializeDecoderConfig();
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
 
@@ -105,7 +94,6 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
   // Pointer to the input demuxer stream that will feed us encrypted buffers.
   scoped_refptr<DemuxerStream> demuxer_stream_;
 
-  Type stream_type_;
   scoped_ptr<AudioDecoderConfig> audio_config_;
   scoped_ptr<VideoDecoderConfig> video_config_;