Add 'cbcs' encryption scheme support in Android media.

media/video/video_decode_accelerator.h

Index: media/video/video_decode_accelerator.h
diff --git a/media/video/video_decode_accelerator.h b/media/video/video_decode_accelerator.h
index 84f14fdce42bfc12c5e9d4cc0caf866507b9ac99..8c2086c307e83b64d5477ba3b6f7c1da4b6c29ca 100644
--- a/media/video/video_decode_accelerator.h
+++ b/media/video/video_decode_accelerator.h
@@ -14,6 +14,7 @@
 #include "base/memory/weak_ptr.h"
 #include "media/base/bitstream_buffer.h"
 #include "media/base/cdm_context.h"
+#include "media/base/encryption_scheme.h"
 #include "media/base/surface_manager.h"
 #include "media/base/video_decoder_config.h"
 #include "media/video/picture.h"
@@ -115,19 +116,20 @@ class MEDIA_EXPORT VideoDecodeAccelerator {
       IMPORT,
     };
 
-    Config() = default;
+    Config();
 
     // Intentional converting constructor.
     // TODO(watk): Make this explicit.
     Config(VideoCodecProfile profile);
 
     std::string AsHumanReadableString() const;
+    bool is_encrypted() const { return encryption_scheme.is_encrypted(); }
 
     // The video codec and profile.
     VideoCodecProfile profile = VIDEO_CODEC_PROFILE_UNKNOWN;
 
-    // Whether the stream is encrypted.
-    bool is_encrypted = false;
+    // Whether the stream is encrypted, and, if so, the scheme used.
+    EncryptionScheme encryption_scheme;
 
     // The CDM that the VDA should use to decode encrypted streams. Must be
     // set to a valid ID if |is_encrypted|.