Revert of media config: expand is_encrypted to a struct.

media/base/audio_decoder_config.cc

Index: media/base/audio_decoder_config.cc
diff --git a/media/base/audio_decoder_config.cc b/media/base/audio_decoder_config.cc
index 253c82b147c96b0304ce49d83ec7c4334bb78fdb..3c1b94d1097031f64d327a6af200e1cde349ff0b 100644
--- a/media/base/audio_decoder_config.cc
+++ b/media/base/audio_decoder_config.cc
@@ -16,17 +16,18 @@
       channel_layout_(CHANNEL_LAYOUT_UNSUPPORTED),
       samples_per_second_(0),
       bytes_per_frame_(0),
-      codec_delay_(0) {}
+      is_encrypted_(false),
+      codec_delay_(0) {
+}
 
-AudioDecoderConfig::AudioDecoderConfig(
-    AudioCodec codec,
-    SampleFormat sample_format,
-    ChannelLayout channel_layout,
-    int samples_per_second,
-    const std::vector<uint8_t>& extra_data,
-    const EncryptionScheme& encryption_scheme) {
+AudioDecoderConfig::AudioDecoderConfig(AudioCodec codec,
+                                       SampleFormat sample_format,
+                                       ChannelLayout channel_layout,
+                                       int samples_per_second,
+                                       const std::vector<uint8_t>& extra_data,
+                                       bool is_encrypted) {
   Initialize(codec, sample_format, channel_layout, samples_per_second,
-             extra_data, encryption_scheme, base::TimeDelta(), 0);
+             extra_data, is_encrypted, base::TimeDelta(), 0);
 }
 
 AudioDecoderConfig::AudioDecoderConfig(const AudioDecoderConfig& other) =
@@ -37,7 +38,7 @@
                                     ChannelLayout channel_layout,
                                     int samples_per_second,
                                     const std::vector<uint8_t>& extra_data,
-                                    const EncryptionScheme& encryption_scheme,
+                                    bool is_encrypted,
                                     base::TimeDelta seek_preroll,
                                     int codec_delay) {
   codec_ = codec;
@@ -46,7 +47,7 @@
   sample_format_ = sample_format;
   bytes_per_channel_ = SampleFormatToBytesPerChannel(sample_format);
   extra_data_ = extra_data;
-  encryption_scheme_ = encryption_scheme;
+  is_encrypted_ = is_encrypted;
   seek_preroll_ = seek_preroll;
   codec_delay_ = codec_delay;
 
@@ -74,7 +75,7 @@
           (channel_layout() == config.channel_layout()) &&
           (samples_per_second() == config.samples_per_second()) &&
           (extra_data() == config.extra_data()) &&
-          (encryption_scheme().Matches(config.encryption_scheme())) &&
+          (is_encrypted() == config.is_encrypted()) &&
           (sample_format() == config.sample_format()) &&
           (seek_preroll() == config.seek_preroll()) &&
           (codec_delay() == config.codec_delay()));