Revert of media config: expand is_encrypted to a struct.

media/base/test_helpers.cc

Index: media/base/test_helpers.cc
diff --git a/media/base/test_helpers.cc b/media/base/test_helpers.cc
index 972d0820fbe073e2bd1eb9dc6c97a25dc1bdc5fe..b88450457c2f20825fc5c1cd087783e44bd6727f 100644
--- a/media/base/test_helpers.cc
+++ b/media/base/test_helpers.cc
@@ -129,11 +129,10 @@
   gfx::Rect visible_rect(coded_size.width(), coded_size.height());
   gfx::Size natural_size = coded_size;
 
-  return VideoDecoderConfig(
-      codec, VIDEO_CODEC_PROFILE_UNKNOWN, PIXEL_FORMAT_YV12,
-      COLOR_SPACE_UNSPECIFIED, coded_size, visible_rect, natural_size,
-      EmptyExtraData(),
-      is_encrypted ? AesCtrEncryptionScheme() : Unencrypted());
+  return VideoDecoderConfig(codec, VIDEO_CODEC_PROFILE_UNKNOWN,
+                            PIXEL_FORMAT_YV12, COLOR_SPACE_UNSPECIFIED,
+                            coded_size, visible_rect, natural_size,
+                            EmptyExtraData(), is_encrypted);
 }
 
 static const gfx::Size kNormalSize(320, 240);