Chromium Code Reviews| Index: content/browser/media/encrypted_media_browsertest.cc |
| diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc |
| index 0f5316302d37c997448c1ecadc1604fd5b26255b..8c386bc0832fd9d3ef961ff1950c53c4111a8c7e 100644 |
| --- a/content/browser/media/encrypted_media_browsertest.cc |
| +++ b/content/browser/media/encrypted_media_browsertest.cc |
| @@ -12,6 +12,7 @@ |
| #include "content/shell/browser/shell.h" |
| #if defined(OS_ANDROID) |
| #include "base/android/build_info.h" |
| +#include "media/base/media_switches.h" |
| #endif |
| // Available key systems. |
| @@ -49,7 +50,7 @@ static bool IsMSESupported() { |
| // Tests encrypted media playback with a combination of parameters: |
| // - char*: Key system name. |
| -// - bool: True to load media using MSE, otherwise use src. |
| +// - bool: True to load media using MSE, otherwise use SRC. |
|
ddorwin
2016/03/30 22:13:03
I think this was referring to .src= rather than th
xhwang
2016/03/30 22:18:01
Done.
|
| class EncryptedMediaTest : public content::MediaBrowserTest, |
| public testing::WithParamInterface<std::tr1::tuple<const char*, SrcType> > { |
| public: |
| @@ -130,17 +131,17 @@ class EncryptedMediaTest : public content::MediaBrowserTest, |
| void SetUpCommandLine(base::CommandLine* command_line) override { |
| command_line->AppendSwitch( |
| switches::kDisableGestureRequirementForMediaPlayback); |
| +#if defined(OS_ANDROID) |
| + command_line->AppendSwitch(switches::kEnableUnifiedMediaPipeline); |
| +#endif |
| } |
| }; |
| using ::testing::Combine; |
| using ::testing::Values; |
| -#if !defined(OS_ANDROID) |
| -// Encrypted media playback with SRC is not supported on Android. |
| INSTANTIATE_TEST_CASE_P(SRC_ClearKey, EncryptedMediaTest, |
| Combine(Values(kClearKeyKeySystem), Values(SRC))); |
| -#endif // !defined(OS_ANDROID) |
| INSTANTIATE_TEST_CASE_P(MSE_ClearKey, EncryptedMediaTest, |
| Combine(Values(kClearKeyKeySystem), Values(MSE))); |