Revert of media config: expand is_encrypted to a struct.

media/base/video_decoder_config_unittest.cc

 // Copyright 2015 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.
 
 #include "media/base/limits.h"
 #include "media/base/media_util.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 static const VideoPixelFormat kVideoFormat = PIXEL_FORMAT_YV12;
 static const gfx::Size kCodedSize(320, 240);
 static const gfx::Rect kVisibleRect(320, 240);
 static const gfx::Size kNaturalSize(320, 240);
 
 TEST(VideoDecoderConfigTest, Invalid_UnsupportedPixelFormat) {
   VideoDecoderConfig config(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN,
                             PIXEL_FORMAT_UNKNOWN, COLOR_SPACE_UNSPECIFIED,
                             kCodedSize, kVisibleRect, kNaturalSize,
-                            EmptyExtraData(), Unencrypted());
+                            EmptyExtraData(), false);
   EXPECT_FALSE(config.IsValidConfig());
 }
 
 TEST(VideoDecoderConfigTest, Invalid_AspectRatioNumeratorZero) {
   gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), 0, 1);
   VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, kVideoFormat,
                             COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,
-                            natural_size, EmptyExtraData(), Unencrypted());
+                            natural_size, EmptyExtraData(), false);
   EXPECT_FALSE(config.IsValidConfig());
 }
 
 TEST(VideoDecoderConfigTest, Invalid_AspectRatioDenominatorZero) {
   gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), 1, 0);
   VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, kVideoFormat,
                             COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,
-                            natural_size, EmptyExtraData(), Unencrypted());
+                            natural_size, EmptyExtraData(), false);
   EXPECT_FALSE(config.IsValidConfig());
 }
 
 TEST(VideoDecoderConfigTest, Invalid_AspectRatioNumeratorNegative) {
   gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), -1, 1);
   VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, kVideoFormat,
                             COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,
-                            natural_size, EmptyExtraData(), Unencrypted());
+                            natural_size, EmptyExtraData(), false);
   EXPECT_FALSE(config.IsValidConfig());
 }
 
 TEST(VideoDecoderConfigTest, Invalid_AspectRatioDenominatorNegative) {
   gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), 1, -1);
   VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, kVideoFormat,
                             COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,
-                            natural_size, EmptyExtraData(), Unencrypted());
+                            natural_size, EmptyExtraData(), false);
   EXPECT_FALSE(config.IsValidConfig());
 }
 
 TEST(VideoDecoderConfigTest, Invalid_AspectRatioNumeratorTooLarge) {
   int width = kVisibleRect.size().width();
   int num = ceil(static_cast<double>(limits::kMaxDimension + 1) / width);
   gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), num, 1);
   VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, kVideoFormat,
                             COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,
-                            natural_size, EmptyExtraData(), Unencrypted());
+                            natural_size, EmptyExtraData(), false);
   EXPECT_FALSE(config.IsValidConfig());
 }
 
 TEST(VideoDecoderConfigTest, Invalid_AspectRatioDenominatorTooLarge) {
   // Denominator is large enough that the natural size height will be zero.
   int den = 2 * kVisibleRect.size().width() + 1;
   gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), 1, den);
   EXPECT_EQ(0, natural_size.width());
   VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, kVideoFormat,
                             COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,
-                            natural_size, EmptyExtraData(), Unencrypted());
+                            natural_size, EmptyExtraData(), false);
   EXPECT_FALSE(config.IsValidConfig());
 }
 
 }  // namespace media