Flip unified media pipeline to default-on w/ disabled holdback.

media/filters/chunk_demuxer_unittest.cc

Index: media/filters/chunk_demuxer_unittest.cc
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc
index bb0c5ec105bafee67be0bcd7deadee5ee6334793..87e5aa743a7bfb7618d85da321930eb4e3e4d0e2 100644
--- a/media/filters/chunk_demuxer_unittest.cc
+++ b/media/filters/chunk_demuxer_unittest.cc
@@ -18,6 +18,7 @@
 #include "media/base/audio_decoder_config.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
+#include "media/base/media.h"
 #include "media/base/media_tracks.h"
 #include "media/base/mock_demuxer_host.h"
 #include "media/base/mock_media_log.h"
@@ -3086,8 +3087,13 @@ TEST_F(ChunkDemuxerTest, CodecPrefixMatching) {
   ChunkDemuxer::Status expected = ChunkDemuxer::kNotSupported;
 
 #if defined(USE_PROPRIETARY_CODECS)
+#if defined(OS_ANDROID)
+  if (HasPlatformDecoderSupport())
+    expected = ChunkDemuxer::kOk;
+#else
   expected = ChunkDemuxer::kOk;
 #endif
+#endif
 
   std::vector<std::string> codecs;
   codecs.push_back("avc1.4D4041");