diff options
| author | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-08 23:55:41 +0000 |
|---|---|---|
| committer | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-08 23:55:41 +0000 |
| commit | 77439eb431f1a1152c9ba6a7de0fd874a67ff946 (patch) | |
| tree | 13fb541c45309373a50fddecf7e962d07766b342 | |
| parent | fa2353348d2b39c7dac072b6d74006fa55ffd4fb (diff) | |
| download | chromium_src-77439eb431f1a1152c9ba6a7de0fd874a67ff946.zip chromium_src-77439eb431f1a1152c9ba6a7de0fd874a67ff946.tar.gz chromium_src-77439eb431f1a1152c9ba6a7de0fd874a67ff946.tar.bz2 | |
Revert 227565 "Enable EncryptedMediaTest (in content_browsertest..."
> Enable EncryptedMediaTest (in content_browsertests) on Android.
>
> Encrytped media playback with <video src=...> is not supported on Android. Those
> tests will not run on Android.
>
> BUG=304956,300035
> TEST=This CL enables tests which was previously disabled.
>
> Review URL: https://codereview.chromium.org/26243003
TBR=xhwang@chromium.org
Review URL: https://codereview.chromium.org/26565003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227627 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/android/pylib/gtest/filter/content_browsertests_disabled | 3 | ||||
| -rw-r--r-- | content/browser/media/encrypted_media_browsertest.cc | 16 |
2 files changed, 7 insertions, 12 deletions
diff --git a/build/android/pylib/gtest/filter/content_browsertests_disabled b/build/android/pylib/gtest/filter/content_browsertests_disabled index 7c96373..e7cb99a 100644 --- a/build/android/pylib/gtest/filter/content_browsertests_disabled +++ b/build/android/pylib/gtest/filter/content_browsertests_disabled @@ -2,10 +2,13 @@ # Timeouts Http/MediaTest.* File/MediaTest.* +ExternalClearKey/EncryptedMediaTest.* +ClearKey/EncryptedMediaTest.* WorkerTest.* MediaTest.* WebGLConformanceTest.* MessagePortTest.Tests +EncryptedMediaTest.* CrossPlatformAccessibilityBrowserTest.* DatabaseTest.* ResourceDispatcherHostBrowserTest.SyncXMLHttpRequest_DuringUnload diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc index 8f30094..c68daf7 100644 --- a/content/browser/media/encrypted_media_browsertest.cc +++ b/content/browser/media/encrypted_media_browsertest.cc @@ -104,17 +104,9 @@ class EncryptedMediaTest : public content::MediaBrowserTest, #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))); +INSTANTIATE_TEST_CASE_P(ClearKey, EncryptedMediaTest, + ::testing::Combine( + ::testing::Values(kClearKeyKeySystem), ::testing::Values(SRC, MSE))); IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM) { TestSimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly); @@ -151,7 +143,7 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) { IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { RunEncryptedMediaTest("encrypted_media_player.html", "bear-a-enc_a.webm", - kWebMAudioOnly, "com.example.foo", MSE, + kWebMAudioOnly, "com.example.foo", SRC, kEmeGkrException); } |