media: Enable Unified Media Pipeline for MSE and EME on Android

media/filters/stream_parser_factory.cc

Index: media/filters/stream_parser_factory.cc
diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc
index 92ccbf4fdfc534f3a42f1bcb4cfd0de41a95a281..02470987d37bc5a2c8c2517455eaa8f8cb709ce2 100644
--- a/media/filters/stream_parser_factory.cc
+++ b/media/filters/stream_parser_factory.cc
@@ -334,7 +334,7 @@ static bool VerifyCodec(
       // TODO(wolenetz, dalecurtis): This should instead use MimeUtil() to avoid
       // duplication of subtle Android behavior.  http://crbug.com/587303.
       if (codec_info->tag == CodecInfo::HISTOGRAM_H264) {
-        if (media::IsUnifiedMediaPipelineEnabledForMse() &&
+        if (media::IsUnifiedMediaPipelineEnabled() &&
             !media::HasPlatformDecoderSupport()) {
           return false;
         }
@@ -344,17 +344,17 @@ static bool VerifyCodec(
       }
       if (codec_info->tag == CodecInfo::HISTOGRAM_VP8 &&
           !media::MediaCodecUtil::IsVp8DecoderAvailable() &&
-          !media::IsUnifiedMediaPipelineEnabledForMse()) {
+          !media::IsUnifiedMediaPipelineEnabled()) {
         return false;
       }
       if (codec_info->tag == CodecInfo::HISTOGRAM_VP9 &&
           !media::PlatformHasVp9Support() &&
-          !media::IsUnifiedMediaPipelineEnabledForMse()) {
+          !media::IsUnifiedMediaPipelineEnabled()) {
         return false;
       }
       if (codec_info->tag == CodecInfo::HISTOGRAM_OPUS &&
           !media::PlatformHasOpusSupport() &&
-          !media::IsUnifiedMediaPipelineEnabledForMse()) {
+          !media::IsUnifiedMediaPipelineEnabled()) {

[xhwang, 2016/03/23 16:35:55]

dalecurtis: How does the current code work given the fact that
media::IsUnifiedMediaPipelineEnabledForMse() doesn't check the
field-trial/experiment?

[DaleCurtis, 2016/03/23 17:51:54]

Previously this code only enabled MSE when no MediaCodec was available, i.e.
cases that WMPA never supported -- so it wasn't part of the field trial /
experiment.

         return false;
       }
 #endif