1 files changed, 25 insertions, 41 deletions

diff --git a/LayoutTests/storage/indexeddb/objectstore-removeobjectstore.html b/LayoutTests/storage/indexeddb/objectstore-removeobjectstore.html
index f9b1e78..f44b27e 100644
--- a/LayoutTests/storage/indexeddb/objectstore-removeobjectstore.html
+++ b/LayoutTests/storage/indexeddb/objectstore-removeobjectstore.html
@@ -16,74 +16,60 @@ if (window.layoutTestController)
 
 function test()
 {
-    result = evalAndLog("webkitIndexedDB.open('name')");
-    verifyResult(result);
-    result.onsuccess = startSetVersion;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("webkitIndexedDB.open('objectstore-removeobjectstore')");
+    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 = getValue;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("store.add('value', 'key')");
+    request.onsuccess = getValue;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function getValue()
 {
-    verifySuccessEvent(event);
-
     transaction = evalAndLog("db.transaction({mode: webkitIDBTransaction.READ_WRITE})");
     transaction.onabort = unexpectedErrorCallback;
     var store = evalAndLog("store = transaction.objectStore('storeName')");
 
-    result = evalAndLog("store.get('key')");
-    verifyResult(result);
-    result.onsuccess = addIndex;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("store.get('key')");
+    request.onsuccess = addIndex;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function addIndex()
 {
-    verifySuccessEvent(event);
-    shouldBeEqualToString("event.result", "value");
+    shouldBeEqualToString("event.target.result", "value");
 
-    result = evalAndLog("db.setVersion('new version')");
-    verifyResult(result);
-    result.onsuccess = deleteObjectStore;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("db.setVersion('new version')");
+    request.onsuccess = deleteObjectStore;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function deleteObjectStore()
 {
-    verifySuccessEvent(event);
-    window.trans = evalAndLog("trans = event.result");
+    window.trans = evalAndLog("trans = event.target.result");
     shouldBeTrue("trans !== null");
     trans.onabort = unexpectedAbortCallback;
 
@@ -103,17 +89,15 @@ function getValueAgain()
     transaction.onabort = unexpectedErrorCallback;
     var store = evalAndLog("store = transaction.objectStore('storeName')");
 
-    result = evalAndLog("store.get('key')");
-    verifyResult(result);
-    result.onsuccess = verifyNotFound;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("store.get('key')");
+    request.onsuccess = verifyNotFound;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function verifyNotFound()
 {
-    verifySuccessEvent(event);
-    shouldBe("event.result", "undefined");
-    shouldBeFalse("event.source.indexNames.contains('indexName')");
+    shouldBe("event.target.result", "undefined");
+    shouldBeFalse("event.target.source.indexNames.contains('indexName')");
 
     done();
 }