Revert of media config: expand is_encrypted to a struct.

media/base/fake_demuxer_stream.cc

Index: media/base/fake_demuxer_stream.cc
diff --git a/media/base/fake_demuxer_stream.cc b/media/base/fake_demuxer_stream.cc
index 7ed5841c4ab2eb06010ae9f945d2817333a6f8df..267b3e5d8d23a6f21f1c6a8c1987b5787b5de360 100644
--- a/media/base/fake_demuxer_stream.cc
+++ b/media/base/fake_demuxer_stream.cc
@@ -147,11 +147,11 @@
 
 void FakeDemuxerStream::UpdateVideoDecoderConfig() {
   const gfx::Rect kVisibleRect(kStartWidth, kStartHeight);
-  video_decoder_config_.Initialize(
-      kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN, PIXEL_FORMAT_YV12,
-      COLOR_SPACE_UNSPECIFIED, next_coded_size_, kVisibleRect, next_coded_size_,
-      EmptyExtraData(),
-      is_encrypted_ ? AesCtrEncryptionScheme() : Unencrypted());
+  video_decoder_config_.Initialize(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN,
+                                   PIXEL_FORMAT_YV12, COLOR_SPACE_UNSPECIFIED,
+                                   next_coded_size_, kVisibleRect,
+                                   next_coded_size_, EmptyExtraData(),
+                                   is_encrypted_);
   next_coded_size_.Enlarge(kWidthDelta, kHeightDelta);
 }