1 files changed, 19 insertions, 30 deletions
diff --git a/LayoutTests/storage/indexeddb/queued-commands.html b/LayoutTests/storage/indexeddb/queued-commands.html
index d48cb52..6c85c38 100644
--- a/LayoutTests/storage/indexeddb/queued-commands.html
+++ b/LayoutTests/storage/indexeddb/queued-commands.html
@@ -16,60 +16,49 @@ if (window.layoutTestController)
 
 function test()
 {
-    result = evalAndLog("webkitIndexedDB.open('name')");
-    verifyResult(result);
-    result.onsuccess = setVersion;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("webkitIndexedDB.open('queued-commands')");
+    request.onsuccess = setVersion;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function setVersion()
 {
-    verifySuccessEvent(event);
-    db = evalAndLog("db = event.result");
+    db = evalAndLog("db = event.target.result");
 
-    result = evalAndLog("db.setVersion('new version')");
-    verifyResult(result);
-    result.onsuccess = deleteExisting;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("db.setVersion('new version')");
+    request.onsuccess = deleteExisting;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function deleteExisting()
 {
     debug("setVersionSuccess():");
-    verifySuccessEvent(event);
-    window.trans = evalAndLog("trans = event.result");
+    window.trans = evalAndLog("trans = event.target.result");
     shouldBeTrue("trans !== null");
     trans.onabort = unexpectedAbortCallback;
 
-    deleteAllObjectStores(db, createIndex);
-}
+    deleteAllObjectStores(db);
 
-function createIndex()
-{
-    window.store = evalAndLog("db.createObjectStore('storeName', null)");
+    window.store = evalAndLog("db.createObjectStore('storeName')");
     window.indexObject = evalAndLog("store.createIndex('indexName', 'x')");
 
-    result = evalAndLog("store.add({x: 'value', y: 'zzz'}, 'key')");
-    verifyResult(result);
-    result.onsuccess = function() { verifyAdd(0); };
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("store.add({x: 'value', y: 'zzz'}, 'key')");
+    request.onsuccess = function() { verifyAdd(0); };
+    request.onerror = unexpectedErrorCallback;
 
-    result = evalAndLog("store.add({x: 'value2', y: 'zzz2'}, 'key2')");
-    verifyResult(result);
-    result.onsuccess = function() { verifyAdd(1); };
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("store.add({x: 'value2', y: 'zzz2'}, 'key2')");
+    request.onsuccess = function() { verifyAdd(1); };
+    request.onerror = unexpectedErrorCallback;
 
-    result = evalAndLog("store.put({x: 'valu2', y: 'zz2'}, 'ky2')");
-    verifyResult(result);
-    result.onsuccess = function() { verifyAdd(2); };
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("store.put({x: 'valu2', y: 'zz2'}, 'ky2')");
+    request.onsuccess = function() { verifyAdd(2); };
+    request.onerror = unexpectedErrorCallback;
 
     window.addCount = 0;
 }
 
 function verifyAdd(expected)
 {
-    verifySuccessEvent(event);
     shouldBe("" + addCount++, "" + expected);
 
     if (addCount == 3)