Bug 670831 - Enable some mochitest sanity tests for uncaught exception handling. r=jmaher

testing/mochitest/chrome/Makefile.in

@@ -47,9 +47,8 @@ include $(topsrcdir)/config/rules.mk
 _STATIC_FILES = test_sample.xul \
 		test_sanityChromeUtils.xul \
 		test_sanityPluginUtils.html \
-# Disabled until bug 652494 is resolved.
-#		test_sanityException.xul \
-#		test_sanityException2.xul \
+		test_sanityException.xul \
+		test_sanityException2.xul \
 		$(NULL)
 
 libs:: $(_STATIC_FILES)

testing/mochitest/chrome/test_sanityException.xul

@@ -15,7 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=670817
 
 SimpleTest.expectUncaughtException();
 ok(true, "a call to ok");
-throw "uncaught exception";
+throw "this is a deliberately thrown exception";
 
 ]]></script> 
 </body>

testing/mochitest/chrome/test_sanityException2.xul

@@ -17,7 +17,7 @@ SimpleTest.waitForExplicitFinish();
 ok(true, "a call to ok");
 SimpleTest.executeSoon(function() {
   SimpleTest.expectUncaughtException();
-  throw "an uncaught exception";
+  throw "this is a deliberately thrown exception";
 });
 SimpleTest.executeSoon(function() {
   SimpleTest.finish();

testing/mochitest/tests/browser/Makefile.in

@@ -52,9 +52,8 @@ _BROWSER_TEST_FILES = \
 	                  browser_privileges.js \
 	                  browser_popupNode.js \
 	                  browser_popupNode_check.js \
-# Disabled until bug 652494 is resolved.
-#			  browser_sanityException.js \
-#			  browser_sanityException2.js \
+			  browser_sanityException.js \
+			  browser_sanityException2.js \
 # Disabled, these are only good for testing the harness' failure reporting
 #	                  browser_zz_fail_openwindow.js \
 #	                  browser_fail.js \

testing/mochitest/tests/browser/browser_sanityException.js

@@ -1,5 +1,5 @@
 function test() {
   ok(true, "ok called");
   expectUncaughtException();
-  throw "uncaught exception";
+  throw "this is a deliberately thrown exception";
 }

testing/mochitest/tests/browser/browser_sanityException2.js

@@ -3,7 +3,7 @@ function test() {
   ok(true, "ok called");
   executeSoon(function() {
     expectUncaughtException();
-    throw "uncaught exception";
+    throw "this is a deliberately thrown exception";
   });
   executeSoon(function() {
     finish();