media config: expand is_encrypted to a struct.

media/formats/webm/webm_audio_client.cc

Index: media/formats/webm/webm_audio_client.cc
diff --git a/media/formats/webm/webm_audio_client.cc b/media/formats/webm/webm_audio_client.cc
index fb6a723a4d2a3f65fe48a73f85a1127aac05edbb..98f299a4b49dbad1503dbfdda0459c1a8e26b5d6 100644
--- a/media/formats/webm/webm_audio_client.cc
+++ b/media/formats/webm/webm_audio_client.cc
@@ -6,6 +6,7 @@
 
 #include "media/base/audio_decoder_config.h"
 #include "media/base/channel_layout.h"
+#include "media/base/encryption_scheme.h"

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

This is no longer necessary since we're just passing through.

[dougsteed, 2016/03/03 04:45:00]

Done.

 #include "media/formats/webm/webm_constants.h"
 
 namespace media {
@@ -29,7 +30,7 @@ bool WebMAudioClient::InitializeConfig(
     const std::vector<uint8_t>& codec_private,
     int64_t seek_preroll,
     int64_t codec_delay,
-    bool is_encrypted,
+    const EncryptionScheme& encryption_scheme,
     AudioDecoderConfig* config) {
   DCHECK(config);
   SampleFormat sample_format = kSampleFormatPlanarF32;
@@ -78,16 +79,11 @@ bool WebMAudioClient::InitializeConfig(
                               base::Time::kNanosecondsPerSecond);
   }
 
-  config->Initialize(
-      audio_codec,
-      sample_format,
-      channel_layout,
-      samples_per_second,
-      codec_private,
-      is_encrypted,
-      base::TimeDelta::FromMicroseconds(
-          (seek_preroll != -1 ? seek_preroll : 0) / 1000),
-      codec_delay_in_frames);
+  config->Initialize(audio_codec, sample_format, channel_layout,
+                     samples_per_second, codec_private, encryption_scheme,
+                     base::TimeDelta::FromMicroseconds(
+                         (seek_preroll != -1 ? seek_preroll : 0) / 1000),
+                     codec_delay_in_frames);
   return config->IsValidConfig();
 }