Chromium Code Reviews| Index: media/base/media.cc |
| diff --git a/media/base/media.cc b/media/base/media.cc |
| index e758532bed9d390c643425b5813ed2e4b859727c..920b33fd8d2c72d4dab7435db57b1048c8c35960 100644 |
| --- a/media/base/media.cc |
| +++ b/media/base/media.cc |
| @@ -100,17 +100,17 @@ bool IsUnifiedMediaPipelineEnabled() { |
| // UMA reports the correct group. |
| const std::string group_name = |
| base::FieldTrialList::FindFullName("UnifiedMediaPipelineTrial"); |
| - const bool enabled_via_cli = |
| + const bool disabled_via_cli = |
| base::CommandLine::ForCurrentProcess()->HasSwitch( |
| - switches::kEnableUnifiedMediaPipeline); |
| + switches::kDisableUnifiedMediaPipeline); |
| // 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 enabled_via_cli || (api_level_supported && |
| - base::StartsWith(group_name, "Enabled", |
| - base::CompareCase::SENSITIVE)); |
| + return !disabled_via_cli && api_level_supported && |
| + !base::StartsWith(group_name, "Disabled", |
|
ddorwin
2016/03/30 20:16:24
Do all users already have "Enabled" or "Disabled"
DaleCurtis
2016/03/31 22:10:33
The groups are, "Control", "Enabled", "EnabledByFl
|
| + base::CompareCase::SENSITIVE); |
| } |
| bool ArePlatformDecodersAvailable() { |