Index: media/base/media.cc |
diff --git a/media/base/media.cc b/media/base/media.cc |
index 9fd89ccc7f02773115a30e7f5f9d93da555c1919..4011a389c3050efcaf5decaa721dbf074f6d5b81 100644 |
--- a/media/base/media.cc |
+++ b/media/base/media.cc |
@@ -96,17 +96,17 @@ bool IsUnifiedMediaPipelineEnabled() { |
// UMA reports the correct group. |
const std::string group_name = |
base::FieldTrialList::FindFullName("UnifiedMediaPipelineTrial"); |
- const bool disabled_via_cli = |
+ const bool enabled_via_cli = |
base::CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kDisableUnifiedMediaPipeline); |
+ switches::kEnableUnifiedMediaPipeline); |
// 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; |
- return !disabled_via_cli && api_level_supported && |
- !base::StartsWith(group_name, "Disabled", |
- base::CompareCase::SENSITIVE); |
+ return enabled_via_cli || (api_level_supported && |
+ base::StartsWith(group_name, "Enabled", |
+ base::CompareCase::SENSITIVE)); |
} |
bool ArePlatformDecodersAvailable() { |