Combine audio decoding and video decoding onto a single thread.

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 1e961a8122f660aef6027df6f6404dc321bcb6c0..ec283f203d081f67b759bd75e8ac938389a3baf1 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -202,11 +202,11 @@ PipelineIntegrationTestBase::CreateFilterCollection(
   collection->AddAudioDecoder(new FFmpegAudioDecoder(
       base::Bind(&MessageLoopFactory::GetMessageLoop,
                  base::Unretained(message_loop_factory_.get()),
-                 media::MessageLoopFactory::kAudioDecoder)));
+                 media::MessageLoopFactory::kDecoder)));
   scoped_refptr<VideoDecoder> decoder = new FFmpegVideoDecoder(
       base::Bind(&MessageLoopFactory::GetMessageLoop,
                  base::Unretained(message_loop_factory_.get()),
-                 media::MessageLoopFactory::kVideoDecoder),
+                 media::MessageLoopFactory::kDecoder),
       decryptor);
   collection->GetVideoDecoders()->push_back(decoder);