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 | |
| 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')
| -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 | ||||
| -rw-r--r-- | webkit/tools/test_shell/media_leak_test.cc | 43 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 1 |
5 files changed, 0 insertions, 97 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> diff --git a/webkit/tools/test_shell/media_leak_test.cc b/webkit/tools/test_shell/media_leak_test.cc deleted file mode 100644 index 1332b67..0000000 --- a/webkit/tools/test_shell/media_leak_test.cc +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "base/file_path.h" -#include "base/file_util.h" -#include "base/path_service.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "webkit/tools/test_shell/test_shell.h" -#include "webkit/tools/test_shell/test_shell_test.h" - -class MediaLeakTest : public TestShellTest { -}; - -#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX)) - -// This test plays a Theora video file for 1 second. It tries to expose -// memory leaks during a normal playback. -TEST_F(MediaLeakTest, VideoBear) { - FilePath media_file; - ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &media_file)); - media_file = media_file.Append(FILE_PATH_LITERAL("webkit")) - .Append(FILE_PATH_LITERAL("data")) - .Append(FILE_PATH_LITERAL("media")) - .Append(FILE_PATH_LITERAL("bear.html")); - test_shell_->LoadFile(media_file); - test_shell_->WaitTestFinished(); -} - -// This test loads a Theora video file and unloads it many times. It tries -// to expose memory leaks in the glue layer with WebKit. -TEST_F(MediaLeakTest, DISABLED_ManyVideoBear) { - FilePath media_file; - ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &media_file)); - media_file = media_file.Append(FILE_PATH_LITERAL("webkit")) - .Append(FILE_PATH_LITERAL("data")) - .Append(FILE_PATH_LITERAL("media")) - .Append(FILE_PATH_LITERAL("manybear.html")); - test_shell_->LoadFile(media_file); - test_shell_->WaitTestFinished(); -} - -#endif diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index 356731d..f700d12 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -485,7 +485,6 @@ '../webcore_unit_tests/ICOImageDecoder_unittest.cpp', 'image_decoder_unittest.cc', 'image_decoder_unittest.h', - 'media_leak_test.cc', 'mock_spellcheck_unittest.cc', 'plugin_tests.cc', 'run_all_tests.cc', |