summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorfrankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-08 23:55:41 +0000
committerfrankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-08 23:55:41 +0000
commit77439eb431f1a1152c9ba6a7de0fd874a67ff946 (patch)
tree13fb541c45309373a50fddecf7e962d07766b342 /build
parentfa2353348d2b39c7dac072b6d74006fa55ffd4fb (diff)
downloadchromium_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
Diffstat (limited to 'build')
-rw-r--r--build/android/pylib/gtest/filter/content_browsertests_disabled3
1 files changed, 3 insertions, 0 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