media: Pass CdmConfig in mojo CDM interface.

media/mojo/services/media_type_converters.h

Index: media/mojo/services/media_type_converters.h
diff --git a/media/mojo/services/media_type_converters.h b/media/mojo/services/media_type_converters.h
index 14a4562701fa12ada789c0d68c7c944c882554ff..7b92854758c67d77b9ff9a8c6af4d0b19b908e95 100644
--- a/media/mojo/services/media_type_converters.h
+++ b/media/mojo/services/media_type_converters.h
@@ -12,11 +12,12 @@
 
 namespace media {
 class AudioDecoderConfig;
-class VideoDecoderConfig;
 class DecoderBuffer;
 class DecryptConfig;
-struct SubsampleEntry;
+class VideoDecoderConfig;
+struct CdmConfig;
 struct CdmKeyInformation;
+struct SubsampleEntry;
 }
 
 namespace mojo {
@@ -82,6 +83,15 @@ struct TypeConverter<scoped_ptr<media::CdmKeyInformation>,
       const CdmKeyInformationPtr& input);
 };
 
+template <>
+struct TypeConverter<CdmConfigPtr, media::CdmConfig> {
+  static CdmConfigPtr Convert(const media::CdmConfig& input);
+};
+template <>
+struct TypeConverter<media::CdmConfig, CdmConfigPtr> {
+  static media::CdmConfig Convert(const CdmConfigPtr& input);
+};
+
 }  // namespace mojo
 
 #endif  // MEDIA_MOJO_SERVICES_MEDIA_TYPE_CONVERTERS_H_