1 files changed, 31 insertions, 50 deletions

diff --git a/LayoutTests/storage/indexeddb/objectstore-clear.html b/LayoutTests/storage/indexeddb/objectstore-clear.html
index 7f4034f..f18848b 100644
--- a/LayoutTests/storage/indexeddb/objectstore-clear.html
+++ b/LayoutTests/storage/indexeddb/objectstore-clear.html
@@ -16,108 +16,89 @@ if (window.layoutTestController)
 
 function test()
 {
-    result = evalAndLog("webkitIndexedDB.open('name')");
-    verifyResult(result);
-    result.onsuccess = startSetVersion;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("webkitIndexedDB.open('objectstore-clear')");
+    request.onsuccess = startSetVersion;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function startSetVersion()
 {
-    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()
 {
-    verifySuccessEvent(event);
-    window.trans = evalAndLog("trans = event.result");
+    window.trans = evalAndLog("trans = event.target.result");
     shouldBeTrue("trans !== null");
 
-    deleteAllObjectStores(db, createObjectStoreAndAddValue);
-}
+    deleteAllObjectStores(db);
 
-function createObjectStoreAndAddValue()
-{
     store = evalAndLog("store = db.createObjectStore('storeName', null)");
 
     window.index = evalAndLog("store.createIndex('indexName', '')");
     shouldBeTrue("store.indexNames.contains('indexName')");
 
-    result = evalAndLog("store.add('value', 'key')");
-    verifyResult(result);
-    result.onsuccess = createSecondObjectStoreAndAddValue;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("store.add('value', 'key')");
+    request.onsuccess = createSecondObjectStoreAndAddValue;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function createSecondObjectStoreAndAddValue()
 {
-    verifySuccessEvent(event);
-
     otherStore = evalAndLog("otherStore = db.createObjectStore('otherStoreName', null)");
 
-    result = evalAndLog("otherStore.add('value', 'key')");
-    verifyResult(result);
-    result.onsuccess = clearObjectStore;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("otherStore.add('value', 'key')");
+    request.onsuccess = clearObjectStore;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function clearObjectStore()
 {
-    verifySuccessEvent(event);
-
-    result = evalAndLog("store.clear()");
-    verifyResult(result);
-    result.onsuccess = clearSuccess;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("store.clear()");
+    request.onsuccess = clearSuccess;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function clearSuccess()
 {
-    verifySuccessEvent(event);
-    shouldBeUndefined("event.result");
+    shouldBeUndefined("event.target.result");
 
-    result = evalAndLog("store.openCursor()");
-    result.onsuccess = openCursorSuccess;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("store.openCursor()");
+    request.onsuccess = openCursorSuccess;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function openCursorSuccess()
 {
-    verifySuccessEvent(event);
-    shouldBeNull("event.result");
+    shouldBeNull("event.target.result");
 
     index = evalAndLog("index = store.index('indexName')");
-    result = evalAndLog("index.openKeyCursor()");
-    result.onsuccess = openKeyCursorSuccess;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("index.openKeyCursor()");
+    request.onsuccess = openKeyCursorSuccess;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function openKeyCursorSuccess()
 {
     debug("openKeyCursorSuccess():");
-    verifySuccessEvent(event);
-    shouldBeNull("event.result");
+    shouldBeNull("event.target.result");
 
     transaction = evalAndLog("db.transaction({mode: webkitIDBTransaction.READ_WRITE})");
     transaction.onabort = unexpectedErrorCallback;
     var otherStore = evalAndLog("otherStore = transaction.objectStore('otherStoreName')");
 
-    result = evalAndLog("otherStore.get('key')");
-    verifyResult(result);
-    result.onsuccess = getSuccess;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("otherStore.get('key')");
+    request.onsuccess = getSuccess;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function getSuccess()
 {
-    verifySuccessEvent(event);
-    shouldBeEqualToString("event.result", "value");
+    shouldBeEqualToString("event.target.result", "value");
 
     done();
 }