From 3b4e8ca478d76fcb2d0709f62ae81dc9277193bc Mon Sep 17 00:00:00 2001 From: Vendelin Ruzicka Date: Tue, 19 Nov 2013 08:36:33 +0100 Subject: [PATCH] Bug 921478 - Part 2: Convert test_contacts_upgrade.html to real chrome mochitest. r=bent --HG-- rename : dom/contacts/tests/test_contacts_upgrade.html => dom/contacts/tests/test_contacts_upgrade.xul --- dom/contacts/tests/chrome.ini | 2 +- dom/contacts/tests/test_contacts_upgrade.html | 279 ------------------ dom/contacts/tests/test_contacts_upgrade.xul | 279 ++++++++++++++++++ dom/datastore/DataStore.jsm | 1 + dom/datastore/DataStoreDB.jsm | 1 + dom/indexedDB/IndexedDatabaseManager.cpp | 3 +- dom/indexedDB/test/unit/xpcshell.ini | 2 +- 7 files changed, 285 insertions(+), 282 deletions(-) delete mode 100644 dom/contacts/tests/test_contacts_upgrade.html create mode 100644 dom/contacts/tests/test_contacts_upgrade.xul diff --git a/dom/contacts/tests/chrome.ini b/dom/contacts/tests/chrome.ini index 3ed06c21260d..073b9ace36b1 100644 --- a/dom/contacts/tests/chrome.ini +++ b/dom/contacts/tests/chrome.ini @@ -1,3 +1,3 @@ [DEFAULT] -[test_contacts_upgrade.html] +[test_contacts_upgrade.xul] diff --git a/dom/contacts/tests/test_contacts_upgrade.html b/dom/contacts/tests/test_contacts_upgrade.html deleted file mode 100644 index b271fe655199..000000000000 --- a/dom/contacts/tests/test_contacts_upgrade.html +++ /dev/null @@ -1,279 +0,0 @@ - - - - - Test for Bug 889239 - - - - - - -Mozilla Bug 889239 -

- -
-
-
- - diff --git a/dom/contacts/tests/test_contacts_upgrade.xul b/dom/contacts/tests/test_contacts_upgrade.xul new file mode 100644 index 000000000000..c9b90d111e4d --- /dev/null +++ b/dom/contacts/tests/test_contacts_upgrade.xul @@ -0,0 +1,279 @@ + + + + + + + + + + Mozilla Bug 889239 + + diff --git a/dom/datastore/DataStore.jsm b/dom/datastore/DataStore.jsm index f6b3ad6b6d0f..afe1a2645f1d 100644 --- a/dom/datastore/DataStore.jsm +++ b/dom/datastore/DataStore.jsm @@ -28,6 +28,7 @@ Cu.import("resource://gre/modules/DataStoreDB.jsm"); Cu.import("resource://gre/modules/ObjectWrapper.jsm"); Cu.import('resource://gre/modules/Services.jsm'); Cu.import('resource://gre/modules/XPCOMUtils.jsm'); +Cu.importGlobalProperties(["indexedDB"]); XPCOMUtils.defineLazyServiceGetter(this, "cpmm", "@mozilla.org/childprocessmessagemanager;1", diff --git a/dom/datastore/DataStoreDB.jsm b/dom/datastore/DataStoreDB.jsm index 75c3fdb8af17..bf5383550754 100644 --- a/dom/datastore/DataStoreDB.jsm +++ b/dom/datastore/DataStoreDB.jsm @@ -19,6 +19,7 @@ const DATASTOREDB_REVISION_INDEX = 'revisionIndex'; Cu.import('resource://gre/modules/IndexedDBHelper.jsm'); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +Cu.importGlobalProperties(["indexedDB"]); XPCOMUtils.defineLazyServiceGetter(this, "uuidgen", "@mozilla.org/uuid-generator;1", diff --git a/dom/indexedDB/IndexedDatabaseManager.cpp b/dom/indexedDB/IndexedDatabaseManager.cpp index aefb62cccf4d..90cf85144086 100644 --- a/dom/indexedDB/IndexedDatabaseManager.cpp +++ b/dom/indexedDB/IndexedDatabaseManager.cpp @@ -425,7 +425,8 @@ IndexedDatabaseManager::DefineIndexedDB(JSContext* aCx, !IDBOpenDBRequestBinding::GetConstructorObject(aCx, aGlobal) || !IDBRequestBinding::GetConstructorObject(aCx, aGlobal) || !IDBTransactionBinding::GetConstructorObject(aCx, aGlobal) || - !IDBVersionChangeEventBinding::GetConstructorObject(aCx, aGlobal)) { + !IDBVersionChangeEventBinding::GetConstructorObject(aCx, aGlobal)) + { return false; } diff --git a/dom/indexedDB/test/unit/xpcshell.ini b/dom/indexedDB/test/unit/xpcshell.ini index d3e19e5e52cf..7f9a8a54b12f 100644 --- a/dom/indexedDB/test/unit/xpcshell.ini +++ b/dom/indexedDB/test/unit/xpcshell.ini @@ -30,7 +30,7 @@ support-files = [test_getAll.js] [test_globalObjects_ipc.js] # FIXME/bug 575918: out-of-process xpcshell is broken on OS X -#skip-if = os == "mac" || os == "android" +skip-if = os == "mac" || os == "android" [test_globalObjects_other.js] [test_globalObjects_xpc.js] [test_global_data.js]