Make tests work in Firefox.

chrome/test/data/indexeddb/perf_shared.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 window.indexedDB = window.indexedDB || window.webkitIndexedDB ||
     window.mozIndexedDB || window.msIndexedDB;
 window.IDBKeyRange = window.IDBKeyRange || window.webkitIDBKeyRange;
 
 var automation = {
   results: {}
 };
 
 automation.setDone = function() {
   this.setStatus("Test complete.");
   document.cookie = '__done=1; path=/';
 };
 
 automation.addResult = function(name, result) {
   result = "" + result;
   this.results[name] = result;
   var elt = document.getElementById('results');
   var div = document.createElement('div');
-  div.innerText = name + ": " + result;
+  div.textContent = name + ": " + result;
   elt.appendChild(div);
 };
 
 automation.getResults = function() {
   return this.results;
 };
 
 automation.setStatus = function(s) {
-  document.getElementById('status').innerText = s;
+  document.getElementById('status').textContent = s;
 };
 
 function assert(t) {
   if (!t) {
     var e = new Error("Assertion failed!");
     console.log(e.stack);
     throw e;
   }
 }
 
 function onError(e) {
   var s = "Caught error.";
   if (e.target && e.target.webkitErrorMessage)
     s += "\n" + e.target.webkitErrorMessage;
+  else if (e.target && e.target.error)
+    s += "\n" + e.target.error.name;
   console.log(s);
   automation.setStatus(s);
   e.stopPropagation();
   throw new Error(e);
 }
 
 var baseVersion = 2;  // The version with our object stores.
 var curVersion;
 
 // Valid options fields:
 //  indexName: the name of an index to create on each object store
 //  indexKeyPath: the key path for that index
 //  indexIsUnique: the "unique" option for IDBIndexParameters
 //  indexIsMultiEntry: the "multiEntry" option for IDBIndexParameters
 //
 function createDatabase(
     name, objectStoreNames, handler, errorHandler, optionSets) {
   var openRequest = indexedDB.open(name, baseVersion);
   openRequest.onblocked = errorHandler;
+  openRequest.onerror = errorHandler;
   function createObjectStores(db) {
     for (var store in objectStoreNames) {
       var name = objectStoreNames[store];
       assert(!db.objectStoreNames.contains(name));
       var os = db.createObjectStore(name);
       if (optionSets) {
         for (o in optionSets) {
           var options = optionSets[o];
           assert(options.indexName);
           assert('indexKeyPath' in options);
           os.createIndex(options.indexName, options.indexKeyPath,
               { unique: options.indexIsUnique,
                 multiEntry: options.indexIsMultiEntry });
         }
       }
     }
   }
   openRequest.onupgradeneeded = function(ev) {
-    // TODO(ericu): This is the spec-compliant path, which doesn't yet work in
-    // Chrome, and isn't yet tested, as this function won't currently be called.
+    // This is the spec-compliant path, which doesn't yet run in Chrome, but
+    // works in Firefox.
     assert(openRequest == ev.target);
-    createObjectStores(openRequest.result);
+    var db = openRequest.result;
+    db.onerror = errorHandler;
+    createObjectStores(db);
     // onsuccess will get called after this exits.
   };
   openRequest.onsuccess = function(ev) {
     assert(openRequest == ev.target);
     var db = openRequest.result;
+    curVersion = db.version;
     db.onerror = function(ev) {
       console.log("db error", arguments, openRequest.webkitErrorMessage);
-      errorHandler();
+      errorHandler(ev);
     }
-    if (db.version != baseVersion) {
-      // This is the current Chrome path.
+    if (curVersion != baseVersion) {
+      // This is the legacy path, which runs only in Chrome.
       var setVersionRequest = db.setVersion(baseVersion);
       setVersionRequest.onerror = errorHandler;
       setVersionRequest.onsuccess = function(e) {
-        curVersion = db.version;
         assert(setVersionRequest == e.target);
         createObjectStores(db);
         var versionTransaction = setVersionRequest.result;
         versionTransaction.oncomplete = function() { handler(db); };
         versionTransaction.onerror = onError;
       }
     } else {
       handler(db);
     }
   }
 }
 
 // You must close all database connections before calling this.
 function alterObjectStores(
     name, objectStoreNames, func, handler, errorHandler) {
   var version = curVersion + 1;
   var openRequest = indexedDB.open(name, version);
   openRequest.onblocked = errorHandler;
-  // TODO(ericu): This won't work in Firefox yet; see above in createDatabase.
+  openRequest.onupgradeneeded = function(ev) {
+    // This is the spec-compliant path, which doesn't yet run in Chrome, but
+    // works in Firefox.
+    doAlteration(ev.target.transaction);
+    // onsuccess will get called after this exits.
+  };
   openRequest.onsuccess = function(ev) {
     assert(openRequest == ev.target);
     var db = openRequest.result;
     db.onerror = function(ev) {
       console.log("error altering db", arguments,
           openRequest.webkitErrorMessage);
       errorHandler();
     }
     if (db.version != version) {
+      // This is the legacy path, which runs only in Chrome.
       var setVersionRequest = db.setVersion(version);
       setVersionRequest.onerror = errorHandler;
       setVersionRequest.onsuccess =
           function(e) {
             curVersion = db.version;
             assert(setVersionRequest == e.target);
             var versionTransaction = setVersionRequest.result;
             versionTransaction.oncomplete = function() { handler(db); };
             versionTransaction.onerror = onError;
-            for (var store in objectStoreNames) {
-              func(versionTransaction.objectStore(objectStoreNames[store]));
-            }
+            doAlteration(versionTransaction);
           }
     } else {
-      errorHandler();
+      handler(db);
+    }
+  }
+  function doAlteration(target) {
+    for (var store in objectStoreNames) {
+      func(target.objectStore(objectStoreNames[store]));
     }
   }
 }
 
 function getTransaction(db, objectStoreNames, mode, opt_handler) {
   var transaction = db.transaction(objectStoreNames, mode);
   transaction.onerror = onError;
   transaction.onabort = onError;
   if (opt_handler) {
     transaction.oncomplete = opt_handler;
@@ skipping 183 matching lines @@
         // outside its range.
         oos.put(cursor.value, numKeys + Math.random());
       values.push({key: cursor.key, value: cursor.value});
       cursor.continue();
     } else {
       assert(!numReadsLeft);
     }
   }
   request.onerror = onError;
 }