Mark one of the border-image tests as failing on Mac OS X 10.4. (Bug 448121) r+sr=bzbarsky

layout/reftests/border-image/reftest.list

@@ -2,6 +2,6 @@ fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == solid-image-1.html solid-image-1-ref.ht
 == transparent-image-1.html transparent-image-1-ref.html
 fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == solid-image-2.html solid-image-2-ref.html # bug 445911
 == multicolor-image-1.html multicolor-image-1-ref.html
-== multicolor-image-2.html multicolor-image-2-ref.html
+fails-if(http.oscpu.match(/Mac\x20OS\x20X\x2010\.4$/)) == multicolor-image-2.html multicolor-image-2-ref.html # fails on OS X 10.4 (bug 448121)
 == multicolor-image-3.html multicolor-image-3-ref.html
 != repeat-image-1.html repeat-image-1-ref.html

layout/tools/reftest/reftest.js

@@ -50,6 +50,8 @@ const NS_SCRIPTSECURITYMANAGER_CONTRACTID =
           "@mozilla.org/scriptsecuritymanager;1";
 const NS_REFTESTHELPER_CONTRACTID =
           "@mozilla.org/reftest-helper;1";
+const NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX =
+          "@mozilla.org/network/protocol;1?name=";
 
 const LOAD_FAILURE_TIMEOUT = 10000; // ms
 
@@ -143,9 +145,18 @@ function ReadManifest(aURL)
     fis.init(listURL.file, -1, -1, false);
     var lis = fis.QueryInterface(CI.nsILineInputStream);
 
+    // Build the sandbox for fails-if(), etc., condition evaluation.
     var sandbox = new Components.utils.Sandbox(aURL.spec);
     for (var prop in gAutoconfVars)
         sandbox[prop] = gAutoconfVars[prop];
+    var hh = CC[NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX + "http"].
+                 getService(CI.nsIHttpProtocolHandler);
+    sandbox.http = {};
+    for each (var prop in [ "userAgent", "appName", "appVersion", 
+                            "vendor", "vendorSub", "vendorComment",
+                            "product", "productSub", "productComment",
+                            "platform", "oscpu", "language", "misc" ])
+        sandbox.http[prop] = hh[prop];
 
     var line = {value:null};
     var lineNo = 0;