mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-04 11:26:09 +00:00
Backed out changeset b1dba904d5c8 (bug 886263) for xpcshell orange
This commit is contained in:
parent
8cdbf8785d
commit
695f4e1643
@ -61,6 +61,8 @@ function run_test()
|
||||
// Needed to properly setup and shutdown the profile.
|
||||
do_get_profile();
|
||||
|
||||
Services.prefs.setBoolPref("places.history.enabled", true);
|
||||
|
||||
for (var i = 0; i < tests.length; i++)
|
||||
tests[i]();
|
||||
|
||||
|
@ -36,16 +36,6 @@ let (ios = Components.classes["@mozilla.org/network/io-service;1"]
|
||||
ios.offline = false;
|
||||
}
|
||||
|
||||
// Only if building of places is enabled.
|
||||
if ("mozIAsyncHistory" in Components.interfaces) {
|
||||
// Ensure places history is enabled for xpcshell-tests as some non-FF
|
||||
// apps disable it.
|
||||
let (prefs = Components.classes["@mozilla.org/preferences-service;1"]
|
||||
.getService(Components.interfaces.nsIPrefBranch)) {
|
||||
prefs.setBoolPref("places.history.enabled", true);
|
||||
};
|
||||
}
|
||||
|
||||
// Determine if we're running on parent or child
|
||||
let runningInParent = true;
|
||||
try {
|
||||
|
@ -36,6 +36,9 @@ add_task(function test_execute()
|
||||
if (!("@mozilla.org/browser/nav-history-service;1" in Cc))
|
||||
return;
|
||||
|
||||
// Ensure places is enabled.
|
||||
Services.prefs.setBoolPref("places.history.enabled", true);
|
||||
|
||||
let dm = Cc["@mozilla.org/download-manager;1"].
|
||||
getService(Ci.nsIDownloadManager);
|
||||
let db = dm.DBConnection;
|
||||
|
@ -55,6 +55,9 @@ function LOG(aMsg) {
|
||||
|
||||
let gTestDir = do_get_cwd();
|
||||
|
||||
// Ensure history is enabled.
|
||||
Services.prefs.setBoolPref("places.history.enabled", true);
|
||||
|
||||
// Initialize profile.
|
||||
let gProfD = do_get_profile();
|
||||
|
||||
|
@ -6,6 +6,9 @@ const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
|
||||
Cu.import("resource://gre/modules/Services.jsm");
|
||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
|
||||
// Ensure history is enabled.
|
||||
Services.prefs.setBoolPref("places.history.enabled", true);
|
||||
|
||||
XPCOMUtils.defineLazyModuleGetter(this, "Promise",
|
||||
"resource://gre/modules/commonjs/sdk/core/promise.js");
|
||||
XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
|
||||
|
@ -733,6 +733,8 @@ let tests = [
|
||||
|
||||
function run_test()
|
||||
{
|
||||
Services.prefs.setBoolPref("places.history.enabled", true);
|
||||
|
||||
for (let i = 0; i < tests.length; i++)
|
||||
add_task(tests[i]);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user