media config: expand is_encrypted to a struct.

media/base/video_decoder_config.h

Index: media/base/video_decoder_config.h
diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h
index 4a192d6c494a7221e4c70e6954098b981f58ec79..ec3181290b7afce3fe578fb588685fbdc26344ac 100644
--- a/media/base/video_decoder_config.h
+++ b/media/base/video_decoder_config.h
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "base/macros.h"
+#include "media/base/encryption_scheme.h"
 #include "media/base/media_export.h"
 #include "media/base/video_codecs.h"
 #include "media/base/video_types.h"
@@ -38,7 +39,7 @@ class MEDIA_EXPORT VideoDecoderConfig {
                      const gfx::Rect& visible_rect,
                      const gfx::Size& natural_size,
                      const std::vector<uint8_t>& extra_data,
-                     bool is_encrypted);
+                     const EncryptionScheme& encryption_scheme);
 
   VideoDecoderConfig(const VideoDecoderConfig& other);
 
@@ -53,7 +54,7 @@ class MEDIA_EXPORT VideoDecoderConfig {
                   const gfx::Rect& visible_rect,
                   const gfx::Size& natural_size,
                   const std::vector<uint8_t>& extra_data,
-                  bool is_encrypted);
+                  const EncryptionScheme& encryption_scheme);
 
   // Returns true if this object has appropriate configuration values, false
   // otherwise.
@@ -100,7 +101,12 @@ class MEDIA_EXPORT VideoDecoderConfig {
   // Whether the video stream is potentially encrypted.
   // Note that in a potentially encrypted video stream, individual buffers
   // can be encrypted or not encrypted.
-  bool is_encrypted() const { return is_encrypted_; }
+  bool is_encrypted() const;

[ddorwin, 2016/03/02 23:24:05]

ditto on finding places where we expect true in the tests and checking the other
values.

+
+  // Encryption scheme used for encrypted buffers.
+  const EncryptionScheme& encryption_scheme() const {
+    return encryption_scheme_;
+  }
 
  private:
   VideoCodec codec_;
@@ -115,7 +121,7 @@ class MEDIA_EXPORT VideoDecoderConfig {
 
   std::vector<uint8_t> extra_data_;
 
-  bool is_encrypted_;
+  EncryptionScheme encryption_scheme_;
 
   // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler
   // generated copy constructor and assignment operator. Since the extra data is