summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-08 19:14:29 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-08 19:14:29 +0000
commitc890e98205d97b57534f2eac00618a2864d61bb5 (patch)
treed7189664070ba6a0dfd5b2e68b250b95a3a4038f
parent3ba8cc7babe7a035cb9efbd8c07c4620b0ca79c5 (diff)
downloadchromium_src-c890e98205d97b57534f2eac00618a2864d61bb5.zip
chromium_src-c890e98205d97b57534f2eac00618a2864d61bb5.tar.gz
chromium_src-c890e98205d97b57534f2eac00618a2864d61bb5.tar.bz2
Re-enable the ui test based layout tests for DOM Storage.
TBR=jam TEST=none BUG=none Review URL: http://codereview.chromium.org/164227 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22868 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/in_process_webkit/dom_storage_uitest.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/chrome/browser/in_process_webkit/dom_storage_uitest.cc b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
index f6faefa..be580fc 100644
--- a/chrome/browser/in_process_webkit/dom_storage_uitest.cc
+++ b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
@@ -2,9 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// Completely disable for now.
-#if 0
-
#include "chrome/common/chrome_switches.h"
#include "chrome/test/ui/ui_layout_test.h"
@@ -53,7 +50,7 @@ class DOMStorageTest : public UILayoutTest {
FilePath test_dir_;
};
-TEST_F(DOMStorageTest, DISABLED_DOMStorageLayoutTests) {
+TEST_F(DOMStorageTest, DOMStorageLayoutTests) {
// TODO(jorlow): Enable these tests when we remove them from the
// test_exceptions.txt file.
//InitializeForLayoutTest(test_dir_, FilePath(), false);
@@ -61,19 +58,17 @@ TEST_F(DOMStorageTest, DISABLED_DOMStorageLayoutTests) {
// RunLayoutTest(kTopLevelFiles[i], false, true);
}
-TEST_F(DOMStorageTest, DISABLED_LocalStorageLayoutTests) {
+TEST_F(DOMStorageTest, LocalStorageLayoutTests) {
InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("localstorage"),
false);
for (size_t i=0; i<arraysize(kSubDirFiles); ++i)
RunLayoutTest(kSubDirFiles[i], false);
}
-TEST_F(DOMStorageTest, DISABLED_SessionStorageLayoutTests) {
+TEST_F(DOMStorageTest, SessionStorageLayoutTests) {
InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("sessionstorage"),
false);
for (size_t i=0; i<arraysize(kSubDirFiles); ++i)
RunLayoutTest(kSubDirFiles[i], false);
}
-#endif
-