Merge WebKit at r62496: Initial merge by git

Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2

2 files changed, 5 insertions, 11 deletions

diff --git a/LayoutTests/storage/open-database-creation-callback.html b/LayoutTests/storage/open-database-creation-callback.html
index ac24942..081645c 100644
--- a/LayoutTests/storage/open-database-creation-callback.html
+++ b/LayoutTests/storage/open-database-creation-callback.html
@@ -26,7 +26,8 @@ function runTest()
 
     // Open a new database with a creation callback, and make sure the creation callback is queued
     var creationCallbackCalled1 = false;
-    var db1 = openDatabase("OpenDatabaseCreationCallback1", "1.0", "", 1,
+    var db1Name = "OpenDatabaseCreationCallback1" + (new Date()).getTime();
+    var db1 = openDatabase(db1Name, "1.0", "", 1,
                            function(db) {
                                creationCallbackCalled1 = true;
                                if (db.version != "") {
@@ -52,7 +53,7 @@ function runTest()
     // a null handle and throw a INVALID_STATE_ERR exception.
     var db1Fail = null;
     try {
-        db1Fail = openDatabase("OpenDatabaseCreationCallback1", "1.0", "", 1);
+        db1Fail = openDatabase(db1Name, "1.0", "", 1);
         log("This statement should not have been executed; an INVALID_STATE_ERR exception should've been thrown.");
         finishTest();
     } catch(err) {
diff --git a/LayoutTests/storage/sql-error-codes.js b/LayoutTests/storage/sql-error-codes.js
index 9d6f6d3..2d2c97c 100644
--- a/LayoutTests/storage/sql-error-codes.js
+++ b/LayoutTests/storage/sql-error-codes.js
@@ -64,17 +64,10 @@ function testBindParameterOfWrongType(db)
     var badString = { };
     badString.toString = function() { throw "Cannot call toString() on this object." };
 
-    // JSC will throw an exception when calling badString.toString(). V8 will catch it.
-    // So we run this transaction using a custom success callback.
-    db.transaction(function(tx) {
+    testTransaction(db, function(tx) {
         tx.executeSql("CREATE TABLE IF NOT EXISTS BadBindTypeTest (Foo TEXT)");
         tx.executeSql("INSERT INTO BadBindTypeTest VALUES (?)", [badString]);
-    }, function(error) {
-        transactionErrorCallback(error, "UNKNOWN_ERR");
-    }, function() {
-        log("The transaction in testBindParameterOfWrongType() was successful.");
-        testsRun++;
-    });
+    }, "UNKNOWN_ERR");
 }
 
 function testQuotaExceeded(db)