Revert of media config: expand is_encrypted to a struct.

media/mojo/common/media_type_converters_unittest.cc

Index: media/mojo/common/media_type_converters_unittest.cc
diff --git a/media/mojo/common/media_type_converters_unittest.cc b/media/mojo/common/media_type_converters_unittest.cc
index 5a2237fb5c8de8ee312e7199febbbd54fb071974..9858cd0bea857436fbea8e3900c34f153648744b 100644
--- a/media/mojo/common/media_type_converters_unittest.cc
+++ b/media/mojo/common/media_type_converters_unittest.cc
@@ -13,7 +13,6 @@
 #include "media/base/audio_decoder_config.h"
 #include "media/base/cdm_config.h"
 #include "media/base/decoder_buffer.h"
-#include "media/base/encryption_scheme.h"
 #include "media/base/media_util.h"
 #include "media/base/sample_format.h"
 #include "media/base/test_helpers.h"
@@ -288,7 +287,7 @@
 
   AudioDecoderConfig config;
   config.Initialize(kCodecAAC, kSampleFormatU8, CHANNEL_LAYOUT_SURROUND, 48000,
-                    kExtraDataVector, Unencrypted(), base::TimeDelta(), 0);
+                    kExtraDataVector, false, base::TimeDelta(), 0);
   interfaces::AudioDecoderConfigPtr ptr(
       interfaces::AudioDecoderConfig::From(config));
   EXPECT_FALSE(ptr->extra_data.is_null());
@@ -299,7 +298,7 @@
 TEST(MediaTypeConvertersTest, ConvertAudioDecoderConfig_EmptyExtraData) {
   AudioDecoderConfig config;
   config.Initialize(kCodecAAC, kSampleFormatU8, CHANNEL_LAYOUT_SURROUND, 48000,
-                    EmptyExtraData(), Unencrypted(), base::TimeDelta(), 0);
+                    EmptyExtraData(), false, base::TimeDelta(), 0);
   interfaces::AudioDecoderConfigPtr ptr(
       interfaces::AudioDecoderConfig::From(config));
   EXPECT_TRUE(ptr->extra_data.is_null());
@@ -310,11 +309,14 @@
 TEST(MediaTypeConvertersTest, ConvertAudioDecoderConfig_Encrypted) {
   AudioDecoderConfig config;
   config.Initialize(kCodecAAC, kSampleFormatU8, CHANNEL_LAYOUT_SURROUND, 48000,
-                    EmptyExtraData(), AesCtrEncryptionScheme(),
+                    EmptyExtraData(),
+                    true,  // Is encrypted.
                     base::TimeDelta(), 0);
   interfaces::AudioDecoderConfigPtr ptr(
       interfaces::AudioDecoderConfig::From(config));
+  EXPECT_TRUE(ptr->is_encrypted);
   AudioDecoderConfig result(ptr.To<AudioDecoderConfig>());
+  EXPECT_TRUE(result.is_encrypted());
   EXPECT_TRUE(result.Matches(config));
 }
 
@@ -325,7 +327,7 @@
 
   VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, PIXEL_FORMAT_YV12,
                             COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,
-                            kNaturalSize, kExtraDataVector, Unencrypted());
+                            kNaturalSize, kExtraDataVector, false);
   interfaces::VideoDecoderConfigPtr ptr(
       interfaces::VideoDecoderConfig::From(config));
   EXPECT_FALSE(ptr->extra_data.is_null());
@@ -336,7 +338,7 @@
 TEST(MediaTypeConvertersTest, ConvertVideoDecoderConfig_EmptyExtraData) {
   VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, PIXEL_FORMAT_YV12,
                             COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,
-                            kNaturalSize, EmptyExtraData(), Unencrypted());
+                            kNaturalSize, EmptyExtraData(), false);
   interfaces::VideoDecoderConfigPtr ptr(
       interfaces::VideoDecoderConfig::From(config));
   EXPECT_TRUE(ptr->extra_data.is_null());
@@ -348,10 +350,12 @@
   VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, PIXEL_FORMAT_YV12,
                             COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,
                             kNaturalSize, EmptyExtraData(),
-                            AesCtrEncryptionScheme());
+                            true /* is_encrypted */);
   interfaces::VideoDecoderConfigPtr ptr(
       interfaces::VideoDecoderConfig::From(config));
+  EXPECT_TRUE(ptr->is_encrypted);
   VideoDecoderConfig result(ptr.To<VideoDecoderConfig>());
+  EXPECT_TRUE(result.is_encrypted());
   EXPECT_TRUE(result.Matches(config));
 }
 
@@ -454,21 +458,4 @@
   CompareVideoFrames(frame, result);
 }
 
-TEST(MediaTypeConvertersTest, ConvertEncryptionSchemeAesCbcWithPattern) {
-  // Original.
-  EncryptionScheme scheme(EncryptionScheme::CIPHER_MODE_AES_CBC,
-                          EncryptionScheme::Pattern(1, 9));
-
-  // Convert to and back.
-  interfaces::EncryptionSchemePtr ptr(
-      interfaces::EncryptionScheme::From(scheme));
-  EncryptionScheme result(ptr.To<EncryptionScheme>());
-
-  EXPECT_TRUE(result.Matches(scheme));
-
-  // Verify a couple of negative cases.
-  EXPECT_FALSE(result.Matches(Unencrypted()));
-  EXPECT_FALSE(result.Matches(AesCtrEncryptionScheme()));
-}
-
 }  // namespace media