Add DecryptingDemuxerStream.

media/filters/decrypting_video_decoder.h

Index: media/filters/decrypting_video_decoder.h
diff --git a/media/filters/decrypting_video_decoder.h b/media/filters/decrypting_video_decoder.h
index 900b0bb3db9e8a1c74b620bea286329df2d5fc85..2c2e066e44d9b582350119a30ea7ea1724d84f9d 100644
--- a/media/filters/decrypting_video_decoder.h
+++ b/media/filters/decrypting_video_decoder.h
@@ -65,7 +65,7 @@ class MEDIA_EXPORT DecryptingVideoDecoder : public VideoDecoder {
   // For a detailed state diagram please see this link: http://goo.gl/8jAok
   // TODO(xhwang): Add a ASCII state diagram in this file after this class
   // stabilizes.
-  enum DecoderState {
+  enum State {
     kUninitialized = 0,
     kDecryptorRequested,
     kPendingDecoderInit,
@@ -130,7 +130,7 @@ class MEDIA_EXPORT DecryptingVideoDecoder : public VideoDecoder {
   scoped_refptr<base::MessageLoopProxy> message_loop_;
 
   // Current state of the DecryptingVideoDecoder.
-  DecoderState state_;
+  State state_;
 
   PipelineStatusCB init_cb_;
   StatisticsCB statistics_cb_;