IndexedDB: Defer delete calls when there is a running upgrade

third_party/WebKit/LayoutTests/storage/indexeddb/resources/delete-in-upgradeneeded-close-in-versionchange.js

Index: third_party/WebKit/LayoutTests/storage/indexeddb/resources/delete-in-upgradeneeded-close-in-versionchange.js
diff --git a/third_party/WebKit/LayoutTests/storage/indexeddb/resources/delete-in-upgradeneeded-close-in-versionchange.js b/third_party/WebKit/LayoutTests/storage/indexeddb/resources/delete-in-upgradeneeded-close-in-versionchange.js
index 82828735d8f0c6df56b1f8fe0cf167abf5779166..0acff6916e68497c509f4997b9573d487ead56de 100644
--- a/third_party/WebKit/LayoutTests/storage/indexeddb/resources/delete-in-upgradeneeded-close-in-versionchange.js
+++ b/third_party/WebKit/LayoutTests/storage/indexeddb/resources/delete-in-upgradeneeded-close-in-versionchange.js
@@ -15,19 +15,21 @@ function test()
 }
 
 var sawUpgradeNeeded = false;
+var sawOpenSuccess = false;
 var sawVersionChange = false;
 
 function initiallyDeleted(evt) {
     preamble(evt);
     evalAndLog("request = indexedDB.open(dbname, 1)");
     request.onupgradeneeded = upgradeNeededCallback;
-    request.onsuccess = unexpectedSuccessCallback;
+    request.onsuccess = openSuccessCallback;
 }
 
 function upgradeNeededCallback(evt)
 {
     preamble(evt);
     shouldBeFalse("sawUpgradeNeeded");
+    shouldBeFalse("sawOpenSuccess");
     evalAndLog("sawUpgradeNeeded = true");
     shouldBe("event.oldVersion", "0");
     shouldBe("event.newVersion", "1");
@@ -42,14 +44,21 @@ function upgradeNeededCallback(evt)
 
 function versionChangeCallback(evt) {
     preamble(evt);
+    shouldBeTrue("sawOpenSuccess");
     shouldBe("event.oldVersion", "1");
     shouldBeNull("event.newVersion");
     evalAndLog("sawVersionChange = true");
-
-    debug("Closing the connection before the IDBOpenDBRequest's success fires will cause the open to fail.");
     evalAndLog("db.close()");
 }
 
+function openSuccessCallback(evt)
+{
+    preamble(evt);
+    shouldBeTrue("sawUpgradeNeeded");
+    shouldBeFalse("sawVersionChange");
+    evalAndLog("sawOpenSuccess = true");
+}
+
 function deleteSuccessCallback(evt)
 {
     preamble(evt);