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 b88450457c2f20825fc5c1cd087783e44bd6727f..76446e395aa7134ed3e991a0ca3899bffec756b1 100644
--- a/media/base/test_helpers.cc
+++ b/media/base/test_helpers.cc
@@ -18,6 +18,7 @@
 #include "media/base/audio_buffer.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
+#include "media/base/encryption_scheme.h"
 #include "media/base/media_util.h"
 #include "ui/gfx/geometry/rect.h"
 
@@ -129,10 +130,14 @@ static VideoDecoderConfig GetTestConfig(VideoCodec codec,
   gfx::Rect visible_rect(coded_size.width(), coded_size.height());
   gfx::Size natural_size = coded_size;
 
+  EncryptionScheme encryption_scheme(
+      is_encrypted ? EncryptionScheme::CIPHER_MODE_AES_CTR
+                   : EncryptionScheme::CIPHER_MODE_UNENCRYPTED);
+
   return VideoDecoderConfig(codec, VIDEO_CODEC_PROFILE_UNKNOWN,
                             PIXEL_FORMAT_YV12, COLOR_SPACE_UNSPECIFIED,
                             coded_size, visible_rect, natural_size,
-                            EmptyExtraData(), is_encrypted);
+                            EmptyExtraData(), encryption_scheme);

[xhwang, 2016/03/07 18:39:52]

ditto

[dougsteed, 2016/03/07 21:12:40]

Done.

 }
 
 static const gfx::Size kNormalSize(320, 240);