summaryrefslogtreecommitdiffstats
path: root/chrome/test/memory_test
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-04 20:21:40 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-04 20:21:40 +0000
commit836add1222d83d8d3d59fe11b9720d2c03445a11 (patch)
tree420bc82415aa24567c32cef6574d7c3d710963af /chrome/test/memory_test
parent43509670844206f7073007c3a36333f0fad1314d (diff)
downloadchromium_src-836add1222d83d8d3d59fe11b9720d2c03445a11.zip
chromium_src-836add1222d83d8d3d59fe11b9720d2c03445a11.tar.gz
chromium_src-836add1222d83d8d3d59fe11b9720d2c03445a11.tar.bz2
Re-enable memory tests now that bug 13078 is fixed.
BUG=13078 Review URL: http://codereview.chromium.org/118256 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/memory_test')
-rw-r--r--chrome/test/memory_test/memory_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/memory_test/memory_test.cc b/chrome/test/memory_test/memory_test.cc
index e5d0ddf..e06727d 100644
--- a/chrome/test/memory_test/memory_test.cc
+++ b/chrome/test/memory_test/memory_test.cc
@@ -420,11 +420,11 @@ 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);
}