Add Common Encryption support to BMFF, including subsample decryption.

media/filters/ffmpeg_video_decoder_unittest.cc

Index: media/filters/ffmpeg_video_decoder_unittest.cc
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index 6a7fb4f3e0a6b1103d2274965f21c2c60bb21bf4..f720cf166fbe6a81f101ff1740d0ab882affe2bf 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -4,6 +4,7 @@
 
 #include <deque>
 #include <string>
+#include <vector>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ -47,10 +48,14 @@ static scoped_refptr<DecoderBuffer> CreateFakeEncryptedBuffer() {
   const int encrypted_frame_offset = 1;  // This should be non-zero.
   scoped_refptr<DecoderBuffer> buffer(new DecoderBuffer(buffer_size));
   buffer->SetDecryptConfig(scoped_ptr<DecryptConfig>(new DecryptConfig(
-      kFakeKeyId, arraysize(kFakeKeyId),
-      kFakeIv, DecryptConfig::kDecryptionKeySize,
-      kFakeCheckSum, arraysize(kFakeCheckSum),
-      encrypted_frame_offset)));
+      std::string(reinterpret_cast<const char*>(kFakeKeyId),
+                  arraysize(kFakeKeyId)),
+      std::string(reinterpret_cast<const char*>(kFakeIv),
+                  DecryptConfig::kDecryptionKeySize),
+      std::string(reinterpret_cast<const char*>(kFakeCheckSum),
+                  arraysize(kFakeCheckSum)),
+      encrypted_frame_offset,
+      std::vector<SubsampleEntry>())));
   return buffer;
 }