Implement fallback from WMPI to WMPA.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 9ea32c42984c04e9f13f96ab843861983d9c65d7..de8cc62c384c513cc19feafb0d891dfbf0410986 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -132,6 +132,7 @@
 #include "crypto/sha2.h"
 #include "gin/modules/module_registry.h"
 #include "media/audio/audio_output_device.h"
+#include "media/base/android/media_codec_util.h"
 #include "media/base/audio_renderer_mixer_input.h"
 #include "media/base/media_log.h"
 #include "media/base/media_switches.h"
@@ -2362,9 +2363,11 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
 
 #if defined(OS_ANDROID)
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableUnifiedMediaPipeline)) {
-    // TODO(sandersd): This check should be grown to include HLS and blacklist
-    // checks.  http://crbug.com/516765
+          switches::kEnableUnifiedMediaPipeline) ||
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableAcceleratedVideoDecode) ||
+      !media::MediaCodecUtil::IsMediaCodecAvailable() ||
+      WebMediaPlayerAndroid::IsHLSPath(url)) {

[DaleCurtis, 2016/01/06 21:03:22]

Should this function be in MediaCodecUtil instead?

[sandersd (OOO until July 31), 2016/01/06 22:20:38]

Done.

     return CreateAndroidWebMediaPlayer(client, encrypted_client, params);
   }
 #endif  // defined(OS_ANDROID)