Generalize AesDecryptor to make it more spec compliant.

media/filters/pipeline_integration_test_base.cc

Index: media/filters/pipeline_integration_test_base.cc
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
index e6a58f5ba25c795f18f4d3e1b25c105f8b8a35c7..ca78955b6347284dd3a236342a46868d882f6918 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -6,7 +6,6 @@
 
 #include "base/bind.h"
 #include "media/base/media_log.h"
-#include "media/crypto/aes_decryptor.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/chunk_demuxer.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
@@ -188,7 +187,6 @@ PipelineIntegrationTestBase::CreateFilterCollection(
     const scoped_refptr<Demuxer>& demuxer) {
   scoped_ptr<FilterCollection> collection(new FilterCollection());
   collection->SetDemuxer(demuxer);
-  decryptor_.reset(new AesDecryptor());
   collection->AddAudioDecoder(new FFmpegAudioDecoder(
       base::Bind(&MessageLoopFactory::GetMessageLoop,
                  base::Unretained(message_loop_factory_.get()),
@@ -197,7 +195,6 @@ PipelineIntegrationTestBase::CreateFilterCollection(
       base::Bind(&MessageLoopFactory::GetMessageLoop,
                  base::Unretained(message_loop_factory_.get()),
                  "VideoDecoderThread"));
-  decoder_->set_decryptor(decryptor_.get());
   collection->AddVideoDecoder(decoder_);
   // Disable frame dropping if hashing is enabled.
   renderer_ = new VideoRendererBase(