Bug 726378: Unprefix IndexedDB. r=sicking
authorKyle Huey <khuey@kylehuey.com>
Fri, 29 Jun 2012 09:48:35 -0700
changeset 97937 8f307e676f320f0c9985bc44634c4349aa05351e
parent 97936 6b50a5c705c26841fd7dd665f62e6736d85e589e
child 97938 027b86239bf3960dce8ad54d871fc446a0d1bb6a
push id886
push usertim.taubert@gmx.de
push dateSat, 30 Jun 2012 22:13:36 +0000
treeherderfx-team@d9d61d199b11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssicking
bugs726378
milestone16.0a1
Bug 726378: Unprefix IndexedDB. r=sicking
dom/base/IndexedDBHelper.jsm
dom/base/nsGlobalWindow.cpp
dom/file/test/helpers.js
dom/indexedDB/IndexedDatabaseManager.cpp
dom/indexedDB/crashtests/726376-1.html
dom/indexedDB/nsIIDBIndex.idl
dom/indexedDB/nsIIDBObjectStore.idl
dom/indexedDB/nsIIndexedDatabaseManager.idl
dom/indexedDB/test/bfcache_iframe1.html
dom/indexedDB/test/bfcache_iframe2.html
dom/indexedDB/test/browser_forgetThisSiteAdd.html
dom/indexedDB/test/browser_forgetThisSiteGet.html
dom/indexedDB/test/browser_permissionsPrompt.html
dom/indexedDB/test/browser_quotaPrompt.html
dom/indexedDB/test/browser_quotaPromptDatabases.html
dom/indexedDB/test/browser_quotaPromptDelete.html
dom/indexedDB/test/error_events_abort_transactions_iframe.html
dom/indexedDB/test/event_propagation_iframe.html
dom/indexedDB/test/exceptions_in_events_iframe.html
dom/indexedDB/test/leaving_page_iframe.html
dom/indexedDB/test/test_autoIncrement.html
dom/indexedDB/test/test_create_objectStore.html
dom/indexedDB/test/test_deleteDatabase_interactions.html
dom/indexedDB/test/test_file_array.html
dom/indexedDB/test/test_file_cross_database_copying.html
dom/indexedDB/test/test_file_delete.html
dom/indexedDB/test/test_file_os_delete.html
dom/indexedDB/test/test_file_put_get_object.html
dom/indexedDB/test/test_file_put_get_values.html
dom/indexedDB/test/test_file_quota.html
dom/indexedDB/test/test_file_replace.html
dom/indexedDB/test/test_file_resurrection_delete.html
dom/indexedDB/test/test_file_resurrection_transaction_abort.html
dom/indexedDB/test/test_file_sharing.html
dom/indexedDB/test/test_file_transaction_abort.html
dom/indexedDB/test/test_filehandle_quota.html
dom/indexedDB/test/test_filehandle_serialization.html
dom/indexedDB/test/test_filehandle_store_snapshot.html
dom/indexedDB/test/test_leaving_page.html
dom/indexedDB/test/test_readonly_transactions.html
dom/indexedDB/test/test_unique_index_update.html
dom/indexedDB/test/test_writer_starvation.html
dom/indexedDB/test/third_party_iframe2.html
dom/indexedDB/test/unit/test_add_put.js
dom/indexedDB/test/unit/test_add_twice_failure.js
dom/indexedDB/test/unit/test_advance.js
dom/indexedDB/test/unit/test_autoIncrement_indexes.js
dom/indexedDB/test/unit/test_clear.js
dom/indexedDB/test/unit/test_complex_keyPaths.js
dom/indexedDB/test/unit/test_count.js
dom/indexedDB/test/unit/test_create_index.js
dom/indexedDB/test/unit/test_create_index_with_integer_keys.js
dom/indexedDB/test/unit/test_create_objectStore.js
dom/indexedDB/test/unit/test_cursor_mutation.js
dom/indexedDB/test/unit/test_cursor_update_updates_indexes.js
dom/indexedDB/test/unit/test_cursors.js
dom/indexedDB/test/unit/test_deleteDatabase.js
dom/indexedDB/test/unit/test_event_source.js
dom/indexedDB/test/unit/test_getAll.js
dom/indexedDB/test/unit/test_global_data.js
dom/indexedDB/test/unit/test_index_empty_keyPath.js
dom/indexedDB/test/unit/test_index_getAll.js
dom/indexedDB/test/unit/test_index_getAllObjects.js
dom/indexedDB/test/unit/test_index_object_cursors.js
dom/indexedDB/test/unit/test_index_update_delete.js
dom/indexedDB/test/unit/test_indexes.js
dom/indexedDB/test/unit/test_indexes_bad_values.js
dom/indexedDB/test/unit/test_key_requirements.js
dom/indexedDB/test/unit/test_keys.js
dom/indexedDB/test/unit/test_multientry.js
dom/indexedDB/test/unit/test_names_sorted.js
dom/indexedDB/test/unit/test_objectCursors.js
dom/indexedDB/test/unit/test_objectStore_inline_autoincrement_key_added_on_put.js
dom/indexedDB/test/unit/test_objectStore_remove_values.js
dom/indexedDB/test/unit/test_object_identity.js
dom/indexedDB/test/unit/test_odd_result_order.js
dom/indexedDB/test/unit/test_open_empty_db.js
dom/indexedDB/test/unit/test_open_objectStore.js
dom/indexedDB/test/unit/test_optionalArguments.js
dom/indexedDB/test/unit/test_overlapping_transactions.js
dom/indexedDB/test/unit/test_put_get_values.js
dom/indexedDB/test/unit/test_put_get_values_autoIncrement.js
dom/indexedDB/test/unit/test_remove_index.js
dom/indexedDB/test/unit/test_remove_objectStore.js
dom/indexedDB/test/unit/test_request_readyState.js
dom/indexedDB/test/unit/test_setVersion.js
dom/indexedDB/test/unit/test_setVersion_abort.js
dom/indexedDB/test/unit/test_setVersion_events.js
dom/indexedDB/test/unit/test_setVersion_exclusion.js
dom/indexedDB/test/unit/test_success_events_after_abort.js
dom/indexedDB/test/unit/test_traffic_jam.js
dom/indexedDB/test/unit/test_transaction_abort.js
dom/indexedDB/test/unit/test_transaction_lifetimes.js
dom/indexedDB/test/unit/test_transaction_lifetimes_nested.js
dom/indexedDB/test/unit/test_transaction_ordering.js
dom/interfaces/storage/nsIDOMStorageIndexedDB.idl
dom/sms/src/ril/SmsDatabaseService.js
dom/sms/tests/test_smsdatabaseservice.xul
mobile/android/chrome/content/browser.js
--- a/dom/base/IndexedDBHelper.jsm
+++ b/dom/base/IndexedDBHelper.jsm
@@ -41,17 +41,17 @@ IndexedDBHelper.prototype = {
    * @param successCb
    *        Success callback to call once database is open.
    * @param failureCb
    *        Error callback to call when an error is encountered.
    */
   open: function open(aSuccessCb, aFailureCb) {
     let self = this;
     debug("Try to open database:" + self.dbName + " " + self.dbVersion);
-    let req = this.dbGlobal.mozIndexedDB.open(this.dbName, this.dbVersion);
+    let req = this.dbGlobal.indexedDB.open(this.dbName, this.dbVersion);
     req.onsuccess = function (event) {
       debug("Opened database:" + self.dbName + " " + self.dbName);
       self._db = event.target.result;
       self._db.onversionchange = function(event) {
         debug("WARNING: DB modified from a different window.");
       }
       aSuccessCb();
     };
@@ -130,17 +130,17 @@ IndexedDBHelper.prototype = {
    * 
    * @param aDBName
    *        DB name for the open call.
    * @param aDBVersion
    *        Current DB version. User has to implement upgradeSchema.
    * @param aDBStoreName
    *        ObjectStore that is used.
    * @param aGlobal
-   *        Global object that has mozIndexedDB property.
+   *        Global object that has indexedDB property.
    */
   initDBHelper: function initDBHelper(aDBName, aDBVersion, aDBStoreName, aGlobal) {
     this.dbName = aDBName;
     this.dbVersion = aDBVersion;
     this.dbStoreName = aDBStoreName;
     this.dbGlobal = aGlobal;
   }
 }
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -8239,17 +8239,17 @@ nsGlobalWindow::GetLocalStorage(nsIDOMSt
   return NS_OK;
 }
 
 //*****************************************************************************
 // nsGlobalWindow::nsIDOMStorageIndexedDB
 //*****************************************************************************
 
 NS_IMETHODIMP
-nsGlobalWindow::GetMozIndexedDB(nsIIDBFactory** _retval)
+nsGlobalWindow::GetIndexedDB(nsIIDBFactory** _retval)
 {
   if (!mIndexedDB) {
     nsresult rv;
 
     if (!IsChromeWindow()) {
       nsCOMPtr<mozIThirdPartyUtil> thirdPartyUtil =
         do_GetService(THIRDPARTYUTIL_CONTRACTID);
       NS_ENSURE_TRUE(thirdPartyUtil, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
--- a/dom/file/test/helpers.js
+++ b/dom/file/test/helpers.js
@@ -113,28 +113,28 @@ function resetUnlimitedQuota(url)
 function getFileHandle(fileStorageKey, name)
 {
   var requestService = SpecialPowers.getDOMRequestService();
   var request = requestService.createRequest(window);
 
   switch (fileStorageKey) {
     case IndexedDatabaseKey:
       var dbname = window.location.pathname;
-      mozIndexedDB.open(dbname, 1).onsuccess = function(event) {
+      indexedDB.open(dbname, 1).onsuccess = function(event) {
         var db = event.target.result;
         db.mozCreateFileHandle(name).onsuccess = function(event) {
           var fileHandle = event.target.result;
           requestService.fireSuccess(request, fileHandle);
         }
       }
       break;
 
     case DeviceStorageKey:
       var dbname = window.location.pathname;
-      mozIndexedDB.open(dbname, 1).onsuccess = function(event) {
+      indexedDB.open(dbname, 1).onsuccess = function(event) {
         var db = event.target.result;
         db.mozCreateFileHandle(name).onsuccess = function(event) {
           var fileHandle = event.target.result;
           requestService.fireSuccess(request, fileHandle);
         }
       }
       break;
   }
--- a/dom/indexedDB/IndexedDatabaseManager.cpp
+++ b/dom/indexedDB/IndexedDatabaseManager.cpp
@@ -1905,21 +1905,21 @@ IndexedDatabaseManager::InitWindowless(c
   JSObject* global = JS_GetGlobalForObject(aCx, obj);
 
   nsRefPtr<IDBFactory> factory;
   nsresult rv = IDBFactory::Create(aCx, global, getter_AddRefs(factory));
   NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
 
   NS_ASSERTION(factory, "This should never fail for chrome!");
 
-  jsval mozIndexedDBVal;
-  rv = nsContentUtils::WrapNative(aCx, obj, factory, &mozIndexedDBVal);
+  jsval indexedDBVal;
+  rv = nsContentUtils::WrapNative(aCx, obj, factory, &indexedDBVal);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  if (!JS_DefineProperty(aCx, obj, "mozIndexedDB", mozIndexedDBVal, nsnull,
+  if (!JS_DefineProperty(aCx, obj, "indexedDB", indexedDBVal, nsnull,
                          nsnull, JSPROP_ENUMERATE)) {
     return NS_ERROR_FAILURE;
   }
 
   JSObject* keyrangeObj = JS_NewObject(aCx, nsnull, nsnull, nsnull);
   NS_ENSURE_TRUE(keyrangeObj, NS_ERROR_OUT_OF_MEMORY);
 
   if (!IDBKeyRange::DefineConstructors(aCx, keyrangeObj)) {
--- a/dom/indexedDB/crashtests/726376-1.html
+++ b/dom/indexedDB/crashtests/726376-1.html
@@ -1,7 +1,7 @@
 <script>
 
 var a = [];
 a[0] = a;
-mozIndexedDB.cmp.bind(mozIndexedDB)(a, a);
+indexedDB.cmp.bind(indexedDB)(a, a);
 
 </script>
--- a/dom/indexedDB/nsIIDBIndex.idl
+++ b/dom/indexedDB/nsIIDBIndex.idl
@@ -33,25 +33,25 @@ interface nsIIDBIndex : nsISupports
   [implicit_jscontext]
   nsIIDBRequest
   get(in jsval key);
 
   [implicit_jscontext]
   nsIIDBRequest
   getKey(in jsval key);
 
-  [implicit_jscontext, optional_argc]
+  [implicit_jscontext, optional_argc, binaryname(GetAll)]
   nsIIDBRequest
-  getAll([optional /* null */] in jsval key,
-         [optional /* unlimited */] in unsigned long limit);
+  mozGetAll([optional /* null */] in jsval key,
+            [optional /* unlimited */] in unsigned long limit);
 
-  [implicit_jscontext, optional_argc]
+  [implicit_jscontext, optional_argc, binaryname(GetAllKeys)]
   nsIIDBRequest
-  getAllKeys([optional /* null */] in jsval key,
-             [optional /* unlimited */] in unsigned long limit);
+  mozGetAllKeys([optional /* null */] in jsval key,
+                [optional /* unlimited */] in unsigned long limit);
 
   // direction can be "next", "nextunique", "prev" or "prevunique"
   [implicit_jscontext, optional_argc]
   nsIIDBRequest
   openCursor([optional /* null */] in jsval key,
              [optional /* "next" */] in DOMString direction);
 
   // direction can be "next", "nextunique", "prev" or "prevunique"
--- a/dom/indexedDB/nsIIDBObjectStore.idl
+++ b/dom/indexedDB/nsIIDBObjectStore.idl
@@ -38,20 +38,20 @@ interface nsIIDBObjectStore : nsISupport
   readonly attribute boolean autoIncrement;
 
   // Success fires IDBTransactionEvent, result == value for key
   [implicit_jscontext]
   nsIIDBRequest
   get(in jsval key);
 
   // Success fires IDBTransactionEvent, result == array of values for given keys
-  [implicit_jscontext, optional_argc]
+  [implicit_jscontext, optional_argc, binaryname(GetAll)]
   nsIIDBRequest
-  getAll([optional /* null */] in jsval key,
-         [optional /* unlimited */] in unsigned long limit);
+  mozGetAll([optional /* null */] in jsval key,
+            [optional /* unlimited */] in unsigned long limit);
 
   // Success fires IDBTransactionEvent, result == key
   [implicit_jscontext, optional_argc]
   nsIIDBRequest
   add(in jsval value,
       [optional /* undefined */] in jsval key);
 
   // Success fires IDBTransactionEvent, result == key
--- a/dom/indexedDB/nsIIndexedDatabaseManager.idl
+++ b/dom/indexedDB/nsIIndexedDatabaseManager.idl
@@ -52,17 +52,17 @@ interface nsIIndexedDatabaseManager : ns
    * deleted immediately depending on prohibitive concurrent operations.
    *
    * @param aURI
    *        The URI whose databases are to be cleared.
    */
   void clearDatabasesForURI(in nsIURI aURI);
 
   /**
-   * Defines mozIndexedDB and IDBKeyrange with its static functions on 
+   * Defines indexedDB and IDBKeyrange with its static functions on 
    * aObject and initializes DOM exception providers if needed.
    *
    * @param aObject
-   *        The object, mozIndexedDB and IDBKeyrange should be defined on.
+   *        The object, indexedDB and IDBKeyrange should be defined on.
    */
   [implicit_jscontext]
   void initWindowless(in jsval aObject);
 };
--- a/dom/indexedDB/test/bfcache_iframe1.html
+++ b/dom/indexedDB/test/bfcache_iframe1.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
   <script>
-  var request = mozIndexedDB.open(parent.location, 1);
+  var request = indexedDB.open(parent.location, 1);
   request.onupgradeneeded = function(e) {
     var db = e.target.result;
     // This should never be called
     db.onversionchange = function(e) {
       db.transaction(["mystore"]).objectStore("mystore").put({ hello: "fail" }, 42);
     }
     var trans = e.target.transaction;
     if (db.objectStoreNames.contains("mystore")) {
--- a/dom/indexedDB/test/bfcache_iframe2.html
+++ b/dom/indexedDB/test/bfcache_iframe2.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
   <script>
   var res = {};
-  var request = mozIndexedDB.open(parent.location, 2);
+  var request = indexedDB.open(parent.location, 2);
   request.onblocked = function() {
     res.blockedFired = true;
   }
   request.onupgradeneeded  = function(e) {
     var db = e.target.result;
     res.version = db.version;
     res.storeCount = db.objectStoreNames.length;
 
--- a/dom/indexedDB/test/browser_forgetThisSiteAdd.html
+++ b/dom/indexedDB/test/browser_forgetThisSiteAdd.html
@@ -4,17 +4,17 @@
 -->
 <html>
   <head>
     <title>Indexed Database Test</title>
 
     <script type="text/javascript;version=1.7">
       function testSteps()
       {
-        let request = mozIndexedDB.open("browser_forgetThisSite.js", 11);
+        let request = indexedDB.open("browser_forgetThisSite.js", 11);
         request.onerror = grabEventAndContinueHandler;
         request.onupgradeneeded = grabEventAndContinueHandler;
         let event = yield;
 
         if (event.type == "error") {
           testException = event.target.error.name;
         }
         else {
--- a/dom/indexedDB/test/browser_forgetThisSiteGet.html
+++ b/dom/indexedDB/test/browser_forgetThisSiteGet.html
@@ -4,17 +4,17 @@
 -->
 <html>
   <head>
     <title>Indexed Database Test</title>
 
     <script type="text/javascript;version=1.7">
       function testSteps()
       {
-        let request = mozIndexedDB.open("browser_forgetThisSite.js");
+        let request = indexedDB.open("browser_forgetThisSite.js");
         request.onerror = grabEventAndContinueHandler;
         request.onsuccess = grabEventAndContinueHandler;
         let event = yield;
 
         if (event.type == "error") {
           testException = event.target.error.name;
         }
         else {
--- a/dom/indexedDB/test/browser_permissionsPrompt.html
+++ b/dom/indexedDB/test/browser_permissionsPrompt.html
@@ -7,17 +7,17 @@
     <title>Indexed Database Test</title>
 
     <script type="text/javascript;version=1.7">
       function testSteps()
       {
         const name = window.location.pathname;
         const description = "My Test Database";
 
-        let request = mozIndexedDB.open(name, 1, description);
+        let request = indexedDB.open(name, 1, description);
         request.onerror = grabEventAndContinueHandler;
         request.onsuccess = grabEventAndContinueHandler;
         let event = yield;
 
         if (event.type == "success") {
           testResult = event.target.result;
         }
         else {
--- a/dom/indexedDB/test/browser_quotaPrompt.html
+++ b/dom/indexedDB/test/browser_quotaPrompt.html
@@ -30,17 +30,17 @@
           objectStore.add(obj).onerror = errorHandler;
         }
       }
 
       function onDone() {
         window.removeEventListener("indexedDB-addMore", onAddMore, true);
         window.removeEventListener("indexedDB-done", onDone, true);
 
-        let request = mozIndexedDB.open(window.location.pathname, version++);
+        let request = indexedDB.open(window.location.pathname, version++);
         request.onerror = errorHandler;
         request.onupgradeneeded = function(event) {
           db.deleteObjectStore("foo");
           db.onversionchange = function () { db.close(); };
           request.transaction.oncomplete = function(event) {
             testResult = "finished";
             testException = undefined;
             finishTest();
@@ -51,17 +51,17 @@
       function testSteps()
       {
         const name = window.location.pathname;
         const description = "My Test Database";
 
         window.addEventListener("indexedDB-addMore", onAddMore, true);
         window.addEventListener("indexedDB-done", onDone, true);
 
-        let request = mozIndexedDB.open(name, version++, description);
+        let request = indexedDB.open(name, version++, description);
         request.onerror = errorHandler;
         request.onupgradeneeded = grabEventAndContinueHandler;
         let event = yield;
 
         db = event.target.result;
 
         db.onversionchange = function () { db.close(); };
 
--- a/dom/indexedDB/test/browser_quotaPromptDatabases.html
+++ b/dom/indexedDB/test/browser_quotaPromptDatabases.html
@@ -8,17 +8,17 @@
 
     <script type="text/javascript;version=1.7">
       let db;
       let i = 0;
 
       function onAddMore() {
         const name = window.location.pathname + i++;
 
-        let request = mozIndexedDB.open(name, 1);
+        let request = indexedDB.open(name, 1);
         request.onerror = errorHandler;
         request.onsuccess = grabEventAndContinueHandler;
 
         request.onsuccess = function(event) {
           setTimeout(testFinishedCallback, 0, "complete");
         }
         request.onerror = function(event) {
           setTimeout(testFinishedCallback, 0, "abort");
--- a/dom/indexedDB/test/browser_quotaPromptDelete.html
+++ b/dom/indexedDB/test/browser_quotaPromptDelete.html
@@ -39,22 +39,22 @@
         testResult = "finished";
         testException = undefined;
         finishTest();
       }
 
       function onReset() {
         db.close();
         // N.B. the spec provides no ordering guarantee w.r.t deleteDatabase.
-        let deleteRequest = mozIndexedDB.deleteDatabase(name);
+        let deleteRequest = indexedDB.deleteDatabase(name);
 
         deleteRequest.onerror = errorHandler;
         deleteRequest.onsuccess = function () {
           // It is imperative that we open a different database this time.
-          let request = mozIndexedDB.open("take2", 1);
+          let request = indexedDB.open("take2", 1);
           request.onerror = errorHandler;
           request.onupgradeneeded = function(event) {
             db = event.target.result;
             db.createObjectStore("foo", { autoIncrement: true });
           }
           request.onsuccess = function ()
             { setTimeout(testFinishedCallback, 0, "resetDone"); };
           request.onblocked = errorHandler;
@@ -62,17 +62,17 @@
       }
 
       function testSteps()
       {
         window.addEventListener("indexedDB-addMore", onAddMore, true);
         window.addEventListener("indexedDB-reset", onReset, true);
         window.addEventListener("indexedDB-done", onDone, true);
 
-        let request = mozIndexedDB.open(name, 1);
+        let request = indexedDB.open(name, 1);
         request.onerror = errorHandler;
         request.onupgradeneeded = grabEventAndContinueHandler;
         let event = yield;
 
         db = event.target.result;
 
         db.onversionchange = function () { db.close(); };
 
--- a/dom/indexedDB/test/error_events_abort_transactions_iframe.html
+++ b/dom/indexedDB/test/error_events_abort_transactions_iframe.html
@@ -46,17 +46,17 @@
 
     window.onerror = function(message, filename, lineno) {
       is(message, "ConstraintError", "Expect a constraint error");
     };
 
     function testSteps() {
       window.parent.SpecialPowers.addPermission("indexedDB", true, document);
 
-      let request = mozIndexedDB.open(window.location.pathname, 1);
+      let request = indexedDB.open(window.location.pathname, 1);
       request.onsuccess = unexpectedSuccessHandler;
       request.onerror = grabEventAndContinueHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       let event = yield;
 
       let db = event.target.result;
 
       is(db.version, 1, "Correct version");
@@ -93,17 +93,17 @@
       is(originalRequest.transaction, trans, "request.transaction should still be set");
 
       event = yield;
       is(event.type, "error", "Got request error event");
       is(event.target, originalRequest, "error event has right target");
       is(event.target.error.name, "ConstraintError", "Right error");
       is(originalRequest.transaction, null, "request.transaction should now be null");
 
-      let request = mozIndexedDB.open(window.location.pathname, 1);
+      let request = indexedDB.open(window.location.pathname, 1);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       let event = yield;
 
       let db = event.target.result;
 
       event.target.transaction.oncomplete = grabEventAndContinueHandler;
       event.target.transaction.onabort = unexpectedSuccessHandler;
@@ -150,17 +150,17 @@
 
       is(db.version, "1", "Correct version");
       is(db.objectStoreNames.length, 2, "Correct objectStoreNames length");
       ok(db.objectStoreNames.contains("foo"), "Has correct objectStore");
       ok(db.objectStoreNames.contains("bar"), "Has correct objectStore");
 
       db.close();
 
-      let request = mozIndexedDB.open(window.location.pathname, 2);
+      let request = indexedDB.open(window.location.pathname, 2);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       let event = yield;
 
       let db = event.target.result;
 
       let trans = event.target.transaction;
       trans.oncomplete = unexpectedSuccessHandler;
--- a/dom/indexedDB/test/event_propagation_iframe.html
+++ b/dom/indexedDB/test/event_propagation_iframe.html
@@ -84,17 +84,17 @@
           finishTest();
         }
       }
     }
 
     function testSteps() {
       window.parent.SpecialPowers.addPermission("indexedDB", true, document);
 
-      let request = mozIndexedDB.open(window.location.pathname, 1);
+      let request = indexedDB.open(window.location.pathname, 1);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       let event = yield;
 
       let db = event.target.result;
       db.onerror = errorEventCounter;
       db.addEventListener("error", errorEventCounter, true);
 
--- a/dom/indexedDB/test/exceptions_in_events_iframe.html
+++ b/dom/indexedDB/test/exceptions_in_events_iframe.html
@@ -50,17 +50,17 @@
       return false;
     };
 
     function testSteps() {
       window.parent.SpecialPowers.addPermission("indexedDB", true, document);
 
       // Test 1: Throwing an exception in an upgradeneeded handler should
       // abort the versionchange transaction and fire an error at the request.
-      let request = mozIndexedDB.open(window.location.pathname, 1);
+      let request = indexedDB.open(window.location.pathname, 1);
       request.onerror = errorHandler;
       request.onsuccess = unexpectedSuccessHandler;
       request.onupgradeneeded = function () {
         let transaction = request.transaction;
         transaction.oncomplete = unexpectedSuccessHandler;
         transaction.onabort = grabEventAndContinueHandler
         throw "STOP";
       };
@@ -73,17 +73,17 @@
       request.onerror = grabEventAndContinueHandler;
       event = yield;
 
       is(event.type, "error",
          "Throwing during an upgradeneeded event should fire an error.");
 
       // Test 2: Throwing during a request's success handler should abort the
       // transaction.
-      let request = mozIndexedDB.open(window.location.pathname, 1);
+      let request = indexedDB.open(window.location.pathname, 1);
       request.onerror = errorHandler;
       request.onblocked = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       request.onsuccess = unexpectedSuccessHandler;
       let openrequest = request;
       let event = yield;
 
       request.onupgradeneeded = unexpectedSuccessHandler;
@@ -118,17 +118,17 @@
       event = yield;
 
       is(event.type, "error", "Got IDBOpenDBRequest error event");
       is(event.target, openrequest, "Right event target");
       is(event.target.error.name, "AbortError", "Right error name");
 
       // Test 3: Throwing during a request's error handler should abort the
       // transaction, even if preventDefault is called on the error event.
-      let request = mozIndexedDB.open(window.location.pathname, 1);
+      let request = indexedDB.open(window.location.pathname, 1);
       request.onerror = errorHandler;
       request.onblocked = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       request.onsuccess = unexpectedSuccessHandler;
       let openrequest = request;
       let event = yield;
 
       request.onupgradeneeded = unexpectedSuccessHandler;
--- a/dom/indexedDB/test/leaving_page_iframe.html
+++ b/dom/indexedDB/test/leaving_page_iframe.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
   <script>
 var db;
 function startDBWork() {
-  mozIndexedDB.open(parent.location, 1).onupgradeneeded = function(e) {
+  indexedDB.open(parent.location, 1).onupgradeneeded = function(e) {
     db = e.target.result;
     var trans = e.target.transaction;
     if (db.objectStoreNames.contains("mystore")) {
       db.deleteObjectStore("mystore");
     }
     var store = db.createObjectStore("mystore");
     store.add({ hello: "world" }, 42);
     e.target.onsuccess = madeMod;
--- a/dom/indexedDB/test/test_autoIncrement.html
+++ b/dom/indexedDB/test/test_autoIncrement.html
@@ -31,17 +31,17 @@
 
     function testSteps()
     {
       const dbname = window.location.pathname;
       const RW = IDBTransaction.READ_WRITE
       let c1 = 1;
       let c2 = 1;
 
-      let openRequest = mozIndexedDB.open(dbname, 1);
+      let openRequest = indexedDB.open(dbname, 1);
       openRequest.onerror = errorHandler;
       openRequest.onupgradeneeded = grabEventAndContinueHandler;
       openRequest.onsuccess = unexpectedSuccessHandler;
       let event = yield;
       let db = event.target.result;
       let trans = event.target.transaction;
 
       // Create test stores
@@ -367,17 +367,17 @@
         grabEventAndContinueHandler;
       trans.objectStore("store2").clear().onsuccess =
         grabEventAndContinueHandler;
       yield; yield;
       db.close();
 
       SpecialPowers.gc();
 
-      openRequest = mozIndexedDB.open(dbname, 2);
+      openRequest = indexedDB.open(dbname, 2);
       openRequest.onerror = errorHandler;
       openRequest.onupgradeneeded = grabEventAndContinueHandler;
       openRequest.onsuccess = unexpectedSuccessHandler;
       event = yield;
       db = event.target.result;
       trans = event.target.transaction;
 
       trans.objectStore("store1").add({ reopen: 1 }).onsuccess =
--- a/dom/indexedDB/test/test_create_objectStore.html
+++ b/dom/indexedDB/test/test_create_objectStore.html
@@ -26,17 +26,17 @@
         { name: "9", options: { autoIncrement: false } },
         { name: "10", options: { keyPath: "foo", autoIncrement: false } },
         { name: "11", options: { keyPath: "foo", autoIncrement: true } },
         { name: "" },
         { name: null },
         { name: undefined }
       ];
 
-      let request = mozIndexedDB.open(name, 1, description);
+      let request = indexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       let event = yield;
 
       let db = event.target.result;
 
       let count = db.objectStoreNames.length;
       is(count, 0, "correct objectStoreNames length");
--- a/dom/indexedDB/test/test_deleteDatabase_interactions.html
+++ b/dom/indexedDB/test/test_deleteDatabase_interactions.html
@@ -10,17 +10,17 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <script type="text/javascript;version=1.7">
 
   function testSteps()
   {
     const name = window.location.pathname;
 
-    let request = mozIndexedDB.open(name, 10);
+    let request = indexedDB.open(name, 10);
     request.onerror = errorHandler;
     request.onsuccess = unexpectedSuccessHandler;
     request.onupgradeneeded = grabEventAndContinueHandler;
 
     ok(request instanceof IDBOpenDBRequest, "Expect an IDBOpenDBRequest");
 
     let event = yield;
 
@@ -36,24 +36,24 @@
 
     is(event.type, "success", "Expect a success event");
     is(event.target, request, "Event has right target");
     ok(event.target.result instanceof IDBDatabase, "Result should be a database");
     is(db.objectStoreNames.length, 1, "Expect an objectStore here");
 
     db.close();
 
-    let request = mozIndexedDB.deleteDatabase(name);
+    let request = indexedDB.deleteDatabase(name);
 
     request.onerror = errorHandler;
     request.onsuccess = grabEventAndContinueHandler;
 
     ok(request instanceof IDBOpenDBRequest, "Expect an IDBOpenDBRequest");
 
-    let openRequest = mozIndexedDB.open(name, 1);
+    let openRequest = indexedDB.open(name, 1);
     openRequest.onerror = errorHandler;
     openRequest.onsuccess = unexpectedSuccessHandler;
 
     event = yield;
     is(event.type, "success", "expect a success event");
     is(event.target, request, "event has right target");
     is(event.target.result, null, "event should have no result");
 
--- a/dom/indexedDB/test/test_file_array.html
+++ b/dom/indexedDB/test/test_file_array.html
@@ -30,17 +30,17 @@
       { key: 1, blobs: [ b1, b1, b1, b1, b1, b1, b1, b1, b1, b1 ],
         expectedFileIds: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1] },
       { key: 2, blobs: [ b2[0], b2[1], b2[2], b2[3], b2[4], b2[5], b2[6] ],
         expectedFileIds: [2, 3, 4, 5, 6, 7, 8] },
       { key: 3, blobs: [ b3[0], b3[0], b3[1], b3[2], b3[2], b3[0], b3[0] ],
         expectedFileIds: [9, 9, 10, 11, 11, 9, 9] }
     ];
 
-    let request = mozIndexedDB.open(name, 1, description);
+    let request = indexedDB.open(name, 1, description);
     request.onerror = errorHandler;
     request.onupgradeneeded = grabEventAndContinueHandler;
     request.onsuccess = grabEventAndContinueHandler;
     let event = yield;
 
     is(event.type, "upgradeneeded", "Got correct event type");
 
     let db = event.target.result;
--- a/dom/indexedDB/test/test_file_cross_database_copying.html
+++ b/dom/indexedDB/test/test_file_cross_database_copying.html
@@ -20,17 +20,17 @@
     ];
 
     const objectStoreName = "Blobs";
 
     const fileData = { key: 1, file: getRandomFile("random.bin", 100000) };
 
     let databases = [];
     for each (let info in databaseInfo) {
-      let request = mozIndexedDB.open(info.name, 1, info.description);
+      let request = indexedDB.open(info.name, 1, info.description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       is(event.type, "upgradeneeded", "Got correct event type");
 
       let db = event.target.result;
--- a/dom/indexedDB/test/test_file_delete.html
+++ b/dom/indexedDB/test/test_file_delete.html
@@ -19,17 +19,17 @@
 
     const objectStoreName = "Blobs";
 
     const fileData1 = { key: 1, file: getRandomFile("random1.bin", 110000) };
     const fileData2 = { key: 2, file: getRandomFile("random2.bin", 120000) };
     const fileData3 = { key: 3, file: getRandomFile("random3.bin", 130000) };
 
     {
-      let request = mozIndexedDB.open(name, 1, description);
+      let request = indexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       is(event.type, "upgradeneeded", "Got correct event type");
 
       let db = event.target.result;
@@ -62,17 +62,17 @@
     scheduleGC();
     yield;
 
     ok(!hasFileInfo(name, 1), "Correct ref count");
     ok(hasFileInfo(name, 2), "Correct ref count");
     ok(hasFileInfo(name, 3), "Correct ref count");
 
     {
-      let request = mozIndexedDB.open(name, 1, description);
+      let request = indexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       is(event.type, "success", "Got correct event type");
 
       let db = event.target.result;
       db.onerror = errorHandler;
--- a/dom/indexedDB/test/test_file_os_delete.html
+++ b/dom/indexedDB/test/test_file_os_delete.html
@@ -20,17 +20,17 @@
     const objectStoreName = "Blobs";
 
     getUsage(grabFileUsageAndContinueHandler);
     let startUsage = yield;
 
     const fileData = { key: 1, file: getRandomFile("random.bin", 100000) };
 
     {
-      let request = mozIndexedDB.open(name, 1, description);
+      let request = indexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       is(event.type, "upgradeneeded", "Got correct event type");
 
       let db = event.target.result;
--- a/dom/indexedDB/test/test_file_put_get_object.html
+++ b/dom/indexedDB/test/test_file_put_get_object.html
@@ -20,17 +20,17 @@
     const objectStoreName = "Blobs";
 
     const blob = getRandomBlob(1000);
     const file = getRandomFile("random.bin", 100000);
 
     const objectData1 = { key: 1, object: { foo: blob, bar: blob } };
     const objectData2 = { key: 2, object: { foo: file, bar: file } };
 
-    let request = mozIndexedDB.open(name, 1, description);
+    let request = indexedDB.open(name, 1, description);
     request.onerror = errorHandler;
     request.onupgradeneeded = grabEventAndContinueHandler;
     request.onsuccess = grabEventAndContinueHandler;
     let event = yield;
 
     is(event.type, "upgradeneeded", "Got correct event type");
 
     let db = event.target.result;
--- a/dom/indexedDB/test/test_file_put_get_values.html
+++ b/dom/indexedDB/test/test_file_put_get_values.html
@@ -17,17 +17,17 @@
     const name = window.location.pathname;
     const description = "My Test Database";
 
     const objectStoreName = "Blobs";
 
     const blobData = { key: 1, blob: getRandomBlob(10000) };
     const fileData = { key: 2, file: getRandomFile("random.bin", 100000) };
 
-    let request = mozIndexedDB.open(name, 1, description);
+    let request = indexedDB.open(name, 1, description);
     request.onerror = errorHandler;
     request.onupgradeneeded = grabEventAndContinueHandler;
     request.onsuccess = grabEventAndContinueHandler;
     let event = yield;
 
     is(event.type, "upgradeneeded", "Got correct event type");
 
     let db = event.target.result;
--- a/dom/indexedDB/test/test_file_quota.html
+++ b/dom/indexedDB/test/test_file_quota.html
@@ -18,17 +18,17 @@
     const name = window.location.pathname;
     const description = "My Test Database";
 
     const objectStoreName = "Blobs";
 
     const testData = { key: 0, value: {} };
     const fileData = { key: 1, file: null };
 
-    let request = mozIndexedDB.open(name, 1, description);
+    let request = indexedDB.open(name, 1, description);
     request.onerror = errorHandler;
     request.onupgradeneeded = grabEventAndContinueHandler;
     request.onsuccess = grabEventAndContinueHandler;
     let event = yield;
 
     is(event.type, "upgradeneeded", "Got correct event type");
 
     let db = event.target.result;
--- a/dom/indexedDB/test/test_file_replace.html
+++ b/dom/indexedDB/test/test_file_replace.html
@@ -18,17 +18,17 @@
     const objectStoreName = "Blobs";
 
     const blobData = { key: 42, blobs: [] };
 
     for (let i = 0; i < 100; i++) {
       blobData.blobs[i] = getRandomBlob(i);
     }
 
-    let request = mozIndexedDB.open(name, 1, description);
+    let request = indexedDB.open(name, 1, description);
     request.onerror = errorHandler;
     request.onupgradeneeded = grabEventAndContinueHandler;
     request.onsuccess = grabEventAndContinueHandler;
     let event = yield;
 
     is(event.type, "upgradeneeded", "Got correct event type");
 
     let db = event.target.result;
--- a/dom/indexedDB/test/test_file_resurrection_delete.html
+++ b/dom/indexedDB/test/test_file_resurrection_delete.html
@@ -17,17 +17,17 @@
     const name = window.location.pathname;
     const description = "My Test Database";
 
     const objectStoreName = "Blobs";
 
     const fileData = { key: 1, file: getRandomFile("random.bin", 100000) };
 
     {
-      let request = mozIndexedDB.open(name, 1, description);
+      let request = indexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       is(event.type, "upgradeneeded", "Got correct event type");
 
       let db = event.target.result;
@@ -67,17 +67,17 @@
     }
 
     scheduleGC();
     yield;
 
     is(getFileRefCount(name, 1), 0, "Correct ref count");
 
     {
-      let request = mozIndexedDB.open(name, 1, description);
+      let request = indexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       is(event.type, "success", "Got correct event type");
 
       let db = event.target.result;
       db.onerror = errorHandler;
--- a/dom/indexedDB/test/test_file_resurrection_transaction_abort.html
+++ b/dom/indexedDB/test/test_file_resurrection_transaction_abort.html
@@ -17,17 +17,17 @@
     const name = window.location.pathname;
     const description = "My Test Database";
 
     const objectStoreName = "Blobs";
 
     const fileData = { key: 1, file: getRandomFile("random.bin", 100000) };
 
     {
-      let request = mozIndexedDB.open(name, 1, description);
+      let request = indexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       is(event.type, "upgradeneeded", "Got correct event type");
 
       let db = event.target.result;
--- a/dom/indexedDB/test/test_file_sharing.html
+++ b/dom/indexedDB/test/test_file_sharing.html
@@ -19,17 +19,17 @@
 
     const objectStoreInfo = [
       { name: "Blobs", options: { } },
       { name: "Other Blobs", options: { } }
     ];
 
     const fileData = { key: 1, file: getRandomFile("random.bin", 100000) };
 
-    let request = mozIndexedDB.open(name, 1, description);
+    let request = indexedDB.open(name, 1, description);
     request.onerror = errorHandler;
     request.onupgradeneeded = grabEventAndContinueHandler;
     request.onsuccess = grabEventAndContinueHandler;
     let event = yield;
 
     is(event.type, "upgradeneeded", "Got correct event type");
 
     let db = event.target.result;
--- a/dom/indexedDB/test/test_file_transaction_abort.html
+++ b/dom/indexedDB/test/test_file_transaction_abort.html
@@ -17,17 +17,17 @@
     const name = window.location.pathname;
     const description = "My Test Database";
 
     const objectStoreName = "Blobs";
 
     const fileData = { key: 1, file: getRandomFile("random.bin", 100000) };
 
     {
-      let request = mozIndexedDB.open(name, 1, description);
+      let request = indexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       is(event.type, "upgradeneeded", "Got correct event type");
 
       let db = event.target.result;
--- a/dom/indexedDB/test/test_filehandle_quota.html
+++ b/dom/indexedDB/test/test_filehandle_quota.html
@@ -13,17 +13,17 @@
   function testSteps()
   {
     const READ_WRITE = IDBTransaction.READ_WRITE;
     const DEFAULT_QUOTA_MB = 50;
 
     const name = window.location.pathname;
     const description = "My Test Database";
 
-    let request = mozIndexedDB.open(name, 1, description);
+    let request = indexedDB.open(name, 1, description);
     request.onerror = errorHandler;
     request.onupgradeneeded = grabEventAndContinueHandler;
     request.onsuccess = grabEventAndContinueHandler;
     let event = yield;
 
     is(event.type, "upgradeneeded", "Got correct event type");
 
     let db = event.target.result;
--- a/dom/indexedDB/test/test_filehandle_serialization.html
+++ b/dom/indexedDB/test/test_filehandle_serialization.html
@@ -20,17 +20,17 @@
     ];
 
     const objectStoreName = "Blobs";
 
     const testFile = getRandomFile("random.bin", 100000);
 
     let databases = [];
     for each (let info in databaseInfo) {
-      let request = mozIndexedDB.open(info.name, 1, info.description);
+      let request = indexedDB.open(info.name, 1, info.description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       is(event.type, "upgradeneeded", "Got correct event type");
 
       let db = event.target.result;
--- a/dom/indexedDB/test/test_filehandle_store_snapshot.html
+++ b/dom/indexedDB/test/test_filehandle_store_snapshot.html
@@ -16,17 +16,17 @@
 
     const name = window.location.pathname;
     const description = "My Test Database";
 
     const objectStoreName = "Blobs";
 
     const testFile = getRandomFile("random.bin", 100000);
 
-    let request = mozIndexedDB.open(name, 1, description);
+    let request = indexedDB.open(name, 1, description);
     request.onerror = errorHandler;
     request.onupgradeneeded = grabEventAndContinueHandler;
     request.onsuccess = grabEventAndContinueHandler;
     let event = yield;
 
     is(event.type, "upgradeneeded", "Got correct event type");
 
     let db = event.target.result;
--- a/dom/indexedDB/test/test_leaving_page.html
+++ b/dom/indexedDB/test/test_leaving_page.html
@@ -33,17 +33,17 @@
       iframe.onload = continueToNextStep;
       yield;
       is(iframe.contentWindow.location.href, $("a").href,
          "should navigate to iframe page");
       yield;
       is(iframe.contentWindow.location.href, "about:blank",
          "should nagivate to about:blank");
          
-      let request = mozIndexedDB.open(location, 1);
+      let request = indexedDB.open(location, 1);
       request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       let db = event.target.result;
       db.transaction(["mystore"]).objectStore("mystore").get(42).onsuccess =
         grabEventAndContinueHandler;
       event = yield;
       is(event.target.result.hello, "world", "second modification rolled back");
--- a/dom/indexedDB/test/test_readonly_transactions.html
+++ b/dom/indexedDB/test/test_readonly_transactions.html
@@ -11,17 +11,17 @@
 
   <script type="text/javascript;version=1.7">
     function testSteps()
     {
       const name = window.location.pathname;
       const description = "My Test Database";
       const osName = "foo";
 
-      let request = mozIndexedDB.open(name, 1, description);
+      let request = indexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       let db = event.target.result;
       is(db.objectStoreNames.length, 0, "Correct objectStoreNames list");
 
--- a/dom/indexedDB/test/test_unique_index_update.html
+++ b/dom/indexedDB/test/test_unique_index_update.html
@@ -7,17 +7,17 @@
   <title>Indexed Database Property Test</title>
 
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <script type="text/javascript;version=1.7">
     function testSteps()
     {
-      let request = mozIndexedDB.open(window.location.pathname, 1);
+      let request = indexedDB.open(window.location.pathname, 1);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       request.onsuccess = grabEventAndContinueHandler;
 
       let event = yield;
 
       let db = event.target.result;
 
--- a/dom/indexedDB/test/test_writer_starvation.html
+++ b/dom/indexedDB/test/test_writer_starvation.html
@@ -12,17 +12,17 @@
   <script type="text/javascript;version=1.7">
     function testSteps()
     {
       const name = window.location.pathname;
 
       // Needs to be enough to saturate the thread pool.
       const SYNC_REQUEST_COUNT = 25;
 
-      let request = mozIndexedDB.open(name, 1);
+      let request = indexedDB.open(name, 1);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       let db = event.target.result;
       db.onerror = errorHandler;
 
--- a/dom/indexedDB/test/third_party_iframe2.html
+++ b/dom/indexedDB/test/third_party_iframe2.html
@@ -10,17 +10,17 @@
     function report(result) {
       let message = { source: "iframe" };
       message.result = result;
       window.parent.postMessage(message.toSource(), "*");
     }
 
     function runIndexedDBTest() {
       try {
-        let request = mozIndexedDB.open(window.location.pathname, 1);
+        let request = indexedDB.open(window.location.pathname, 1);
         request.onsuccess = function(event) {
           report(!!(event.target.result instanceof IDBDatabase));
         }
       }
       catch (e) {
         report(false);
       }
     }
--- a/dom/indexedDB/test/unit/test_add_put.js
+++ b/dom/indexedDB/test/unit/test_add_put.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
-  let openRequest = mozIndexedDB.open(name, 1);
+  let openRequest = indexedDB.open(name, 1);
   openRequest.onerror = errorHandler;
   openRequest.onupgradeneeded = grabEventAndContinueHandler;
   openRequest.onsuccess = unexpectedSuccessHandler;
   let event = yield;
   let db = event.target.result;
   let trans = event.target.transaction;
 
   for each (let autoincrement in [true, false]) {
--- a/dom/indexedDB/test/unit/test_add_twice_failure.js
+++ b/dom/indexedDB/test/unit/test_add_twice_failure.js
@@ -5,17 +5,17 @@
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = request.result;
 
   ok(event.target === request, "Good event target");
 
--- a/dom/indexedDB/test/unit/test_advance.js
+++ b/dom/indexedDB/test/unit/test_advance.js
@@ -4,17 +4,17 @@
  */
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const dataCount = 30;
 
-  let request = mozIndexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
+  let request = indexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
   db.onerror = errorHandler;
 
   event.target.onsuccess = continueToNextStep;
--- a/dom/indexedDB/test/unit/test_autoIncrement_indexes.js
+++ b/dom/indexedDB/test/unit/test_autoIncrement_indexes.js
@@ -2,17 +2,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
-  let request = mozIndexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
+  let request = indexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = request.result;
   db.onerror = errorHandler;
 
   let objectStore = db.createObjectStore("foo", { keyPath: "id",
--- a/dom/indexedDB/test/unit/test_clear.js
+++ b/dom/indexedDB/test/unit/test_clear.js
@@ -6,17 +6,17 @@
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
   const entryCount = 1000;
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = request.result;
 
   event.target.onsuccess = continueToNextStep;
 
--- a/dom/indexedDB/test/unit/test_complex_keyPaths.js
+++ b/dom/indexedDB/test/unit/test_complex_keyPaths.js
@@ -61,17 +61,17 @@ function testSteps()
     { keyPath: ["x", "y"],            value: { x: null, y: 1 } },
     { keyPath: ["x", "y.bar"],        value: { x: null, y: { bar: "x"} } },
     { keyPath: ["x", "y"],            value: { x: 1, y: false } },
     { keyPath: ["x", "y", "z"],       value: { x: 1, y: false, z: "a" } },
     { keyPath: [".x", "y", "z"],      exception: true },
     { keyPath: ["x", "y ", "z"],      exception: true },
   ];
 
-  let openRequest = mozIndexedDB.open(name, 1);
+  let openRequest = indexedDB.open(name, 1);
   openRequest.onerror = errorHandler;
   openRequest.onupgradeneeded = grabEventAndContinueHandler;
   openRequest.onsuccess = unexpectedSuccessHandler;
   let event = yield;
   let db = event.target.result;
 
   let stores = {};
 
@@ -114,17 +114,17 @@ function testSteps()
 
     request.onerror = errorHandler;
     request.onsuccess = grabEventAndContinueHandler;
 
     let e = yield;
     is(e.type, "success", "inserted successfully" + test);
     is(e.target, request, "expected target" + test);
     ok(compareKeys(request.result, info.key), "found correct key" + test);
-    is(mozIndexedDB.cmp(request.result, info.key), 0, "returned key compares correctly" + test);
+    is(indexedDB.cmp(request.result, info.key), 0, "returned key compares correctly" + test);
 
     store.get(info.key).onsuccess = grabEventAndContinueHandler;
     e = yield;
     isnot(e.target.result, undefined, "Did find entry");
 
     // Check that cursor.update work as expected
     request = store.openCursor();
     request.onerror = errorHandler;
--- a/dom/indexedDB/test/unit/test_count.js
+++ b/dom/indexedDB/test/unit/test_count.js
@@ -24,17 +24,17 @@ function testSteps()
   const indexData = {
     name: "weight",
     keyPath: "weight",
     options: { unique: false }
   };
 
   const weightSort = [1, 0, 3, 7, 4, 2];
 
-  let request = mozIndexedDB.open(name, 1);
+  let request = indexedDB.open(name, 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   request.onsuccess = grabEventAndContinueHandler;
   let event = yield;
 
   is(event.type, "upgradeneeded", "Got correct event type");
 
   let db = event.target.result;
--- a/dom/indexedDB/test/unit/test_create_index.js
+++ b/dom/indexedDB/test/unit/test_create_index.js
@@ -16,17 +16,17 @@ function testSteps()
     { name: "1", keyPath: "unique_value", options: { unique: true } },
     { name: "2", keyPath: "value", options: { unique: false } },
     { name: "3", keyPath: "value", options: { unique: false } },
     { name: "", keyPath: "value", options: { unique: false } },
     { name: null, keyPath: "value", options: { unique: false } },
     { name: undefined, keyPath: "value", options: { unique: false } },
   ];
 
-  let request = mozIndexedDB.open(name, 1);
+  let request = indexedDB.open(name, 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   request.onsuccess = unexpectedSuccessHandler;
   let event = yield;
   let db = event.target.result;
 
   for (let i = 0; i < objectStoreInfo.length; i++) {
     let info = objectStoreInfo[i];
--- a/dom/indexedDB/test/unit/test_create_index_with_integer_keys.js
+++ b/dom/indexedDB/test/unit/test_create_index_with_integer_keys.js
@@ -5,33 +5,33 @@
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const data = { id: new Date().getTime(),
                  num: parseInt(Math.random() * 1000) };
 
-  let request = mozIndexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
+  let request = indexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
   db.onerror = errorHandler;
 
   event.target.onsuccess = continueToNextStep;
 
   // Make object store, add data.
   let objectStore = db.createObjectStore("foo", { keyPath: "id" });
   objectStore.add(data);
   yield;
   db.close();
 
-  let request = mozIndexedDB.open(this.window ? window.location.pathname : "Splendid Test", 2);
+  let request = indexedDB.open(this.window ? window.location.pathname : "Splendid Test", 2);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db2 = event.target.result;
   db2.onerror = errorHandler;
 
   event.target.onsuccess = continueToNextStep;
--- a/dom/indexedDB/test/unit/test_create_objectStore.js
+++ b/dom/indexedDB/test/unit/test_create_objectStore.js
@@ -20,17 +20,17 @@ function testSteps()
     { name: "9", options: { autoIncrement: false } },
     { name: "10", options: { keyPath: "foo", autoIncrement: false } },
     { name: "11", options: { keyPath: "foo", autoIncrement: true } },
     { name: "" },
     { name: null },
     { name: undefined }
   ];
 
-  let request = mozIndexedDB.open(name, 1);
+  let request = indexedDB.open(name, 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   request.onsuccess = unexpectedSuccessHandler;
   let event = yield;
 
   let db = event.target.result;
 
   let count = db.objectStoreNames.length;
--- a/dom/indexedDB/test/unit/test_cursor_mutation.js
+++ b/dom/indexedDB/test/unit/test_cursor_mutation.js
@@ -19,17 +19,17 @@ function testSteps()
 
     // This one will be added.
     { ss: "237-23-7737", name: "Pat" }
   ];
 
   // Post-add and post-remove data ordered by name.
   const objectStoreDataNameSort = [ 1, 4, 5, 2, 3 ];
 
-  let request = mozIndexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
+  let request = indexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
   event.target.onsuccess = continueToNextStep;
 
   let objectStore = db.createObjectStore("foo", { keyPath: "ss" });
--- a/dom/indexedDB/test/unit/test_cursor_update_updates_indexes.js
+++ b/dom/indexedDB/test/unit/test_cursor_update_updates_indexes.js
@@ -22,17 +22,17 @@ function testSteps()
       entry: { data: START_DATA } },
   ];
 
   for (let i = 0; i < objectStoreInfo.length; i++) {
     // Create our object stores.
     let info = objectStoreInfo[i];
 
     ok(true, "1");
-    request = mozIndexedDB.open(name, i + 1, description);
+    request = indexedDB.open(name, i + 1, description);
     request.onerror = errorHandler;
     request.onupgradeneeded = grabEventAndContinueHandler;
     event = yield;
 
     let db = event.target.result;
 
     ok(true, "2");
     let objectStore = info.hasOwnProperty("options") ?
--- a/dom/indexedDB/test/unit/test_cursors.js
+++ b/dom/indexedDB/test/unit/test_cursors.js
@@ -9,17 +9,17 @@ function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
   const keys = [1, -1, 0, 10, 2000, "q", "z", "two", "b", "a"];
   const sortedKeys = [-1, 0, 1, 10, 2000, "a", "b", "q", "two", "z"];
 
   is(keys.length, sortedKeys.length, "Good key setup");
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
 
   let objectStore = db.createObjectStore("autoIncrement",
                                          { autoIncrement: true });
--- a/dom/indexedDB/test/unit/test_deleteDatabase.js
+++ b/dom/indexedDB/test/unit/test_deleteDatabase.js
@@ -4,19 +4,19 @@
  */
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
 
-  ok(mozIndexedDB.deleteDatabase, "deleteDatabase function should exist!");
+  ok(indexedDB.deleteDatabase, "deleteDatabase function should exist!");
 
-  let request = mozIndexedDB.open(name, 10);
+  let request = indexedDB.open(name, 10);
   request.onerror = errorHandler;
   request.onsuccess = unexpectedSuccessHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
 
   ok(request instanceof IDBOpenDBRequest, "Expect an IDBOpenDBRequest");
 
   let event = yield;
 
@@ -30,17 +30,17 @@ function testSteps()
 
   event = yield;
 
   is(event.type, "success", "Expect a success event");
   is(event.target, request, "Event has right target");
   ok(event.target.result instanceof IDBDatabase, "Result should be a database");
   is(db.objectStoreNames.length, 1, "Expect an objectStore here");
 
-  let request = mozIndexedDB.open(name, 10);
+  let request = indexedDB.open(name, 10);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
 
   event = yield;
   is(event.type, "success", "Expect a success event");
   is(event.target, request, "Event has right target");
   ok(event.target.result instanceof IDBDatabase, "Result should be a database");
   let db2 = event.target.result;
@@ -61,45 +61,45 @@ function testSteps()
     db2.onversionchange = unexpectedSuccessHandler;
   };
 
   // The IDB spec doesn't guarantee the order that onversionchange will fire
   // on the dbs.
   db.onversionchange = closeDBs;
   db2.onversionchange = closeDBs;
 
-  let request = mozIndexedDB.deleteDatabase(name);
+  let request = indexedDB.deleteDatabase(name);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
 
   ok(request instanceof IDBOpenDBRequest, "Expect an IDBOpenDBRequest");
 
   event = yield;
   ok(onversionchangecalled, "Expected versionchange events");
   is(event.type, "success", "expect a success event");
   is(event.target, request, "event has right target");
   ok(event.target.result === undefined, "event should have no result");
 
-  let request = mozIndexedDB.open(name, 1);
+  let request = indexedDB.open(name, 1);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
 
   event = yield;
   is(event.target.result.version, 1, "DB has proper version");
   is(event.target.result.objectStoreNames.length, 0, "DB should have no object stores");
 
 
-  let request = mozIndexedDB.deleteDatabase("thisDatabaseHadBetterNotExist");
+  let request = indexedDB.deleteDatabase("thisDatabaseHadBetterNotExist");
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
 
   event = yield;
   ok(true, "deleteDatabase on a non-existent database succeeded");
 
-  let request = mozIndexedDB.open("thisDatabaseHadBetterNotExist");
+  let request = indexedDB.open("thisDatabaseHadBetterNotExist");
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
 
   event = yield;
   ok(true, "after deleting a non-existent database, open should work");
 
   finishTest();
   yield;
--- a/dom/indexedDB/test/unit/test_event_source.js
+++ b/dom/indexedDB/test/unit/test_event_source.js
@@ -6,17 +6,17 @@
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
   const objectStoreName = "Objects";
 
-  var request = mozIndexedDB.open(name, 1, description);
+  var request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   var event = yield;
 
   is(event.target.source, null, "correct event.target.source");
 
   var db = event.target.result;
   var objectStore = db.createObjectStore(objectStoreName,
--- a/dom/indexedDB/test/unit/test_getAll.js
+++ b/dom/indexedDB/test/unit/test_getAll.js
@@ -7,27 +7,27 @@ var testGenerator = testSteps();
 
 function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
 
   const values = [ "a", "1", 1, "foo", 300, true, false, 4.5, null ];
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
 
   let objectStore = db.createObjectStore("foo", { autoIncrement: true });
 
   request.onsuccess = grabEventAndContinueHandler;
-  request = objectStore.getAll();
+  request = objectStore.mozGetAll();
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 0, "No elements");
 
   let addedCount = 0;
@@ -39,93 +39,93 @@ function testSteps()
       if (++addedCount == values.length) {
         executeSoon(function() { testGenerator.next(); });
       }
     }
   }
   yield;
   yield;
 
-  request = db.transaction("foo").objectStore("foo").getAll();
+  request = db.transaction("foo").objectStore("foo").mozGetAll();
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, values.length, "Same length");
 
   for (let i in event.target.result) {
     is(event.target.result[i], values[i], "Same value");
   }
 
-  request = db.transaction("foo").objectStore("foo").getAll(null, 5);
+  request = db.transaction("foo").objectStore("foo").mozGetAll(null, 5);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 5, "Correct length");
 
   for (let i in event.target.result) {
     is(event.target.result[i], values[i], "Same value");
   }
 
   let keyRange = IDBKeyRange.bound(1, 9);
 
-  request = db.transaction("foo").objectStore("foo").getAll(keyRange);
+  request = db.transaction("foo").objectStore("foo").mozGetAll(keyRange);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, values.length, "Correct length");
 
   for (let i in event.target.result) {
     is(event.target.result[i], values[i], "Same value");
   }
 
-  request = db.transaction("foo").objectStore("foo").getAll(keyRange, 0);
+  request = db.transaction("foo").objectStore("foo").mozGetAll(keyRange, 0);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, values.length, "Correct length");
 
   for (let i in event.target.result) {
     is(event.target.result[i], values[i], "Same value");
   }
 
-  request = db.transaction("foo").objectStore("foo").getAll(keyRange, null);
+  request = db.transaction("foo").objectStore("foo").mozGetAll(keyRange, null);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, values.length, "Correct length");
 
   for (let i in event.target.result) {
     is(event.target.result[i], values[i], "Same value");
   }
 
-  request = db.transaction("foo").objectStore("foo").getAll(keyRange, undefined);
+  request = db.transaction("foo").objectStore("foo").mozGetAll(keyRange, undefined);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, values.length, "Correct length");
 
   for (let i in event.target.result) {
     is(event.target.result[i], values[i], "Same value");
   }
 
   keyRange = IDBKeyRange.bound(4, 7);
 
-  request = db.transaction("foo").objectStore("foo").getAll(keyRange);
+  request = db.transaction("foo").objectStore("foo").mozGetAll(keyRange);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 4, "Correct length");
 
   for (let i in event.target.result) {
@@ -136,55 +136,55 @@ function testSteps()
   request = db.transaction("foo").objectStore("foo").get(keyRange);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, false, "Not an array object");
   is(event.target.result, values[3], "Correct value");
 
-  request = db.transaction("foo").objectStore("foo").getAll(keyRange, 2);
+  request = db.transaction("foo").objectStore("foo").mozGetAll(keyRange, 2);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 2, "Correct length");
 
   for (let i in event.target.result) {
     is(event.target.result[i], values[parseInt(i) + 3], "Same value");
   }
 
   keyRange = IDBKeyRange.bound(4, 7);
 
-  request = db.transaction("foo").objectStore("foo").getAll(keyRange, 50);
+  request = db.transaction("foo").objectStore("foo").mozGetAll(keyRange, 50);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 4, "Correct length");
 
   for (let i in event.target.result) {
     is(event.target.result[i], values[parseInt(i) + 3], "Same value");
   }
 
   keyRange = IDBKeyRange.bound(4, 7);
 
-  request = db.transaction("foo").objectStore("foo").getAll(keyRange, 0);
+  request = db.transaction("foo").objectStore("foo").mozGetAll(keyRange, 0);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 4, "Correct length");
 
   keyRange = IDBKeyRange.bound(4, 7, true, true);
 
-  request = db.transaction("foo").objectStore("foo").getAll(keyRange);
+  request = db.transaction("foo").objectStore("foo").mozGetAll(keyRange);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 2, "Correct length");
 
   for (let i in event.target.result) {
--- a/dom/indexedDB/test/unit/test_global_data.js
+++ b/dom/indexedDB/test/unit/test_global_data.js
@@ -7,31 +7,31 @@ var testGenerator = testSteps();
 
 function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
   const objectStore =  { name: "Objects",
                          options: { keyPath: "id", autoIncrement: true } };
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db1 = event.target.result;
 
   is(db1.objectStoreNames.length, 0, "No objectStores in db1");
 
   db1.createObjectStore(objectStore.name, objectStore.options);
 
   continueToNextStep();
   yield;
 
-  request = mozIndexedDB.open(name, 1, description);
+  request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   let db2 = event.target.result;
 
   ok(db1 !== db2, "Databases are not the same object");
 
--- a/dom/indexedDB/test/unit/test_index_empty_keyPath.js
+++ b/dom/indexedDB/test/unit/test_index_empty_keyPath.js
@@ -10,17 +10,17 @@ function testSteps()
   const name = this.window ? window.location.pathname : "Splendid Test";
 
   const objectStoreData = [
     { key: "1", value: "foo" },
     { key: "2", value: "bar" },
     { key: "3", value: "baz" }
   ];
 
-  let request = mozIndexedDB.open(name, 1);
+  let request = indexedDB.open(name, 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   request.onsuccess = grabEventAndContinueHandler;
   let event = yield; // upgradeneeded
 
   let db = event.target.result;
 
   let objectStore = db.createObjectStore("data", { keyPath: null });
--- a/dom/indexedDB/test/unit/test_index_getAll.js
+++ b/dom/indexedDB/test/unit/test_index_getAll.js
@@ -47,17 +47,17 @@ function testSteps()
     { key: "237-23-7733", value: { name: "Ann", height: 52, weight: 110 } },
     { key: "237-23-7735", value: { name: "Sue", height: 58, weight: 130 } },
     { key: "237-23-7732", value: { name: "Bob", height: 60, weight: 120 } },
     { key: "237-23-7736", value: { name: "Joe", height: 65, weight: 150 } },
     { key: "237-23-7737", value: { name: "Pat", height: 65 } },
     { key: "237-23-7734", value: { name: "Ron", height: 73, weight: 180 } }
   ];
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   request.onsuccess = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
 
   let objectStore = db.createObjectStore(objectStoreName);
@@ -85,100 +85,100 @@ function testSteps()
 
   is(objectStore.indexNames.length, indexData.length, "Good index count");
   yield;
 
   ok(true, "2");
   objectStore = db.transaction(objectStoreName)
                   .objectStore(objectStoreName);
 
-  request = objectStore.index("height").getAllKeys(65);
+  request = objectStore.index("height").mozGetAllKeys(65);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
   ok(true, "3");
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 2, "Correct length");
 
   for (let i in event.target.result) {
     is(event.target.result[i], objectStoreDataHeightSort[parseInt(i) + 3].key,
        "Correct key");
   }
 
-  request = objectStore.index("height").getAllKeys(65, 0);
+  request = objectStore.index("height").mozGetAllKeys(65, 0);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
   ok(true, "3");
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 2, "Correct length");
 
   for (let i in event.target.result) {
     is(event.target.result[i], objectStoreDataHeightSort[parseInt(i) + 3].key,
        "Correct key");
   }
 
-  request = objectStore.index("height").getAllKeys(65, null);
+  request = objectStore.index("height").mozGetAllKeys(65, null);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
   ok(true, "3");
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 2, "Correct length");
 
   for (let i in event.target.result) {
     is(event.target.result[i], objectStoreDataHeightSort[parseInt(i) + 3].key,
        "Correct key");
   }
 
-  request = objectStore.index("height").getAllKeys(65, undefined);
+  request = objectStore.index("height").mozGetAllKeys(65, undefined);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
   ok(true, "3");
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 2, "Correct length");
 
   for (let i in event.target.result) {
     is(event.target.result[i], objectStoreDataHeightSort[parseInt(i) + 3].key,
        "Correct key");
   }
 
-  request = objectStore.index("height").getAllKeys();
+  request = objectStore.index("height").mozGetAllKeys();
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
   ok(true, "4");
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, objectStoreDataHeightSort.length,
      "Correct length");
 
   for (let i in event.target.result) {
     is(event.target.result[i], objectStoreDataHeightSort[i].key, "Correct key");
   }
 
-  request = objectStore.index("height").getAllKeys(null, 4);
+  request = objectStore.index("height").mozGetAllKeys(null, 4);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   ok(true, "5");
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 4, "Correct length");
 
   for (let i in event.target.result) {
     is(event.target.result[i], objectStoreDataHeightSort[i].key, "Correct key");
   }
 
-  request = objectStore.index("height").getAllKeys(65, 1);
+  request = objectStore.index("height").mozGetAllKeys(65, 1);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   ok(true, "6");
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 1, "Correct length");
 
--- a/dom/indexedDB/test/unit/test_index_getAllObjects.js
+++ b/dom/indexedDB/test/unit/test_index_getAllObjects.js
@@ -47,17 +47,17 @@ function testSteps()
     { key: "237-23-7733", value: { name: "Ann", height: 52, weight: 110 } },
     { key: "237-23-7735", value: { name: "Sue", height: 58, weight: 130 } },
     { key: "237-23-7732", value: { name: "Bob", height: 60, weight: 120 } },
     { key: "237-23-7736", value: { name: "Joe", height: 65, weight: 150 } },
     { key: "237-23-7737", value: { name: "Pat", height: 65 } },
     { key: "237-23-7734", value: { name: "Ron", height: 73, weight: 180 } }
   ];
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   request.onsuccess = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
 
   let objectStore = db.createObjectStore(objectStoreName, {});
@@ -83,17 +83,17 @@ function testSteps()
   }
 
   is(objectStore.indexNames.length, indexData.length, "Good index count");
   yield;
 
   objectStore = db.transaction(objectStoreName)
                   .objectStore(objectStoreName);
 
-  request = objectStore.index("height").getAll(65);
+  request = objectStore.index("height").mozGetAll(65);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 2, "Correct length");
 
   for (let i in event.target.result) {
@@ -103,17 +103,17 @@ function testSteps()
     is(result.name, testObj.name, "Correct name");
     is(result.height, testObj.height, "Correct height");
 
     if (testObj.hasOwnProperty("weight")) {
       is(result.weight, testObj.weight, "Correct weight");
     }
   }
 
-  request = objectStore.index("height").getAll(65, 0);
+  request = objectStore.index("height").mozGetAll(65, 0);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 2, "Correct length");
 
   for (let i in event.target.result) {
@@ -123,17 +123,17 @@ function testSteps()
     is(result.name, testObj.name, "Correct name");
     is(result.height, testObj.height, "Correct height");
 
     if (testObj.hasOwnProperty("weight")) {
       is(result.weight, testObj.weight, "Correct weight");
     }
   }
 
-  request = objectStore.index("height").getAll(65, null);
+  request = objectStore.index("height").mozGetAll(65, null);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 2, "Correct length");
 
   for (let i in event.target.result) {
@@ -143,17 +143,17 @@ function testSteps()
     is(result.name, testObj.name, "Correct name");
     is(result.height, testObj.height, "Correct height");
 
     if (testObj.hasOwnProperty("weight")) {
       is(result.weight, testObj.weight, "Correct weight");
     }
   }
 
-  request = objectStore.index("height").getAll(65, undefined);
+  request = objectStore.index("height").mozGetAll(65, undefined);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 2, "Correct length");
 
   for (let i in event.target.result) {
@@ -163,17 +163,17 @@ function testSteps()
     is(result.name, testObj.name, "Correct name");
     is(result.height, testObj.height, "Correct height");
 
     if (testObj.hasOwnProperty("weight")) {
       is(result.weight, testObj.weight, "Correct weight");
     }
   }
 
-  request = objectStore.index("height").getAll();
+  request = objectStore.index("height").mozGetAll();
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, objectStoreDataHeightSort.length,
      "Correct length");
 
@@ -184,17 +184,17 @@ function testSteps()
     is(result.name, testObj.name, "Correct name");
     is(result.height, testObj.height, "Correct height");
 
     if (testObj.hasOwnProperty("weight")) {
       is(result.weight, testObj.weight, "Correct weight");
     }
   }
 
-  request = objectStore.index("height").getAll(null, 4);
+  request = objectStore.index("height").mozGetAll(null, 4);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 4, "Correct length");
 
   for (let i in event.target.result) {
@@ -204,17 +204,17 @@ function testSteps()
     is(result.name, testObj.name, "Correct name");
     is(result.height, testObj.height, "Correct height");
 
     if (testObj.hasOwnProperty("weight")) {
       is(result.weight, testObj.weight, "Correct weight");
     }
   }
 
-  request = objectStore.index("height").getAll(65, 1);
+  request = objectStore.index("height").mozGetAll(65, 1);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array object");
   is(event.target.result.length, 1, "Correct length");
 
   for (let i in event.target.result) {
--- a/dom/indexedDB/test/unit/test_index_object_cursors.js
+++ b/dom/indexedDB/test/unit/test_index_object_cursors.js
@@ -19,17 +19,17 @@ function testSteps()
     { name: null, keyPath: "height", options: { } }
   ];
 
   const data = [
     { ss: "237-23-7732", name: "Ann", height: 60 },
     { ss: "237-23-7733", name: "Bob", height: 65 }
   ];
 
-  let request = mozIndexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
+  let request = indexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
   db.onerror = errorHandler;
 
   event.target.onsuccess = continueToNextStep;
--- a/dom/indexedDB/test/unit/test_index_update_delete.js
+++ b/dom/indexedDB/test/unit/test_index_update_delete.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
   let name = this.window ? window.location.pathname : "Splendid Test";
-  let request = mozIndexedDB.open(name, 1);
+  let request = indexedDB.open(name, 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   request.onsuccess = grabEventAndContinueHandler;
 
   let event = yield;
 
   let db = event.target.result;
   db.onerror = errorHandler;
--- a/dom/indexedDB/test/unit/test_indexes.js
+++ b/dom/indexedDB/test/unit/test_indexes.js
@@ -48,17 +48,17 @@ function testSteps()
     { key: "237-23-7733", value: { name: "Ann", height: 52, weight: 110 } },
     { key: "237-23-7735", value: { name: "Sue", height: 58, weight: 130 } },
     { key: "237-23-7732", value: { name: "Bob", height: 60, weight: 120 } },
     { key: "237-23-7736", value: { name: "Joe", height: 65, weight: 150 } },
     { key: "237-23-7737", value: { name: "Pat", height: 65 } },
     { key: "237-23-7734", value: { name: "Ron", height: 73, weight: 180 } }
   ];
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   request.onsuccess = grabEventAndContinueHandler;
   let event = yield;
   let db = event.target.result;
 
   let objectStore = db.createObjectStore(objectStoreName, { keyPath: null });
 
--- a/dom/indexedDB/test/unit/test_indexes_bad_values.js
+++ b/dom/indexedDB/test/unit/test_indexes_bad_values.js
@@ -34,17 +34,17 @@ function testSteps()
   const objectStoreDataWeightSort = [
     { key: "237-23-7733", value: { name: "Ann", height: 52, weight: 110 } },
     { key: "237-23-7732", value: { name: "Bob", height: 60, weight: 120 } },
     { key: "237-23-7735", value: { name: "Sue", height: 58, weight: 130 } },
     { key: "237-23-7736", value: { name: "Joe", height: 65, weight: 150 } },
     { key: "237-23-7734", value: { name: "Ron", height: 73, weight: 180 } }
   ];
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   request.onsuccess = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
 
   let objectStore = db.createObjectStore(objectStoreName, { } );
--- a/dom/indexedDB/test/unit/test_key_requirements.js
+++ b/dom/indexedDB/test/unit/test_key_requirements.js
@@ -5,17 +5,17 @@
 
 var testGenerator = testSteps(); 
 
 function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
   db.addEventListener("error", function(event) {
     event.preventDefault();
   }, false);
--- a/dom/indexedDB/test/unit/test_keys.js
+++ b/dom/indexedDB/test/unit/test_keys.js
@@ -7,17 +7,17 @@ var testGenerator = testSteps();
 
 function testSteps()
 {
   const dbname = this.window ? window.location.pathname : "Splendid Test";
   const RW = "readwrite"
   let c1 = 1;
   let c2 = 1;
 
-  let openRequest = mozIndexedDB.open(dbname, 1);
+  let openRequest = indexedDB.open(dbname, 1);
   openRequest.onerror = errorHandler;
   openRequest.onupgradeneeded = grabEventAndContinueHandler;
   openRequest.onsuccess = unexpectedSuccessHandler;
   let event = yield;
   let db = event.target.result;
   let trans = event.target.transaction;
 
   // Create test stores
@@ -150,28 +150,28 @@ function testSteps()
     [[[]], [[1]]],
     [[[]], [[[]]]],
     [[[1]]],
     [[[[]], []]],
     ];
 
   for (var i = 0; i < keys.length; ++i) {
     let keyI = keys[i];
-    is(mozIndexedDB.cmp(keyI, keyI), 0, i + " compared to self");
+    is(indexedDB.cmp(keyI, keyI), 0, i + " compared to self");
 
     function doCompare(keyI) {
       for (var j = i-1; j >= i-10 && j >= 0; --j) {
-        is(mozIndexedDB.cmp(keyI, keys[j]), 1, i + " compared to " + j);
-        is(mozIndexedDB.cmp(keys[j], keyI), -1, j + " compared to " + i);
+        is(indexedDB.cmp(keyI, keys[j]), 1, i + " compared to " + j);
+        is(indexedDB.cmp(keys[j], keyI), -1, j + " compared to " + i);
       }
     }
     
     doCompare(keyI);
     store.add(i, keyI).onsuccess = function(e) {
-      is(mozIndexedDB.cmp(e.target.result, keyI), 0,
+      is(indexedDB.cmp(e.target.result, keyI), 0,
          "Returned key should cmp as equal");
       ok(compareKeys(e.target.result, keyI),
          "Returned key should actually be equal");
     };
     
     // Test that -0 compares the same as 0
     if (keyI === 0) {
       doCompare(-0);
@@ -188,17 +188,17 @@ function testSteps()
       yield;
     }
   }
 
   store.openCursor().onsuccess = grabEventAndContinueHandler;
   for (i = 0; i < keys.length; ++i) {
     event = yield;
     let cursor = event.target.result;
-    is(mozIndexedDB.cmp(cursor.key, keys[i]), 0,
+    is(indexedDB.cmp(cursor.key, keys[i]), 0,
        "Read back key should cmp as equal");
     ok(compareKeys(cursor.key, keys[i]),
        "Read back key should actually be equal");
     is(cursor.value, i, "Stored with right value");
 
     cursor.continue();
   }
   event = yield;
@@ -228,26 +228,26 @@ function testSteps()
     [1, [undefined]],
     [1, [null]],
     [1, [/x/]],
     [1, [{}]],
     ];
   
   for (i = 0; i < invalidKeys.length; ++i) {
     try {
-      mozIndexedDB.cmp(invalidKeys[i], 1);
+      indexedDB.cmp(invalidKeys[i], 1);
       ok(false, "didn't throw");
     }
     catch(ex) {
       ok(ex instanceof DOMException, "Threw DOMException");
       is(ex.name, "DataError", "Threw right DOMException");
       is(ex.code, 0, "Threw with right code");
     }
     try {
-      mozIndexedDB.cmp(1, invalidKeys[i]);
+      indexedDB.cmp(1, invalidKeys[i]);
       ok(false, "didn't throw2");
     }
     catch(ex) {
       ok(ex instanceof DOMException, "Threw DOMException2");
       is(ex.name, "DataError", "Threw right DOMException2");
       is(ex.code, 0, "Threw with right code2");
     }
     try {
--- a/dom/indexedDB/test/unit/test_multientry.js
+++ b/dom/indexedDB/test/unit/test_multientry.js
@@ -5,17 +5,17 @@
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
   // Test object stores
   
   let name = this.window ? window.location.pathname : "Splendid Test";
-  let openRequest = mozIndexedDB.open(name, 1);
+  let openRequest = indexedDB.open(name, 1);
   openRequest.onerror = errorHandler;
   openRequest.onupgradeneeded = grabEventAndContinueHandler;
   openRequest.onsuccess = unexpectedSuccessHandler;
   let event = yield;
   let db = event.target.result;
   db.onerror = errorHandler;
   let tests =
     [{ add:     { x: 1, id: 1 },
--- a/dom/indexedDB/test/unit/test_names_sorted.js
+++ b/dom/indexedDB/test/unit/test_names_sorted.js
@@ -12,17 +12,17 @@ function testSteps()
     { name: "foo", options: { keyPath: "id" }, location: 1 },
     { name: "bar", options: { keyPath: "id" }, location: 0 },
   ];
   const indexInfo = [
     { name: "foo", keyPath: "value", location: 1 },
     { name: "bar", keyPath: "value", location: 0 },
   ];
 
-  let request = mozIndexedDB.open(name, 1);
+  let request = indexedDB.open(name, 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   request.onsuccess = unexpectedSuccessHandler;
   let event = yield;
   let db = event.target.result;
 
   for (let i = 0; i < objectStoreInfo.length; i++) {
     let info = objectStoreInfo[i];
@@ -69,17 +69,17 @@ function testSteps()
     let info = objectStoreInfo[i];
   
     is(trans.objectStoreNames[info.location], info.name,
        "Got objectStore name in the right location");
   }
 
   db.close();
 
-  let request = mozIndexedDB.open(name, 1);
+  let request = indexedDB.open(name, 1);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   request.onupgradeneeded = unexpectedSuccessHandler;
   let event = yield;
 
   let db = event.target.result;
 
   let objectStoreNames = []
--- a/dom/indexedDB/test/unit/test_objectCursors.js
+++ b/dom/indexedDB/test/unit/test_objectCursors.js
@@ -17,17 +17,17 @@ function testSteps()
 
   const indexes = [
     { name: "a", options: { } },
     { name: "b", options: { unique: true } }
   ];
 
   var j = 0;
   for (let i in objectStores) {
-    let request = mozIndexedDB.open(name, ++j, description);
+    let request = indexedDB.open(name, ++j, description);
     request.onerror = errorHandler;
     request.onupgradeneeded = grabEventAndContinueHandler;
     let event = yield;
 
     let db = event.target.result;
 
     let objectStore =
       db.createObjectStore(objectStores[i].name,
@@ -50,17 +50,17 @@ function testSteps()
 
     ok(event.target.result == 1 || event.target.result == 2, "Good id");
     db.close();
   }
 
   executeSoon(function() { testGenerator.next(); });
   yield;
 
-  let request = mozIndexedDB.open(name, j, description);
+  let request = indexedDB.open(name, j, description);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
 
   for (let i in objectStores) {
     for (let j in indexes) {
--- a/dom/indexedDB/test/unit/test_objectStore_inline_autoincrement_key_added_on_put.js
+++ b/dom/indexedDB/test/unit/test_objectStore_inline_autoincrement_key_added_on_put.js
@@ -6,17 +6,17 @@
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const IDBObjectStore = Components.interfaces.nsIIDBObjectStore;
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
 
-  var request = mozIndexedDB.open(name, 1, description);
+  var request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   var event = yield;
 
   var db = event.target.result;
 
   var test = {
     name: "inline key; key generator",
--- a/dom/indexedDB/test/unit/test_objectStore_remove_values.js
+++ b/dom/indexedDB/test/unit/test_objectStore_remove_values.js
@@ -36,17 +36,17 @@ function testSteps()
       keyName: null,
       keyValue: 1,
     }
   ];
 
   for (let i = 0; i < data.length; i++) {
     let test = data[i];
 
-    let request = mozIndexedDB.open(name, i+1, description);
+    let request = indexedDB.open(name, i+1, description);
     request.onerror = errorHandler;
     request.onupgradeneeded = grabEventAndContinueHandler;
     let event = yield;
 
     let db = event.target.result;
 
     let objectStore = db.createObjectStore(test.name,
                                            { keyPath: test.keyName,
--- a/dom/indexedDB/test/unit/test_object_identity.js
+++ b/dom/indexedDB/test/unit/test_object_identity.js
@@ -2,17 +2,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
-  let request = mozIndexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
+  let request = indexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
   let transaction = event.target.transaction;
 
   let objectStore1 = db.createObjectStore("foo");
--- a/dom/indexedDB/test/unit/test_odd_result_order.js
+++ b/dom/indexedDB/test/unit/test_odd_result_order.js
@@ -4,17 +4,17 @@
  */
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const data = { key: 5, index: 10 };
 
-  let request = mozIndexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
+  let request = indexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
 
   ok(db instanceof IDBDatabase, "Got a real database");
 
--- a/dom/indexedDB/test/unit/test_open_empty_db.js
+++ b/dom/indexedDB/test/unit/test_open_empty_db.js
@@ -12,17 +12,17 @@ function testSteps()
     null,
     undefined,
     this.window ? window.location.pathname : "Splendid Test"
   ];
 
   const version = 1;
 
   for each (let name in names) {
-    let request = mozIndexedDB.open(name, version);
+    let request = indexedDB.open(name, version);
     request.onerror = errorHandler;
     request.onsuccess = grabEventAndContinueHandler;
     let event = yield;
 
     if (name === null) {
       name = "null";
     }
     else if (name === undefined) {
--- a/dom/indexedDB/test/unit/test_open_objectStore.js
+++ b/dom/indexedDB/test/unit/test_open_objectStore.js
@@ -7,17 +7,17 @@ var testGenerator = testSteps();
 
 function testSteps()
 {
   const nsIIDBObjectStore = Components.interfaces.nsIIDBObjectStore;
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
   const objectStoreName = "Objects";
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   request.onsuccess = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
   is(db.objectStoreNames.length, 0, "Bad objectStores list");
 
--- a/dom/indexedDB/test/unit/test_optionalArguments.js
+++ b/dom/indexedDB/test/unit/test_optionalArguments.js
@@ -18,17 +18,17 @@ function testSteps()
     { ssn: "237-23-7736", name: "Joe", height: 65, weight: 150 },
     { ssn: "237-23-7737", name: "Pat", height: 65 },
     { ssn: "237-23-7738", name: "Mel", height: 66, weight: {} },
     { ssn: "237-23-7739", name: "Tom", height: 62, weight: 130 }
   ];
 
   const weightSort = [1, 0, 3, 7, 4, 2];
 
-  let request = mozIndexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
+  let request = indexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   request.onsuccess = grabEventAndContinueHandler;
   let event = yield;
 
   is(event.type, "upgradeneeded", "Got upgradeneeded event");
 
   let db = event.target.result;
@@ -1557,150 +1557,150 @@ function testSteps()
       testGenerator.next();
     }
   }
   yield;
 
   is(count, 1,
      "Correct count for only keyRange arg to index.openKeyCursor");
 
-  objectStore.getAll(data[1].ssn).onsuccess = grabEventAndContinueHandler;
+  objectStore.mozGetAll(data[1].ssn).onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array");
   is(event.target.result.length, 1, "Got correct length");
   is(event.target.result[0].ssn, data[1].ssn, "Got correct result");
 
-  objectStore.getAll(null).onsuccess = grabEventAndContinueHandler;
+  objectStore.mozGetAll(null).onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array");
   is(event.target.result.length, data.length, "Got correct length");
   for (let i in event.target.result) {
     is(event.target.result[i].ssn, data[i].ssn, "Got correct value");
   }
 
-  objectStore.getAll(undefined).onsuccess = grabEventAndContinueHandler;
+  objectStore.mozGetAll(undefined).onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array");
   is(event.target.result.length, data.length, "Got correct length");
   for (let i in event.target.result) {
     is(event.target.result[i].ssn, data[i].ssn, "Got correct value");
   }
 
-  objectStore.getAll().onsuccess = grabEventAndContinueHandler;
+  objectStore.mozGetAll().onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array");
   is(event.target.result.length, data.length, "Got correct length");
   for (let i in event.target.result) {
     is(event.target.result[i].ssn, data[i].ssn, "Got correct value");
   }
 
   keyRange = IDBKeyRange.lowerBound(0);
 
-  objectStore.getAll(keyRange).onsuccess = grabEventAndContinueHandler;
+  objectStore.mozGetAll(keyRange).onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array");
   is(event.target.result.length, data.length, "Got correct length");
   for (let i in event.target.result) {
     is(event.target.result[i].ssn, data[i].ssn, "Got correct value");
   }
 
-  index.getAll().onsuccess = grabEventAndContinueHandler;
+  index.mozGetAll().onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array");
   is(event.target.result.length, weightSort.length, "Got correct length");
   for (let i in event.target.result) {
     is(event.target.result[i].ssn, data[weightSort[i]].ssn,
        "Got correct value");
   }
 
-  index.getAll(undefined).onsuccess = grabEventAndContinueHandler;
+  index.mozGetAll(undefined).onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array");
   is(event.target.result.length, weightSort.length, "Got correct length");
   for (let i in event.target.result) {
     is(event.target.result[i].ssn, data[weightSort[i]].ssn,
        "Got correct value");
   }
 
-  index.getAll(null).onsuccess = grabEventAndContinueHandler;
+  index.mozGetAll(null).onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array");
   is(event.target.result.length, weightSort.length, "Got correct length");
   for (let i in event.target.result) {
     is(event.target.result[i].ssn, data[weightSort[i]].ssn,
        "Got correct value");
   }
 
-  index.getAll(data[weightSort[0]].weight).onsuccess = grabEventAndContinueHandler;
+  index.mozGetAll(data[weightSort[0]].weight).onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array");
   is(event.target.result.length, 1, "Got correct length");
   is(event.target.result[0].ssn, data[weightSort[0]].ssn, "Got correct result");
 
   keyRange = IDBKeyRange.lowerBound(0);
 
-  index.getAll(keyRange).onsuccess = grabEventAndContinueHandler;
+  index.mozGetAll(keyRange).onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array");
   is(event.target.result.length, weightSort.length, "Got correct length");
   for (let i in event.target.result) {
     is(event.target.result[i].ssn, data[weightSort[i]].ssn,
        "Got correct value");
   }
 
-  index.getAllKeys().onsuccess = grabEventAndContinueHandler;
+  index.mozGetAllKeys().onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array");
   is(event.target.result.length, weightSort.length, "Got correct length");
   for (let i in event.target.result) {
     is(event.target.result[i], data[weightSort[i]].ssn,
        "Got correct value");
   }
 
-  index.getAllKeys(undefined).onsuccess = grabEventAndContinueHandler;
+  index.mozGetAllKeys(undefined).onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array");
   is(event.target.result.length, weightSort.length, "Got correct length");
   for (let i in event.target.result) {
     is(event.target.result[i], data[weightSort[i]].ssn,
        "Got correct value");
   }
 
-  index.getAllKeys(null).onsuccess = grabEventAndContinueHandler;
+  index.mozGetAllKeys(null).onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array");
   is(event.target.result.length, weightSort.length, "Got correct length");
   for (let i in event.target.result) {
     is(event.target.result[i], data[weightSort[i]].ssn,
        "Got correct value");
   }
 
-  index.getAllKeys(data[weightSort[0]].weight).onsuccess = grabEventAndContinueHandler;
+  index.mozGetAllKeys(data[weightSort[0]].weight).onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array");
   is(event.target.result.length, 1, "Got correct length");
   is(event.target.result[0], data[weightSort[0]].ssn, "Got correct result");
 
   keyRange = IDBKeyRange.lowerBound(0);
 
-  index.getAllKeys(keyRange).onsuccess = grabEventAndContinueHandler;
+  index.mozGetAllKeys(keyRange).onsuccess = grabEventAndContinueHandler;
   event = yield;
 
   is(event.target.result instanceof Array, true, "Got an array");
   is(event.target.result.length, weightSort.length, "Got correct length");
   for (let i in event.target.result) {
     is(event.target.result[i], data[weightSort[i]].ssn,
        "Got correct value");
   }
--- a/dom/indexedDB/test/unit/test_overlapping_transactions.js
+++ b/dom/indexedDB/test/unit/test_overlapping_transactions.js
@@ -6,17 +6,17 @@
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
   const objectStores = [ "foo", "bar" ];
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
   is(db.objectStoreNames.length, 0, "Correct objectStoreNames list");
 
   event.target.onsuccess = grabEventAndContinueHandler;
--- a/dom/indexedDB/test/unit/test_put_get_values.js
+++ b/dom/indexedDB/test/unit/test_put_get_values.js
@@ -9,17 +9,17 @@ function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
   const objectStoreName = "Objects";
 
   let testString = { key: 0, value: "testString" };
   let testInt = { key: 1, value: 1002 };
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
 
   let objectStore = db.createObjectStore(objectStoreName,
                                          { autoIncrement: 0 });
--- a/dom/indexedDB/test/unit/test_put_get_values_autoIncrement.js
+++ b/dom/indexedDB/test/unit/test_put_get_values_autoIncrement.js
@@ -9,17 +9,17 @@ function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
   const objectStoreName = "Objects";
 
   let testString = { value: "testString" };
   let testInt = { value: 1002 };
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
 
   let objectStore = db.createObjectStore(objectStoreName,
                                          { autoIncrement: 1 });
--- a/dom/indexedDB/test/unit/test_remove_index.js
+++ b/dom/indexedDB/test/unit/test_remove_index.js
@@ -8,17 +8,17 @@ var testGenerator = testSteps();
 function testSteps()
 {
   const nsIIDBObjectStore = Components.interfaces.nsIIDBObjectStore;
 
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
   const indexName = "My Test Index";
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
   is(db.objectStoreNames.length, 0, "Correct objectStoreNames list");
 
   let objectStore = db.createObjectStore("test store", { keyPath: "foo" });
--- a/dom/indexedDB/test/unit/test_remove_objectStore.js
+++ b/dom/indexedDB/test/unit/test_remove_objectStore.js
@@ -8,17 +8,17 @@ var testGenerator = testSteps();
 function testSteps()
 {
   const nsIIDBObjectStore = Components.interfaces.nsIIDBObjectStore;
 
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
   const objectStoreName = "Objects";
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
   is(db.objectStoreNames.length, 0, "Correct objectStoreNames list");
 
   let objectStore = db.createObjectStore(objectStoreName,
@@ -37,17 +37,17 @@ function testSteps()
   }
   yield;
 
   is(db.objectStoreNames.length, 1, "Correct objectStoreNames list");
   is(db.objectStoreNames.item(0), objectStoreName, "Correct name");
 
   db.close();
 
-  let request = mozIndexedDB.open(name, 2, description);
+  let request = indexedDB.open(name, 2, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
   let trans = event.target.transaction;
 
   let oldObjectStore = trans.objectStore(objectStoreName);
@@ -81,17 +81,17 @@ function testSteps()
   db.deleteObjectStore(objectStore.name);
   is(db.objectStoreNames.length, 0, "Correct objectStores list");
 
   continueToNextStep();
   yield;
 
   db.close();
 
-  let request = mozIndexedDB.open(name, 3, description);
+  let request = indexedDB.open(name, 3, description);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
 
   objectStore = db.createObjectStore(objectStoreName, { keyPath: "foo" });
 
--- a/dom/indexedDB/test/unit/test_request_readyState.js
+++ b/dom/indexedDB/test/unit/test_request_readyState.js
@@ -5,17 +5,17 @@
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   is(request.readyState, "pending", "Correct readyState");
 
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   is(request.readyState, "done", "Correct readyState");
 
--- a/dom/indexedDB/test/unit/test_setVersion.js
+++ b/dom/indexedDB/test/unit/test_setVersion.js
@@ -5,17 +5,17 @@
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
 
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
 
   // Check default state.
   is(db.version, 1, "Correct default version for a new database.");
@@ -25,17 +25,17 @@ function testSteps()
     42,
   ];
 
   db.close();
 
   for (let i = 0; i < versions.length; i++) {
     let version = versions[i];
 
-    let request = mozIndexedDB.open(name, version, description);
+    let request = indexedDB.open(name, version, description);
     request.onerror = errorHandler;
     request.onupgradeneeded = grabEventAndContinueHandler;
     let event = yield;
 
     let db = event.target.result;
 
     is(db.version, version, "Database version number updated correctly");
     is(event.target.transaction.mode, "versionchange", "Correct mode");
--- a/dom/indexedDB/test/unit/test_setVersion_abort.js
+++ b/dom/indexedDB/test/unit/test_setVersion_abort.js
@@ -4,17 +4,17 @@
  */
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
 
-  let request = mozIndexedDB.open(name, 1);
+  let request = indexedDB.open(name, 1);
   request.onerror = errorHandler;
   request.onsuccess = unexpectedSuccessHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
 
   let objectStore = db.createObjectStore("foo");
@@ -58,17 +58,17 @@ function testSteps()
   event = yield;
 
   is(event.type, "error", "Got request error event");
   is(event.target, request, "Right target");
   is(event.target.transaction, null, "No transaction");
 
   event.preventDefault();
 
-  request = mozIndexedDB.open(name, 1);
+  request = indexedDB.open(name, 1);
   request.onerror = errorHandler;
   request.onsuccess = unexpectedSuccessHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   event = yield;
 
   is(event.type, "upgradeneeded", "Got upgradeneeded event");
 
   let db2 = event.target.result;
--- a/dom/indexedDB/test/unit/test_setVersion_events.js
+++ b/dom/indexedDB/test/unit/test_setVersion_events.js
@@ -6,17 +6,17 @@
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
   const description = "My Test Database";
 
   // Open a datbase for the first time.
-  let request = mozIndexedDB.open(name, 1, description);
+  let request = indexedDB.open(name, 1, description);
 
   // Sanity checks
   ok(request instanceof IDBRequest, "Request should be an IDBRequest");
   ok(request instanceof IDBOpenDBRequest, "Request should be an IDBOpenDBRequest");
   //ok(request instanceof EventTarget, "Request should be an EventTarget");
   is(request.source, null, "Request should have no source");
   try {
     request.result;
@@ -41,17 +41,17 @@ function testSteps()
     is(event.target.version, 1, "Correct db version");
     is(event.oldVersion, 1, "Correct event oldVersion");
     is(event.newVersion, 2, "Correct event newVersion");
     is(versionChangeEventCount++, 0, "Correct count");
     db1.close();
   }, false);
 
   // Open the database again and trigger an upgrade that should succeed
-  request = mozIndexedDB.open(name, 2, description);
+  request = indexedDB.open(name, 2, description);
   request.onerror = errorHandler;
   request.onsuccess = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   if (SpecialPowers.isMainProcess()) {
     request.onblocked = errorHandler;
   }
   else {
     todo(false, "Need to fix blocked events in child processes!");
@@ -79,31 +79,31 @@ function testSteps()
     is(event.target, db2, "Correct target");
     is(event.target.version, 2, "Correct db version");
     is(event.oldVersion, 2, "Correct event oldVersion");
     is(event.newVersion, 3, "Correct event newVersion");
     is(versionChangeEventCount++, 1, "Correct count");
   }, false);
 
   // Test opening the existing version again
-  request = mozIndexedDB.open(name, 2, description);
+  request = indexedDB.open(name, 2, description);
   request.onerror = errorHandler;
   request.onsuccess = grabEventAndContinueHandler;
   if (SpecialPowers.isMainProcess()) {
     request.onblocked = errorHandler;
   }
   else {
     todo(false, "Need to fix blocked events in child processes!");
   }
   event = yield;
 
   db3 = event.target.result;
 
   // Test an upgrade that should fail
-  request = mozIndexedDB.open(name, 3, description);
+  request = indexedDB.open(name, 3, description);
   request.onerror = errorHandler;
   request.onsuccess = errorHandler;
   request.onupgradeneeded = errorHandler;
   request.onblocked = grabEventAndContinueHandler;
 
   event = yield;
   ok(true, "Got version change blocked event");
   ok(event instanceof IDBVersionChangeEvent, "Event is of the right type");
@@ -122,17 +122,17 @@ function testSteps()
 
   event = yield;
   event = yield;
 
   db3 = event.target.result;
   db3.close();
 
   // Test another upgrade that should succeed.
-  request = mozIndexedDB.open(name, 4);
+  request = indexedDB.open(name, 4);
   request.onerror = errorHandler;
   request.onsuccess = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   if (SpecialPowers.isMainProcess()) {
     request.onblocked = errorHandler;
   }
   else {
     todo(false, "Need to fix blocked events in child processes!");
--- a/dom/indexedDB/test/unit/test_setVersion_exclusion.js
+++ b/dom/indexedDB/test/unit/test_setVersion_exclusion.js
@@ -4,22 +4,22 @@
  */
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
 
-  let request = mozIndexedDB.open(name, 1);
+  let request = indexedDB.open(name, 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   request.onsuccess = unexpectedSuccessHandler;
 
-  let request2 = mozIndexedDB.open(name, 2);
+  let request2 = indexedDB.open(name, 2);
   request2.onerror = errorHandler;
   request2.onupgradeneeded = unexpectedSuccessHandler;
   request2.onsuccess = unexpectedSuccessHandler;
 
   let event = yield;
   is(event.type, "upgradeneeded", "Expect an upgradeneeded event");
   is(event.target, request, "Event should be fired on the request");
   ok(event.target.result instanceof IDBDatabase, "Expect a database here");
--- a/dom/indexedDB/test/unit/test_success_events_after_abort.js
+++ b/dom/indexedDB/test/unit/test_success_events_after_abort.js
@@ -2,17 +2,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
-  let request = mozIndexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
+  let request = indexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
 
   event.target.onsuccess = continueToNextStep;
 
--- a/dom/indexedDB/test/unit/test_traffic_jam.js
+++ b/dom/indexedDB/test/unit/test_traffic_jam.js
@@ -6,17 +6,17 @@
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const name = this.window ? window.location.pathname : "Splendid Test";
 
   let requests = [];
   function doOpen(version, errorCallback, upgradeNeededCallback, successCallback) {
-    let request = mozIndexedDB.open(name, version);
+    let request = indexedDB.open(name, version);
     request.onerror = errorCallback;
     request.onupgradeneeded = upgradeNeededCallback;
     request.onsuccess = successCallback;
     requests.push(request);
   }
 
   doOpen(1, errorHandler, grabEventAndContinueHandler, grabEventAndContinueHandler);
   doOpen(2, errorHandler, unexpectedSuccessHandler, unexpectedSuccessHandler);
--- a/dom/indexedDB/test/unit/test_transaction_abort.js
+++ b/dom/indexedDB/test/unit/test_transaction_abort.js
@@ -14,17 +14,17 @@ function abortListener(evt)
 }
 
 function testSteps()
 {
   const Ci = Components.interfaces;
 
   const name = this.window ? window.location.pathname : "Splendid Test";
 
-  let request = mozIndexedDB.open(name, 1);
+  let request = indexedDB.open(name, 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   request.onsuccess = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
   db.onabort = abortListener;
 
--- a/dom/indexedDB/test/unit/test_transaction_lifetimes.js
+++ b/dom/indexedDB/test/unit/test_transaction_lifetimes.js
@@ -2,17 +2,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
-  let request = mozIndexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
+  let request = indexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   request.onsuccess = unexpectedSuccessHandler;
   let event = yield;
 
   let db = event.target.result;
   db.onerror = errorHandler;
 
--- a/dom/indexedDB/test/unit/test_transaction_lifetimes_nested.js
+++ b/dom/indexedDB/test/unit/test_transaction_lifetimes_nested.js
@@ -2,17 +2,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
-  let request = mozIndexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
+  let request = indexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
   db.onerror = errorHandler;
 
   event.target.onsuccess = continueToNextStep;
--- a/dom/indexedDB/test/unit/test_transaction_ordering.js
+++ b/dom/indexedDB/test/unit/test_transaction_ordering.js
@@ -2,17 +2,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 var testGenerator = testSteps();
 
 function testSteps()
 {
-  let request = mozIndexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
+  let request = indexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
   request.onerror = errorHandler;
   request.onupgradeneeded = grabEventAndContinueHandler;
   let event = yield;
 
   let db = event.target.result;
   db.onerror = errorHandler;
 
   request.onsuccess = continueToNextStep;
--- a/dom/interfaces/storage/nsIDOMStorageIndexedDB.idl
+++ b/dom/interfaces/storage/nsIDOMStorageIndexedDB.idl
@@ -10,16 +10,16 @@
  * http://www.whatwg.org/specs/web-apps/current-work/#scs-client-side and
  * http://www.w3.org/TR/IndexedDB/ for more information.
  *
  * Allows access to contextual storage areas.
  */
 
 interface nsIIDBFactory;
 
-[scriptable, uuid(d20d48e4-0b94-40c7-a9c7-ba1d6ad44442)]
+[scriptable, uuid(c5982775-3f65-4d3e-b5f0-2400c987a900)]
 interface nsIDOMStorageIndexedDB : nsISupports
 {
   /**
    * Indexed Databases for the current browsing context.
    */
-  readonly attribute nsIIDBFactory mozIndexedDB;
+  readonly attribute nsIIDBFactory indexedDB;
 };
--- a/dom/sms/src/ril/SmsDatabaseService.js
+++ b/dom/sms/src/ril/SmsDatabaseService.js
@@ -137,17 +137,17 @@ SmsDatabaseService.prototype = {
     }
 
     let self = this;
     function gotDB(db) {
       self.db = db;
       callback(null, db);
     }
 
-    let request = GLOBAL_SCOPE.mozIndexedDB.open(DB_NAME, DB_VERSION);
+    let request = GLOBAL_SCOPE.indexedDB.open(DB_NAME, DB_VERSION);
     request.onsuccess = function (event) {
       if (DEBUG) debug("Opened database:", DB_NAME, DB_VERSION);
       gotDB(event.target.result);
     };
     request.onupgradeneeded = function (event) {
       if (DEBUG) {
         debug("Database needs upgrade:", DB_NAME,
               event.oldVersion, event.newVersion);
--- a/dom/sms/tests/test_smsdatabaseservice.xul
+++ b/dom/sms/tests/test_smsdatabaseservice.xul
@@ -139,17 +139,17 @@ gIDBManager.initWindowless(this);
 let _db;
 function ensureDB(callback) {
   if (_db) {
     callback(_db);
     return;
   }
   let request;
   try {
-    request = mozIndexedDB.open(DB_NAME, DB_VERSION);
+    request = indexedDB.open(DB_NAME, DB_VERSION);
   } catch (ex) {
     ok(false, ex);
   }
   request.onsuccess = function onsuccess(event) {
     _db = request.result;
     callback(_db);
   };
   request.onerror =
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -6451,17 +6451,17 @@ let Reader = {
   },
 
   _getCacheDB: function Reader_getCacheDB(callback) {
     if (this._cacheDB) {
       callback(this._cacheDB);
       return;
     }
 
-    let request = window.mozIndexedDB.open("about:reader", this.DB_VERSION);
+    let request = window.indexedDB.open("about:reader", this.DB_VERSION);
 
     request.onerror = function(event) {
       this.log("Error connecting to the cache DB");
       this._cacheDB = null;
       callback(null);
     }.bind(this);
 
     request.onsuccess = function(event) {