Add 'cbcs' encryption scheme support in Android media.

media/base/android/mock_media_codec_bridge.h

Index: media/base/android/mock_media_codec_bridge.h
diff --git a/media/base/android/mock_media_codec_bridge.h b/media/base/android/mock_media_codec_bridge.h
index dfb52233432a0fc64ea086e63832c88bc32c1c0b..bcf9bc05ad0ca0bba31ee3c2a76d3d900bbf8f34 100644
--- a/media/base/android/mock_media_codec_bridge.h
+++ b/media/base/android/mock_media_codec_bridge.h
@@ -24,15 +24,16 @@ class MockMediaCodecBridge : public MediaCodecBridge {
   MOCK_METHOD1(GetOutputChannelCount, MediaCodecStatus(int*));
   MOCK_METHOD4(QueueInputBuffer,
                MediaCodecStatus(int, const uint8_t*, size_t, base::TimeDelta));
-  MOCK_METHOD7(QueueSecureInputBuffer,
+  MOCK_METHOD8(QueueSecureInputBuffer,
                MediaCodecStatus(int,
                                 const uint8_t*,
                                 size_t,
                                 const std::string&,
                                 const std::string&,
                                 const std::vector<SubsampleEntry>&,
+                                const EncryptionScheme& encryption_scheme,
                                 base::TimeDelta));
-  MOCK_METHOD8(QueueSecureInputBuffer,
+  MOCK_METHOD9(QueueSecureInputBuffer,
                MediaCodecStatus(int,
                                 const uint8_t*,
                                 size_t,
@@ -40,6 +41,7 @@ class MockMediaCodecBridge : public MediaCodecBridge {
                                 const std::vector<char>&,
                                 const SubsampleEntry*,
                                 int,
+                                const EncryptionScheme& encryption_scheme,
                                 base::TimeDelta));
   MOCK_METHOD1(QueueEOS, void(int));
   MOCK_METHOD2(DequeueInputBuffer, MediaCodecStatus(base::TimeDelta, int*));