Followup of the backout of bug 542999, fix an incorrect merge conflict resolution
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 29 Nov 2010 22:27:46 -0500
changeset 58359 00fb5565fc30d1ff66e68e2d065c2602d9ed9b5d
parent 58358 d1fe3a682617a286f7d25e4aef53cdab9165cd44
child 58360 e57dc7264ff5f2c6940c860b60c5087592cd1239
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
bugs542999
milestone2.0b8pre
Followup of the backout of bug 542999, fix an incorrect merge conflict resolution
chrome/test/unit/test_bug519468.js
--- a/chrome/test/unit/test_bug519468.js
+++ b/chrome/test/unit/test_bug519468.js
@@ -42,16 +42,19 @@ var MANIFESTS = [
 
 registerManifests(MANIFESTS);
 
 var chromeReg = Cc["@mozilla.org/chrome/chrome-registry;1"]
                 .getService(Ci.nsIXULChromeRegistry)
                 .QueryInterface(Ci.nsIToolkitChromeRegistry);
 chromeReg.checkForNewChrome();
 
+var localeService = Cc["@mozilla.org/intl/nslocaleservice;1"]
+                    .getService(Ci.nsILocaleService);
+
 var prefService = Cc["@mozilla.org/preferences-service;1"]
                   .getService(Ci.nsIPrefService)
                   .QueryInterface(Ci.nsIPrefBranch);
 
 function test_locale(aTest) {
   prefService.setBoolPref("intl.locale.matchOS", aTest.matchOS);
   prefService.setCharPref("general.useragent.locale", aTest.selected || "en-US");