Rebaseline and re-enable two layout tests.

TEST=none
BUG=none


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

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

5 files changed, 27 insertions, 11 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/storage/quota-tracking-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/storage/quota-tracking-expected.txt
index dcc5397..d940c68 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/storage/quota-tracking-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/storage/quota-tracking-expected.txt
@@ -1,10 +1,14 @@
 This test checks to make sure that quotas are enforced per-origin instead of per-database, as they were prior to http://trac.webkit.org/projects/webkit/changeset/29983.
-The test clears all databases, sets the quota for the origin to 32k, then tries to insert 17k of data into two databases. If things go as planned, the UI Delegate will be informed of the exceeded quota.
+The test clears all databases, sets the quota for the origin to 32k, then tries to insert 17k of data into two databases. If things go as planned, the UI Delegate will be informed of the exceeded quota and should increase the quota for this origin. Inserting 17k of data the third time should succeed again.
 Adding a table
 Inserting some data
 Done adding data
 Adding a table
 Inserting some data
-Test failed - there was not enough remaining storage space, or the storage quota was reached and the user declined to allow more space
+Expected quota exception - there was not enough remaining storage space, or the storage quota was reached and the user declined to allow more space
+Done adding data
+Adding a table
+Inserting some data
+Unexpected exception - there was not enough remaining storage space, or the storage quota was reached and the user declined to allow more space
 Test Complete
 
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/storage/statement-error-callback-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/storage/statement-error-callback-expected.txt
index 5ea7e10..8d35ed9 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/storage/statement-error-callback-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/storage/statement-error-callback-expected.txt
@@ -1,5 +1,11 @@
-CONSOLE MESSAGE: line 54: Uncaught Exception in Statement error callback
-This test confirms that if the statement error callback returns true or throws an exception we do not execute any further statements in that transaction and instead execute the transaction error callback immediately.
+CONSOLE MESSAGE: line 75: Uncaught Exception in statement error callback
+This test confirms that a transaction is immediately rolled back if and only if a statement's error callback throws an exception, returns true, or doesn't return any value.
+PASS - the transaction error callback was invoked.
+PASS - the transaction error callback was invoked.
+PASS - the transaction error callback was invoked.
+PASS - the transaction error callback was invoked.
+PASS - the transaction error callback was invoked.
 PASS - the transaction error callback was invoked.
 PASS - the transaction error callback was invoked.
 Test Complete
+
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/storage/quota-tracking-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/storage/quota-tracking-expected.txt
index dcc5397..d940c68 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/storage/quota-tracking-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/storage/quota-tracking-expected.txt
@@ -1,10 +1,14 @@
 This test checks to make sure that quotas are enforced per-origin instead of per-database, as they were prior to http://trac.webkit.org/projects/webkit/changeset/29983.
-The test clears all databases, sets the quota for the origin to 32k, then tries to insert 17k of data into two databases. If things go as planned, the UI Delegate will be informed of the exceeded quota.
+The test clears all databases, sets the quota for the origin to 32k, then tries to insert 17k of data into two databases. If things go as planned, the UI Delegate will be informed of the exceeded quota and should increase the quota for this origin. Inserting 17k of data the third time should succeed again.
 Adding a table
 Inserting some data
 Done adding data
 Adding a table
 Inserting some data
-Test failed - there was not enough remaining storage space, or the storage quota was reached and the user declined to allow more space
+Expected quota exception - there was not enough remaining storage space, or the storage quota was reached and the user declined to allow more space
+Done adding data
+Adding a table
+Inserting some data
+Unexpected exception - there was not enough remaining storage space, or the storage quota was reached and the user declined to allow more space
 Test Complete
 
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/storage/statement-error-callback-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/storage/statement-error-callback-expected.txt
index 5ea7e10..2ea093a 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/storage/statement-error-callback-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/storage/statement-error-callback-expected.txt
@@ -1,5 +1,10 @@
-CONSOLE MESSAGE: line 54: Uncaught Exception in Statement error callback
-This test confirms that if the statement error callback returns true or throws an exception we do not execute any further statements in that transaction and instead execute the transaction error callback immediately.
+CONSOLE MESSAGE: line 75: Uncaught Exception in statement error callback
+This test confirms that a transaction is immediately rolled back if and only if a statement's error callback throws an exception, returns true, or doesn't return any value.
+PASS - the transaction error callback was invoked.
+PASS - the transaction error callback was invoked.
+PASS - the transaction error callback was invoked.
+PASS - the transaction error callback was invoked.
+PASS - the transaction error callback was invoked.
 PASS - the transaction error callback was invoked.
 PASS - the transaction error callback was invoked.
 Test Complete
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 7f5e965..b584e6f9 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -707,9 +707,6 @@ BUG33211 : http/tests/loading/deleted-host-in-resource-load-delegate-callback.ht
 BUG27697 SKIP : storage/hash-change-with-xhr.html = PASS
 // We do not use Safari's private browsing
 WONTFIX SKIP : storage/private-browsing-readonly.html = PASS
-// Disable this test until we rebaseline it
-BUG_DUMI SKIP : storage/quota-tracking.html = TEXT
-BUG_DUMI SKIP : storage/statement-error-callback.html = TEXT
 
 // Implement HTML5 Geolocation API.
 BUG11246 DEFER SKIP : fast/dom/Geolocation = FAIL