Revert of media config: expand is_encrypted to a struct.

media/filters/audio_decoder_selector_unittest.cc

 // Copyright (c) 2012 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 <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 59 matching lines @@
 
   void MockOnDecoderSelected(scoped_ptr<AudioDecoder> decoder,
                              scoped_ptr<DecryptingDemuxerStream> stream) {
     OnDecoderSelected(decoder.get(), stream.get());
     selected_decoder_ = std::move(decoder);
   }
 
   void UseClearStream() {
     AudioDecoderConfig clear_audio_config(kCodecVorbis, kSampleFormatPlanarF32,
                                           CHANNEL_LAYOUT_STEREO, 44100,
-                                          EmptyExtraData(), Unencrypted());
+                                          EmptyExtraData(), false);
     demuxer_stream_->set_audio_decoder_config(clear_audio_config);
   }
 
   void UseEncryptedStream() {
     AudioDecoderConfig encrypted_audio_config(
         kCodecVorbis, kSampleFormatPlanarF32, CHANNEL_LAYOUT_STEREO, 44100,
-        EmptyExtraData(), AesCtrEncryptionScheme());
+        EmptyExtraData(), true);
     demuxer_stream_->set_audio_decoder_config(encrypted_audio_config);
   }
 
   void InitializeDecoderSelector(DecryptorCapability decryptor_capability,
                                  int num_decoders) {
     if (decryptor_capability != kNoCdm) {
       cdm_context_.reset(new StrictMock<MockCdmContext>());
 
       if (decryptor_capability == kNoDecryptor) {
         EXPECT_CALL(*cdm_context_, GetDecryptor())
@@ skipping 278 matching lines @@
   // initialized and returned.
   EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
       .WillOnce(RunCallback<2>(true));
   EXPECT_CALL(*this, OnDecoderSelected(NotNull(), NotNull()));
 #endif
 
   SelectDecoder();
 }
 
 }  // namespace media