Add 'cbcs' encryption scheme support in Android media.

media/gpu/android_video_decode_accelerator.cc

Index: media/gpu/android_video_decode_accelerator.cc
diff --git a/media/gpu/android_video_decode_accelerator.cc b/media/gpu/android_video_decode_accelerator.cc
index 97e8931c0a46fb4dd0eb571d982fec59d8c85dc7..38c3b82c3180b09dd490a8b07b7843f52a8bc84a 100644
--- a/media/gpu/android_video_decode_accelerator.cc
+++ b/media/gpu/android_video_decode_accelerator.cc
@@ -442,7 +442,7 @@ bool AndroidVideoDecodeAccelerator::Initialize(const Config& config,
   // does also.
   deferred_initialization_pending_ = config.is_deferred_initialization_allowed;
 
-  if (config_.is_encrypted && !deferred_initialization_pending_) {
+  if (config_.is_encrypted() && !deferred_initialization_pending_) {
     DLOG(ERROR) << "Deferred initialization must be used for encrypted streams";
     return false;
   }
@@ -458,7 +458,7 @@ bool AndroidVideoDecodeAccelerator::Initialize(const Config& config,
   // or if the stream is encrypted.
   if ((codec_config_->codec_ == media::kCodecVP8 ||
        codec_config_->codec_ == media::kCodecVP9) &&
-      !config_.is_encrypted &&
+      !config_.is_encrypted() &&
       media::VideoCodecBridge::IsKnownUnaccelerated(
           codec_config_->codec_, media::MEDIA_CODEC_DECODER)) {
     DVLOG(1) << "Initialization failed: "
@@ -541,7 +541,7 @@ bool AndroidVideoDecodeAccelerator::InitializeStrategy() {
   }
 
   // If we are encrypted, then we aren't able to create the codec yet.
-  if (config_.is_encrypted) {
+  if (config_.is_encrypted()) {
     InitializeCdm();
     return true;
   }
@@ -671,7 +671,7 @@ bool AndroidVideoDecodeAccelerator::QueueInput() {
   } else {
     status = media_codec_->QueueSecureInputBuffer(
         input_buf_index, memory, bitstream_buffer.size(), key_id, iv,
-        subsamples, presentation_timestamp);
+        subsamples, config_.encryption_scheme, presentation_timestamp);
   }
 
   DVLOG(2) << __FUNCTION__