Bug 1405639 - remove outdated check for XPCOMABI in jsreftest; r=sfink
authorNathan Froyd <froydnj@mozilla.com>
Wed, 04 Oct 2017 14:19:34 -0400
changeset 1311820 8012e6b0d4814abe6816a274fc6eedabaccd6d2f
parent 1311819 f8bc133f9a07759010bdbc60e92499de396f11dd
child 1311821 52a87a609fcb45416dfd14a0879a32f6702a3ead
push id225897
push useropettay@mozilla.com
push dateWed, 04 Oct 2017 19:25:01 +0000
treeherdertry@2f2f41234c44 [default view] [failures only]
reviewerssfink
bugs1405639
milestone58.0a1
Bug 1405639 - remove outdated check for XPCOMABI in jsreftest; r=sfink The backstory for this bit of code is that we didn't know if ARM had a stable ABI or not. Well, it does now, and so we can remove this bit of code.
layout/tools/reftest/reftest.jsm
--- a/layout/tools/reftest/reftest.jsm
+++ b/layout/tools/reftest/reftest.jsm
@@ -663,24 +663,17 @@ function BuildConditionSandbox(aURL) {
     var xr = CC[NS_XREAPPINFO_CONTRACTID].getService(CI.nsIXULRuntime);
     var appInfo = CC[NS_XREAPPINFO_CONTRACTID].getService(CI.nsIXULAppInfo);
     sandbox.isDebugBuild = gDebug.isDebugBuild;
     var prefs = CC["@mozilla.org/preferences-service;1"].
                 getService(CI.nsIPrefBranch);
     var env = CC["@mozilla.org/process/environment;1"].
                 getService(CI.nsIEnvironment);
 
-    // xr.XPCOMABI throws exception for configurations without full ABI
-    // support (mobile builds on ARM)
-    var XPCOMABI = "";
-    try {
-        XPCOMABI = xr.XPCOMABI;
-    } catch(e) {}
-
-    sandbox.xulRuntime = CU.cloneInto({widgetToolkit: xr.widgetToolkit, OS: xr.OS, XPCOMABI: XPCOMABI}, sandbox);
+    sandbox.xulRuntime = CU.cloneInto({widgetToolkit: xr.widgetToolkit, OS: xr.OS, XPCOMABI: xr.XPCOMABI}, sandbox);
 
     var testRect = gBrowser.getBoundingClientRect();
     sandbox.smallScreen = false;
     if (gContainingWindow.innerWidth < 800 || gContainingWindow.innerHeight < 1000) {
         sandbox.smallScreen = true;
     }
 
     var gfxInfo = (NS_GFXINFO_CONTRACTID in CC) && CC[NS_GFXINFO_CONTRACTID].getService(CI.nsIGfxInfo);