diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 18:22:02 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 18:22:02 +0000 |
| commit | d897845a70bcd85644dafec57282d58370082996 (patch) | |
| tree | 187e81a5a803e70870b3f7e7f8b7daf85eb7b809 /webkit/data | |
| parent | 532d461ab08aaf3ab9f1048d7017eb659d2ece34 (diff) | |
| download | chromium_src-d897845a70bcd85644dafec57282d58370082996.zip chromium_src-d897845a70bcd85644dafec57282d58370082996.tar.gz chromium_src-d897845a70bcd85644dafec57282d58370082996.tar.bz2 | |
Remove VideoBear and ManyVideoBear from test_shell_tests.
We have similar tests in src/content/browser/media_browsertest.cc
so we don't need the tests in test_shell_tests. Also, these don't
test for leaks since they doesn't run under valgrind.
BUG=126514
Review URL: https://chromiumcodereview.appspot.com/10377062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data')
| -rw-r--r-- | webkit/data/media/bear.html | 15 | ||||
| -rw-r--r-- | webkit/data/media/bear_silent.ogv | bin | 46247 -> 0 bytes | |||
| -rw-r--r-- | webkit/data/media/manybear.html | 38 |
3 files changed, 0 insertions, 53 deletions
diff --git a/webkit/data/media/bear.html b/webkit/data/media/bear.html deleted file mode 100644 index 9cc3682..0000000 --- a/webkit/data/media/bear.html +++ /dev/null @@ -1,15 +0,0 @@ -<html> -<body> -<video autoplay="true" id="v"></video> -<script> - layoutTestController.waitUntilDone(); - - var v = document.getElementById('v'); - v.addEventListener('canplaythrough', function() { - window.setTimeout("layoutTestController.notifyDone();", 1000); - }, false); - v.src = 'bear_silent.ogv'; - v.load(); -</script> -</body> -</html> diff --git a/webkit/data/media/bear_silent.ogv b/webkit/data/media/bear_silent.ogv Binary files differdeleted file mode 100644 index 9233318..0000000 --- a/webkit/data/media/bear_silent.ogv +++ /dev/null diff --git a/webkit/data/media/manybear.html b/webkit/data/media/manybear.html deleted file mode 100644 index 2ebf5ff..0000000 --- a/webkit/data/media/manybear.html +++ /dev/null @@ -1,38 +0,0 @@ -<html> -<body> -<div id="container"></div> -<script> - layoutTestController.waitUntilDone(); - - var count = 0; - var file = "bear_silent.ogv"; - - function loop() { - var c = document.getElementById('container'); - var v = null; - - if (c.childNodes != null && c.childNodes.length > 0) { - v = c.childNodes[0]; - } - - // If there is a video tag as child, remove it. - if (v) { - c.removeChild(v); - window.setTimeout(function () { loop(); }, 0); - } else { - v = document.createElement("video"); - c.appendChild(v); - v.src = file; - v.addEventListener("canplaythrough", function () { loop(); }, false); - v.load(); - } - - if (count++ == 50) { - layoutTestController.notifyDone(); - } - } - - loop(); -</script> -</body> -</html> |