Backed out changeset fec126cd7f6e (bug 1764544) for causing marionette failures on test_win32k_enrollment.py.
This commit is contained in:
@@ -5486,14 +5486,14 @@ nsresult XREMain::XRE_mainRun() {
|
||||
appStartup = components::AppStartup::Service();
|
||||
NS_ENSURE_TRUE(appStartup, NS_ERROR_FAILURE);
|
||||
|
||||
mDirProvider.DoStartup();
|
||||
|
||||
#ifdef XP_WIN
|
||||
// It needs to be called on the main thread because it has to use
|
||||
// nsObserverService.
|
||||
EnsureWin32kInitialized();
|
||||
#endif
|
||||
|
||||
mDirProvider.DoStartup();
|
||||
|
||||
// As FilePreferences need the profile directory, we must initialize right
|
||||
// here.
|
||||
mozilla::FilePreferences::InitDirectoriesWhitelist();
|
||||
|
||||
Reference in New Issue
Block a user