Re-enable memory tests and remove the fixed crash from the known crashes.

BUG=10895
TEST=Just re-enabling some tests that I had to disable earlier today.


Review URL: http://codereview.chromium.org/93115

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14419 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 6 deletions

diff --git a/chrome/test/data/reliability/known_crashes.txt b/chrome/test/data/reliability/known_crashes.txt
index eef4166..d155c52 100644
--- a/chrome/test/data/reliability/known_crashes.txt
+++ b/chrome/test/data/reliability/known_crashes.txt
@@ -86,9 +86,6 @@ PREFIX : webcore::token::reset___webcore::htmltokenizer::processtoken___webcore:
 # 8033
 SUBSTRING : windowdragresponsetask::run___messageloop::runtask___messageloop::dowork
 
-# 10895
-PREFIX : webcore::removependingeventlistener___webcore::domwindow::clearattributeeventlistener___webcore::domwindow::setattributeeventlistener___webcore::v8custom::v8domwindoweventhandleraccessorsetter___v8::internal::jsobject::setpropertywithcallback
-
 # 10896
 PREFIX : tcmalloc::threadcache::fetchfromcentralcache___tcmalloc::threadcache::allocate___`anonymous namespace'::do_malloc___realloc___pickle::pickle
 
diff --git a/chrome/test/memory_test/memory_test.cc b/chrome/test/memory_test/memory_test.cc
index b68dbce..b1c213a 100644
--- a/chrome/test/memory_test/memory_test.cc
+++ b/chrome/test/memory_test/memory_test.cc
@@ -420,14 +420,14 @@ class MemoryReferenceTest : public MemoryTest {
 
 }  // namespace
 
-TEST_F(MemoryTest, DISABLED_SingleTabTest) {
+TEST_F(MemoryTest, SingleTabTest) {
   RunTest("1t", 1);
 }
 
-TEST_F(MemoryTest, DISABLED_FiveTabTest) {
+TEST_F(MemoryTest, FiveTabTest) {
   RunTest("5t", 5);
 }
 
-TEST_F(MemoryTest, DISABLED_TwelveTabTest) {
+TEST_F(MemoryTest, TwelveTabTest) {
   RunTest("12t", 12);
 }