Revert of media config: expand is_encrypted to a struct.

media/formats/mp2t/es_parser_h264.h

Index: media/formats/mp2t/es_parser_h264.h
diff --git a/media/formats/mp2t/es_parser_h264.h b/media/formats/mp2t/es_parser_h264.h
index 184ac0798fb428e6d4fdc9b2deb0042495a0fea8..9ce8ea02c741899fb6356387cc6c734ee787fb87 100644
--- a/media/formats/mp2t/es_parser_h264.h
+++ b/media/formats/mp2t/es_parser_h264.h
@@ -7,6 +7,7 @@
 
 #include <stdint.h>
 
+#include <list>
 #include <utility>
 
 #include "base/callback.h"
@@ -20,7 +21,6 @@
 #include "media/formats/mp2t/es_parser.h"
 
 namespace media {
-class EncryptionScheme;
 class H264Parser;
 struct H264SPS;
 class OffsetByteQueue;
@@ -70,8 +70,7 @@
 
   // Update the video decoder config based on an H264 SPS.
   // Return true if successful.
-  bool UpdateVideoDecoderConfig(const H264SPS* sps,
-                                const EncryptionScheme& scheme);
+  bool UpdateVideoDecoderConfig(const H264SPS* sps);
 
   EsAdapterVideo es_adapter_;