Add 'cbcs' encryption scheme support in Android media.

media/base/android/media_codec_bridge.h

Index: media/base/android/media_codec_bridge.h
diff --git a/media/base/android/media_codec_bridge.h b/media/base/android/media_codec_bridge.h
index 434f1806761705aa803a334caf1c390cdee24b45..81aff18a0134eeacecc5a1da9abeb092e4a7aa1d 100644
--- a/media/base/android/media_codec_bridge.h
+++ b/media/base/android/media_codec_bridge.h
@@ -21,6 +21,7 @@
 
 namespace media {
 
+class EncryptionScheme;
 struct SubsampleEntry;
 
 // These must be in sync with MediaCodecBridge.MEDIA_CODEC_XXX constants in
@@ -101,6 +102,7 @@ class MEDIA_EXPORT MediaCodecBridge {
       const std::string& key_id,
       const std::string& iv,
       const std::vector<SubsampleEntry>& subsamples,
+      const EncryptionScheme& encryption_scheme,
       const base::TimeDelta& presentation_time);
 
   // Same QueueSecureInputBuffer overriden for the use with MediaSourcePlayer
@@ -115,6 +117,7 @@ class MEDIA_EXPORT MediaCodecBridge {
       const std::vector<char>& iv,
       const SubsampleEntry* subsamples,
       int subsamples_size,
+      const EncryptionScheme& encryption_scheme,
       const base::TimeDelta& presentation_time) = 0;
 
   // Submits an empty buffer with a EOS (END OF STREAM) flag.