Revert of media config: expand is_encrypted to a struct.

media/mojo/common/media_type_converters.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_MOJO_COMMON_MEDIA_TYPE_CONVERTERS_H_
 #define MEDIA_MOJO_COMMON_MEDIA_TYPE_CONVERTERS_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
 #include "media/mojo/interfaces/media_types.mojom.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
 
 namespace media {
 class AudioBuffer;
 class AudioDecoderConfig;
 class DecoderBuffer;
 class DecryptConfig;
-class EncryptionScheme;
 class VideoDecoderConfig;
 class VideoFrame;
 struct CdmConfig;
 struct CdmKeyInformation;
 struct SubsampleEntry;
 }
 
 // These are specializations of mojo::TypeConverter and have to be in the mojo
 // namespace.
 namespace mojo {
 
 template <>
-struct TypeConverter<media::interfaces::EncryptionSchemePtr,
-                     media::EncryptionScheme> {
-  static media::interfaces::EncryptionSchemePtr Convert(
-      const media::EncryptionScheme& input);
-};
-template <>
-struct TypeConverter<media::EncryptionScheme,
-                     media::interfaces::EncryptionSchemePtr> {
-  static media::EncryptionScheme Convert(
-      const media::interfaces::EncryptionSchemePtr& input);
-};
-
-template <>
 struct TypeConverter<media::interfaces::SubsampleEntryPtr,
                      media::SubsampleEntry> {
   static media::interfaces::SubsampleEntryPtr Convert(
       const media::SubsampleEntry& input);
 };
 template <>
 struct TypeConverter<media::SubsampleEntry,
                      media::interfaces::SubsampleEntryPtr> {
   static media::SubsampleEntry Convert(
       const media::interfaces::SubsampleEntryPtr& input);
@@ skipping 95 matching lines @@
 template <>
 struct TypeConverter<scoped_refptr<media::VideoFrame>,
                      media::interfaces::VideoFramePtr> {
   static scoped_refptr<media::VideoFrame> Convert(
       const media::interfaces::VideoFramePtr& input);
 };
 
 }  // namespace mojo
 
 #endif  // MEDIA_MOJO_COMMON_MEDIA_TYPE_CONVERTERS_H_