Bug 633221 - Setting FF as default browser throws error when GIO Service is not available [r=roc, a=roc]

browser/components/shell/src/nsGNOMEShellService.cpp

@@ -230,7 +230,7 @@ nsGNOMEShellService::SetDefaultBrowser(PRBool aClaimAllTypes,
     nsresult rv;
     nsCOMPtr<nsIGIOService> giovfs =
       do_GetService(NS_GIOSERVICE_CONTRACTID, &rv);
-    NS_ENSURE_SUCCESS(rv, rv);
+    NS_ENSURE_SUCCESS(rv, NS_OK);
 
     nsCOMPtr<nsIStringBundleService> bundleService =
       do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);

browser/components/shell/test/Makefile.in

@@ -48,6 +48,7 @@ XPCSHELL_TESTS	= unit
 include $(topsrcdir)/config/rules.mk
 
 _BROWSER_TEST_FILES = browser_420786.js \
+    browser_633221.js \
 	$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)

browser/components/shell/test/browser_633221.js

@@ -0,0 +1,14 @@
+function test() {
+  let osString = Cc["@mozilla.org/xre/app-info;1"].
+                 getService(Ci.nsIXULRuntime).OS;
+
+  // this test is Linux-specific
+  if (osString != "Linux")
+    return;
+
+  let shell = Cc["@mozilla.org/browser/shell-service;1"].
+              getService(Ci.nsIShellService);
+
+  shell.setDefaultBrowser(true, false);
+  ok(shell.isDefaultBrowser(true), "we got here and are the default browser");
+}