Revert of media config: expand is_encrypted to a struct.

media/ffmpeg/ffmpeg_common_unittest.cc

 // Copyright (c) 2011 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 <stddef.h>
 #include <stdint.h>
 
 #include <cstring>
 
 #include "base/bind.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/media.h"
-#include "media/base/media_util.h"
 #include "media/base/test_data_util.h"
 #include "media/base/video_decoder_config.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_glue.h"
 #include "media/filters/in_memory_url_protocol.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 class FFmpegCommonTest : public testing::Test {
@@ skipping 100 matching lines @@
   context.codec_type = AVMEDIA_TYPE_AUDIO;
   context.codec_id = AV_CODEC_ID_OPUS;
   context.channel_layout = CHANNEL_LAYOUT_STEREO;
   context.channels = 2;
   context.sample_fmt = AV_SAMPLE_FMT_FLT;
 
   // During conversion this sample rate should be changed to 48kHz.
   context.sample_rate = 44100;
 
   AudioDecoderConfig decoder_config;
-  ASSERT_TRUE(AVCodecContextToAudioDecoderConfig(&context, Unencrypted(),
+  ASSERT_TRUE(AVCodecContextToAudioDecoderConfig(&context, false,
                                                  &decoder_config));
   EXPECT_EQ(48000, decoder_config.samples_per_second());
 }
 
 TEST_F(FFmpegCommonTest, TimeBaseConversions) {
   const int64_t test_data[][5] = {
       {1, 2, 1, 500000, 1}, {1, 3, 1, 333333, 1}, {1, 3, 2, 666667, 2},
   };
 
   for (size_t i = 0; i < arraysize(test_data); ++i) {
@@ skipping 116 matching lines @@
   // values; diff should verify.
 #if 0
   printf("<enum name=\"FFmpegCodecHashes\" type=\"int\">\n");
   for (const auto& kv : sorted_hashes)
     printf("  <int value=\"%d\" label=\"%s\"/>\n", kv.first, kv.second);
   printf("</enum>\n");
 #endif
 }
 
 }  // namespace media