media: Pass CdmConfig in mojo CDM interface.

media/mojo/services/media_type_converters.cc

Index: media/mojo/services/media_type_converters.cc
diff --git a/media/mojo/services/media_type_converters.cc b/media/mojo/services/media_type_converters.cc
index d1630df114450c82bd2e8bdbaf64c5559b42cfa4..1d89a6f371c5ab5d041e55c269d239f6a604a4f4 100644
--- a/media/mojo/services/media_type_converters.cc
+++ b/media/mojo/services/media_type_converters.cc
@@ -6,6 +6,7 @@
 
 #include "media/base/audio_decoder_config.h"
 #include "media/base/buffering_state.h"
+#include "media/base/cdm_config.h"
 #include "media/base/cdm_key_information.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
@@ -474,7 +475,7 @@ TypeConverter<CdmKeyInformationPtr, media::CdmKeyInformation>::Convert(
 scoped_ptr<media::CdmKeyInformation> TypeConverter<
     scoped_ptr<media::CdmKeyInformation>,
     CdmKeyInformationPtr>::Convert(const CdmKeyInformationPtr& input) {
-  scoped_ptr<media::CdmKeyInformation> info(new media::CdmKeyInformation);
+  scoped_ptr<media::CdmKeyInformation> info(new media::CdmKeyInformation());
   info->key_id = input->key_id.storage();
   info->status =
       static_cast<media::CdmKeyInformation::KeyStatus>(input->status);
@@ -482,4 +483,24 @@ scoped_ptr<media::CdmKeyInformation> TypeConverter<
   return info.Pass();
 }
 
+// static
+CdmConfigPtr TypeConverter<CdmConfigPtr, media::CdmConfig>::Convert(
+    const media::CdmConfig& input) {
+  CdmConfigPtr config(CdmConfig::New());
+  config->allow_distinctive_identifier = input.allow_distinctive_identifier;
+  config->allow_persistent_state = input.allow_persistent_state;
+  config->use_hw_secure_codecs = input.use_hw_secure_codecs;
+  return config.Pass();
+}
+
+// static
+media::CdmConfig TypeConverter<media::CdmConfig, CdmConfigPtr>::Convert(
+    const CdmConfigPtr& input) {
+  media::CdmConfig config;
+  config.allow_distinctive_identifier = input->allow_distinctive_identifier;
+  config.allow_persistent_state = input->allow_persistent_state;
+  config.use_hw_secure_codecs = input->use_hw_secure_codecs;
+  return config;
+}
+
 }  // namespace mojo