media: Disable the unified media pipeline for API levels 16 & 17

media/base/media.cc

Index: media/base/media.cc
diff --git a/media/base/media.cc b/media/base/media.cc
index b2e1c4520174e7a04fb50c393dd3c32646700d2d..c3f44e64e0178eb03bcd1cbaf7feff619d3cf837 100644
--- a/media/base/media.cc
+++ b/media/base/media.cc
@@ -103,8 +103,16 @@ bool IsUnifiedMediaPipelineEnabled() {
   const bool enabled_via_cli =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableUnifiedMediaPipeline);
-  return enabled_via_cli ||
-         base::StartsWith(group_name, "Enabled", base::CompareCase::SENSITIVE);
+  // TODO(watk, dalecurtis): AVDA has bugs on API level 16 and 17 so it's
+  // disabled for now. http://crbug.com/597467
+  const bool api_level_supported =
+      base::android::BuildInfo::GetInstance()->sdk_int() >= 18;
+
+  if (enabled_via_cli)

[DaleCurtis, 2016/03/24 03:16:44]

Seems cleaner as return "enabled_via_cli || api_level_supported || startswith" ?

+    return true;
+  if (!api_level_supported)
+    return false;
+  return base::StartsWith(group_name, "Enabled", base::CompareCase::SENSITIVE);
 }
 
 bool IsUnifiedMediaPipelineEnabledForMse() {