Revert of media config: expand is_encrypted to a struct.

media/formats/webm/webm_tracks_parser.cc

Index: media/formats/webm/webm_tracks_parser.cc
diff --git a/media/formats/webm/webm_tracks_parser.cc b/media/formats/webm/webm_tracks_parser.cc
index 112427f691a9f50cc7915d52e05564caeaf8ec59..5ffa0aac66ad4b4fb6ad13dc7f4745a8dfa73d76 100644
--- a/media/formats/webm/webm_tracks_parser.cc
+++ b/media/formats/webm/webm_tracks_parser.cc
@@ -7,7 +7,6 @@
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "media/base/media_util.h"
 #include "media/base/timestamp_constants.h"
 #include "media/formats/webm/webm_constants.h"
 #include "media/formats/webm/webm_content_encodings.h"
@@ -194,9 +193,6 @@
           content_encodings()[0]->encryption_key_id();
     }
 
-    EncryptionScheme encryption_scheme =
-        encryption_key_id.empty() ? Unencrypted() : AesCtrEncryptionScheme();
-
     if (track_type_ == kWebMTrackTypeAudio) {
       if (audio_track_num_ == -1) {
         audio_track_num_ = track_num_;
@@ -212,7 +208,7 @@
         DCHECK(!audio_decoder_config_.IsValidConfig());
         if (!audio_client_.InitializeConfig(
                 codec_id_, codec_private_, seek_preroll_, codec_delay_,
-                encryption_scheme, &audio_decoder_config_)) {
+                !audio_encryption_key_id_.empty(), &audio_decoder_config_)) {
           return false;
         }
         media_tracks_->AddAudioTrack(audio_decoder_config_,
@@ -235,9 +231,9 @@
         video_default_duration_ = default_duration_;
 
         DCHECK(!video_decoder_config_.IsValidConfig());
-        if (!video_client_.InitializeConfig(codec_id_, codec_private_,
-                                            encryption_scheme,
-                                            &video_decoder_config_)) {
+        if (!video_client_.InitializeConfig(
+                codec_id_, codec_private_, !video_encryption_key_id_.empty(),
+                &video_decoder_config_)) {
           return false;
         }
         media_tracks_->AddVideoTrack(video_decoder_config_,