summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-06 18:38:42 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-06 18:38:42 +0000
commitf0c91411b884c5fd4d3875f683abb6cdb78f9451 (patch)
tree770581ab7a4f1d1a8644d3a9a2a72c2d7f867d1d /webkit
parent7b808166cbb7edf90d390efc72f82baf7afd6464 (diff)
downloadchromium_src-f0c91411b884c5fd4d3875f683abb6cdb78f9451.zip
chromium_src-f0c91411b884c5fd4d3875f683abb6cdb78f9451.tar.gz
chromium_src-f0c91411b884c5fd4d3875f683abb6cdb78f9451.tar.bz2
Enable MediaLeakTest.*
BUG=18461 TEST=test_shell_tests --gtest_filter=MediaLeakTest.* Enabling the MediaLeakTest(s) because they should pass now due to the problematic webkit change at r46769 was reverted. Review URL: http://codereview.chromium.org/164005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/media_leak_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/media_leak_test.cc b/webkit/tools/test_shell/media_leak_test.cc
index bfc6eb3..a7ab807 100644
--- a/webkit/tools/test_shell/media_leak_test.cc
+++ b/webkit/tools/test_shell/media_leak_test.cc
@@ -16,7 +16,7 @@ class MediaLeakTest : public TestShellTest {
// This test plays a Theora video file for 1 second. It tries to expose
// memory leaks during a normal playback.
-TEST_F(MediaLeakTest, DISABLED_VideoBear) {
+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"))
@@ -29,7 +29,7 @@ TEST_F(MediaLeakTest, DISABLED_VideoBear) {
// 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) {
+TEST_F(MediaLeakTest, ManyVideoBear) {
FilePath media_file;
ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &media_file));
media_file = media_file.Append(FILE_PATH_LITERAL("webkit"))