Bug 1178274 - Ensure the BrowserTabsRemoteAutostart function is first called on the main thread during xpcshell testing. r=billm

This commit is contained in:
Kartikaya Gupta 2015-06-30 06:43:07 -04:00
parent 5c536eddba
commit 12d6a56beb

View File

@ -32,6 +32,7 @@
#include "nsIPrincipal.h" #include "nsIPrincipal.h"
#include "nsJSUtils.h" #include "nsJSUtils.h"
#include "gfxPrefs.h" #include "gfxPrefs.h"
#include "nsIXULRuntime.h"
#include "base/histogram.h" #include "base/histogram.h"
@ -1474,6 +1475,8 @@ XRE_XPCShellMain(int argc, char** argv, char** envp)
// Initialize graphics prefs on the main thread, if not already done // Initialize graphics prefs on the main thread, if not already done
gfxPrefs::GetSingleton(); gfxPrefs::GetSingleton();
// Initialize e10s check on the main thread, if not already done
BrowserTabsRemoteAutostart();
{ {
JS::Rooted<JSObject*> glob(cx, holder->GetJSObject()); JS::Rooted<JSObject*> glob(cx, holder->GetJSObject());