Clean up storage test expectations.

webkit/tools/layout_tests/test_expectations.txt

 // This file consists of lines with specifications of what
 // to expect from layout test cases. The test cases can be directories
 // in which case the expectations apply to all test cases in that
 // directory and any subdirectory. The format of the file is along the
 // lines of:
 //
 // LayoutTests/fast/js/fixme.js = FAIL
 // LayoutTests/fast/js/flaky.js = FAIL PASS
 // LayoutTests/fast/js/crash.js = CRASH TIMEOUT FAIL PASS
 //
@@ skipping 633 matching lines @@
 // layoutTestController. Now we have preference to enable/disable user
 // styles(not work now), we still need to add a preference to enable/disable
 // styles of both author and user.
 // Deferring, we don't support user-controlled UA stylesheets (in beta)
 // Actually, gonna SKIP because it causes an additional error message in:
 // LayoutTests/fast/css/display-none-inline-style-change-crash.html   somehow
 // the message is dumped after the #EOF, which causes an additional
 // error in the header of the following test.
 BUG24197 SKIP : LayoutTests/fast/css/disabled-author-styles.html = FAIL
 
-// Need to implement clearAllDatabases in layoutTestController.
-BUG20995 SKIP : LayoutTests/storage/statement-error-callback.html = FAIL
 
 // -----------------------------------------------------------------
 // Other
 // -----------------------------------------------------------------
 
 // Pixeltest failure: Form control metrics incorrect
 BUG10273 LINUX : LayoutTests/http/tests/navigation/javascriptlink-frames.html = FAIL PASS TIMEOUT
 
 // Mac Safari under certain circumstances automatically places
 // a caret in editable document even when none was requested programatically.
@@ skipping 45 matching lines @@
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/simple-events.html = FAIL
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/index-get-and-set.html = FAIL
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/onstorage-attribute-markup.html = FAIL
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/onstorage-attribute-setattribute.html = FAIL
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/onstorage-attribute-setwindow.html = FAIL
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/string-conversion.html = FAIL
 BUG4360 : LayoutTests/storage/domstorage/documentURI.html = FAIL
 BUG4360 : LayoutTests/storage/domstorage/complex-values.html = FAIL
 BUG4360 : LayoutTests/http/tests/loading/deleted-host-in-resource-load-delegate-callback.html = TIMEOUT
 
-// Flaky DOM Storage tests.
-//BUG_JORLOW : LayoutTests/storage/domstorage/quota.html = CRASH PASS
-//BUG_JORLOW DEBUG : LayoutTests/storage/domstorage/localstorage/onstorage-attribute-setwindow.html = PASS CRASH
-
 // TODO(jorlow): Is this really still slow?  If so, why?
 BUG_JORLOW SLOW DEBUG : LayoutTests/storage/domstorage/localstorage/index-get-and-set.html = PASS
 
 // HTML5 databases are not supported in test_shell yet
 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/open-database-set-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
 BUG4359 SKIP : LayoutTests/storage/test-authorizer.html = PASS
 BUG4359 SKIP : LayoutTests/storage/open-database-while-transaction-in-progress.html = PASS
 BUG4359 SKIP : LayoutTests/storage/read-and-write-transactions-dont-run-together.html = PASS
 BUG4359 SKIP : LayoutTests/storage/read-transactions-running-concurrently.html = PASS
 BUG4359 SKIP : LayoutTests/storage/multiple-transactions-on-different-handles.html = PASS
+BUG4359 SKIP : LayoutTests/storage/change-version-handle-reuse.html = FAIL
+BUG4359 SKIP : LayoutTests/storage/change-version.html = TIMEOUT
+
+// Need to implement clearAllDatabases in layoutTestController.
+BUG20995 SKIP : LayoutTests/storage/statement-error-callback.html = FAIL
 
 // Implement HTML5 Geolocation API.
 BUG11246 : LayoutTests/fast/dom/Geolocation = FAIL
 
 // Implement HTML5 EventSource API. Skipping, because most of these time out and
 // slow down the test run.
 BUG19625 SKIP : LayoutTests/fast/eventsource = TIMEOUT
 BUG19625 SKIP : LayoutTests/http/tests/eventsource = TIMEOUT
 
 // Implement HTML5 datalist element.
@@ skipping 2357 matching lines @@
 
 // WebKit roll 49961:49992
 // Added in http://trac.webkit.org/changeset/49990
 BUG25884 WIN LINUX : LayoutTests/fast/dom/Document/CaretRangeFromPoint/caretRangeFromPoint-in-zoom-and-scroll.html = FAIL
 
 // window.openDatabase doesn't exist yet as of r29980.  That's causing these
 // tests to fail.
 BUG26107 : LayoutTests/fast/js/global-function-resolve.html = FAIL
 BUG26107 MAC : LayoutTests/http/tests/security/cross-frame-access-call.html = FAIL PASS
 BUG26107 WIN LINUX : LayoutTests/http/tests/security/cross-frame-access-call.html = FAIL
-BUG26107 : LayoutTests/storage/change-version-handle-reuse.html = FAIL
-BUG26107 : LayoutTests/storage/change-version.html = TIMEOUT
 
 BUG26344 LINUX DEBUG : LayoutTests/fast/text/atsui-partial-selection.html = CRASH
 BUG26344 LINUX DEBUG : LayoutTests/platform/mac/editing/deleting/backward-delete.html = CRASH
 
 // WebKit roll 49992:49997
 // hclam to add expected results.
 // Update:  failing in an odd way since the WebKit 50417:50432 roll; does
 // not seem to be finding fallback results; skipping for now.
 BUG_HCLAM SKIP : LayoutTests/media/video-volume-slider.html = FAIL CRASH
 
@@ skipping 152 matching lines @@
 BUG_SENORBLANCO LINUX DEBUG : LayoutTests/webarchive/test-duplicate-resources.html = IMAGE+TEXT
 
 // WebKit 50407:50416
 BUG_SENORBLANCO : LayoutTests/accessibility/aria-controls-with-tabs.html = TEXT
 BUG_SENORBLANCO : LayoutTests/accessibility/aria-tab-roles.html = TEXT
 BUG_SENORBLANCO LINUX WIN : LayoutTests/svg/css/circle-in-mask-with-shadow.svg = IMAGE
 BUG_SENORBLANCO WIN : LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f.svg = IMAGE
 
 // Started failing on Win, Linux after Webkit 50476:50480, probably 50477
 BUG10442 WIN LINUX : LayoutTests/fast/dom/navigator-detached-no-crash.html = TEXT