Reverting 22029.

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

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

2 files changed, 4 insertions, 43 deletions

diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 9b98c17..a483840 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -587,47 +587,10 @@ BUG1130795 WIN LINUX : LayoutTests/fast/forms/box-shadow-override.html = FAIL
 // I'm marking them as deferred for now, but we should do something with them.
 BUG849072 SKIP : chrome/http/mime = PASS
 
-// These tests all depend on DOM Storage events which are not yet supported.
-BUG4360 : LayoutTests/storage/domstorage/window-attributes-exist.html = FAIL
-BUG4360 : LayoutTests/storage/domstorage/localstorage/iframe-events.html = TIMEOUT
-BUG4360 : LayoutTests/storage/domstorage/sessionstorage/iframe-events.html = TIMEOUT
-BUG4360 : LayoutTests/storage/domstorage/localstorage/simple-events.html = FAIL
-BUG4360 : LayoutTests/storage/domstorage/sessionstorage/simple-events.html = FAIL
-BUG4360 : LayoutTests/storage/domstorage/localstorage/index-get-and-set.html = FAIL
-BUG4360 : LayoutTests/storage/domstorage/sessionstorage/index-get-and-set.html = FAIL
-BUG4360 : LayoutTests/storage/domstorage/localstorage/onstorage-attribute-markup.html = FAIL
-BUG4360 : LayoutTests/storage/domstorage/sessionstorage/onstorage-attribute-markup.html = FAIL
-BUG4360 : LayoutTests/storage/domstorage/localstorage/onstorage-attribute-setattribute.html = FAIL
-BUG4360 : LayoutTests/storage/domstorage/sessionstorage/onstorage-attribute-setattribute.html = FAIL
-BUG4360 : LayoutTests/storage/domstorage/localstorage/onstorage-attribute-setwindow.html = FAIL
-BUG4360 : LayoutTests/storage/domstorage/sessionstorage/onstorage-attribute-setwindow.html = FAIL
-BUG4360 : LayoutTests/storage/domstorage/localstorage/string-conversion.html = FAIL
-BUG4360 : LayoutTests/storage/domstorage/sessionstorage/string-conversion.html = FAIL
-
-// Our DOM Storage implementation doesn't use WebKit's private browsing feature (even for incognito mode).
-WONTFIX : LayoutTests/storage/domstorage/localstorage/private-browsing-affects-storage.html = FAIL
-WONTFIX : LayoutTests/storage/domstorage/sessionstorage/private-browsing-affects-storage.html = FAIL
-
-// Depends on SessionStorage.  I'm not sure if this is working yet, but I don't think we need to SKIP it.
-BUG4360 : LayoutTests/http/tests/loading/deleted-host-in-resource-load-delegate-callback.html = TIMEOUT
-
-// Database
-BUG4359 SKIP : LayoutTests/storage/close-during-stress-test.html = PASS
-BUG4359 SKIP : LayoutTests/storage/database-lock-after-reload.html = PASS
-BUG4359 SKIP : LayoutTests/storage/empty-statement.html = PASS
-BUG4359 SKIP : LayoutTests/storage/execute-sql-args.html = PASS
-BUG4359 SKIP : LayoutTests/storage/hash-change-with-xhr.html = PASS
-BUG4359 SKIP : LayoutTests/storage/multiple-databases-garbage-collection.html = PASS
-BUG4359 SKIP : LayoutTests/storage/multiple-transactions.html = PASS
-BUG4359 SKIP : LayoutTests/storage/open-database-empty-version.html = PASS
-BUG4359 SKIP : LayoutTests/storage/private-browsing-readonly.html = PASS
-BUG4359 SKIP : LayoutTests/storage/quota-tracking.html = PASS
-BUG4359 SKIP : LayoutTests/storage/sql-data-types.html = PASS
-BUG4359 SKIP : LayoutTests/storage/sql-data-types.js = PASS
-BUG4359 SKIP : LayoutTests/storage/success-callback.html = PASS
-BUG4359 SKIP : LayoutTests/storage/transaction-callback-exception-crash.html = PASS
-BUG4359 SKIP : LayoutTests/storage/transaction-error-callback.html = PASS
-BUG4359 SKIP : LayoutTests/fast/js/exceptions-thrown-in-callbacks.html = PASS
+// We don't support the storage APIs.  Some of the them hang.
+BUG4360 SKIP : LayoutTests/storage = PASS
+BUG4360 SKIP : LayoutTests/fast/js/exceptions-thrown-in-callbacks.html = PASS
+BUG4360 SKIP : LayoutTests/http/tests/loading/deleted-host-in-resource-load-delegate-callback.html = TIMEOUT
 
 // Fails due to storage APIs not implemented.  Might be worth re-baselining
 // temporarily so the rest of the conditions are still tested.
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 3f9fcde..07add97 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -418,8 +418,6 @@ void TestShell::ResetWebPreferences() {
         // It's off by default for Chrome, but we don't want to
         // lose the coverage of dynamic font tests in webkit test.
         web_prefs_->remote_fonts_enabled = true;
-        web_prefs_->local_storage_enabled = true;
-        web_prefs_->session_storage_enabled = true;
     }
 }