Bug 754436 - Move xpcshell protocol handler registration into standalone function; r=ted

This commit is contained in:
Gregory Szorc 2012-05-15 09:53:28 -07:00
Родитель d3f5137eb6
Коммит d6ef0d601c
1 изменённых файлов: 7 добавлений и 3 удалений

Просмотреть файл

@ -301,9 +301,9 @@ function do_get_idle() {
.getService(Components.interfaces.nsIIdleService); .getService(Components.interfaces.nsIIdleService);
} }
function _execute_test() { // Map resource://test/ to current working directory and
// Map resource://test/ to current working directory and // resource://testing-common/ to the shared test modules directory.
// resource://testing-common/ to the shared test modules directory. function _register_protocol_handlers() {
let (ios = Components.classes["@mozilla.org/network/io-service;1"] let (ios = Components.classes["@mozilla.org/network/io-service;1"]
.getService(Components.interfaces.nsIIOService)) { .getService(Components.interfaces.nsIIOService)) {
let protocolHandler = let protocolHandler =
@ -321,6 +321,10 @@ function _execute_test() {
protocolHandler.setSubstitution("testing-common", modulesURI); protocolHandler.setSubstitution("testing-common", modulesURI);
} }
} }
}
function _execute_test() {
_register_protocol_handlers();
// Override idle service by default. // Override idle service by default.
// Call do_get_idle() to restore the factory and get the service. // Call do_get_idle() to restore the factory and get the service.