Small cleaups to media to support disabling ozone and libvpx properly.

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 c29b62445bf00b7446cc709fc29a8a6e4ff28067..2d92e55accfe6fdb0d58ccca466cbe0046386eae 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -246,8 +246,10 @@ PipelineIntegrationTestBase::CreateFilterCollection(
   collection->SetDemuxer(demuxer_.get());
 
   ScopedVector<VideoDecoder> video_decoders;
+#if !defined(MEDIA_DISABLE_LIBVPX)
   video_decoders.push_back(
       new VpxVideoDecoder(message_loop_.message_loop_proxy()));
+#endif  // !defined(MEDIA_DISABLE_LIBVPX)

[scherkus (not reviewing), 2014/07/08 21:10:02]

is this only to fix compile-time issues?

note that this will result in failing libvpx-related tests (e.g., VP9, VP8A)
inside pipeline_integration_test.cc ... but I don't think that's too big of a
deal

[awong, 2014/07/08 21:28:03]

Yep. Only a compile-time fix. Should I also wrap the libvpx tests to disable
them

[scherkus (not reviewing), 2014/07/08 21:30:01]

I'm OK leaving them as-is.

   video_decoders.push_back(
       new FFmpegVideoDecoder(message_loop_.message_loop_proxy()));