From b666926039434479d1186ca916521cd6191f6d66 Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted.mielczarek@gmail.com>
Date: Thu, 20 Sep 2012 10:50:21 -0400
Subject: [PATCH] bug 705047 - re-enable OOP crashreporter tests on mac.
 r=philor

---
 dom/plugins/test/mochitest/test_busy_hang.xul          |  7 -------
 dom/plugins/test/mochitest/test_crash_notify.xul       |  7 -------
 .../test/mochitest/test_crash_notify_no_report.xul     |  7 -------
 dom/plugins/test/mochitest/test_crash_submit.xul       |  7 -------
 dom/plugins/test/mochitest/test_crashing.html          | 10 +---------
 dom/plugins/test/mochitest/test_hanging.html           |  7 -------
 dom/plugins/test/mochitest/test_idle_hang.xul          |  7 -------
 toolkit/crashreporter/test/unit_ipc/xpcshell.ini       |  2 --
 8 files changed, 1 insertion(+), 53 deletions(-)

diff --git a/dom/plugins/test/mochitest/test_busy_hang.xul b/dom/plugins/test/mochitest/test_busy_hang.xul
index 3e9ab290aaf9..c93623810524 100644
--- a/dom/plugins/test/mochitest/test_busy_hang.xul
+++ b/dom/plugins/test/mochitest/test_busy_hang.xul
@@ -17,13 +17,6 @@
     <![CDATA[
 SimpleTest.waitForExplicitFinish();
 
-const isOSXLion = navigator.userAgent.indexOf("Mac OS X 10.7") != -1;
-const isOSXMtnLion = navigator.userAgent.indexOf("Mac OS X 10.8") != -1;
-if (isOSXLion || isOSXMtnLion) {
-  todo(false, "Can't test plugin crash notification on OS X 10.7 or 10.8, see bug 705047");
-  SimpleTest.finish();
-}
-
 function runTests() {
   if (!SimpleTest.testPluginIsOOP()) {
     ok(true, "Skipping this test when test plugin is not OOP.");
diff --git a/dom/plugins/test/mochitest/test_crash_notify.xul b/dom/plugins/test/mochitest/test_crash_notify.xul
index e0c15fb167ea..230cc283dd28 100644
--- a/dom/plugins/test/mochitest/test_crash_notify.xul
+++ b/dom/plugins/test/mochitest/test_crash_notify.xul
@@ -15,13 +15,6 @@
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
 
-const isOSXLion = navigator.userAgent.indexOf("Mac OS X 10.7") != -1;
-const isOSXMtnLion = navigator.userAgent.indexOf("Mac OS X 10.8") != -1;
-if (isOSXLion || isOSXMtnLion) {
-  todo(false, "Can't test plugin crash notification on OS X 10.7 or 10.8, see bug 705047");
-  SimpleTest.finish();
-}
-
 var success = false;
 
 var observerFired = false;
diff --git a/dom/plugins/test/mochitest/test_crash_notify_no_report.xul b/dom/plugins/test/mochitest/test_crash_notify_no_report.xul
index 7883870aecf7..9f3a1429aa72 100644
--- a/dom/plugins/test/mochitest/test_crash_notify_no_report.xul
+++ b/dom/plugins/test/mochitest/test_crash_notify_no_report.xul
@@ -15,13 +15,6 @@
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
 
-const isOSXLion = navigator.userAgent.indexOf("Mac OS X 10.7") != -1;
-const isOSXMtnLion = navigator.userAgent.indexOf("Mac OS X 10.8") != -1;
-if (isOSXLion || isOSXMtnLion) {
-  todo(false, "Can't test plugin crash notification on OS X 10.7 or 10.8, see bug 705047");
-  SimpleTest.finish();
-}
-
 var success = false;
 
 var observerFired = false;
diff --git a/dom/plugins/test/mochitest/test_crash_submit.xul b/dom/plugins/test/mochitest/test_crash_submit.xul
index 52e7a3a30e85..26ad85f00805 100644
--- a/dom/plugins/test/mochitest/test_crash_submit.xul
+++ b/dom/plugins/test/mochitest/test_crash_submit.xul
@@ -18,13 +18,6 @@
 SimpleTest.waitForExplicitFinish();
 SimpleTest.ignoreAllUncaughtExceptions();
 
-const isOSXLion = navigator.userAgent.indexOf("Mac OS X 10.7") != -1;
-const isOSXMtnLion = navigator.userAgent.indexOf("Mac OS X 10.8") != -1;
-if (isOSXLion || isOSXMtnLion) {
-  todo(false, "Can't test plugin crash notification on OS X 10.7 or 10.8, see bug 705047");
-  SimpleTest.finish();
-}
-
 Components.utils.import("resource://gre/modules/NetUtil.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 
diff --git a/dom/plugins/test/mochitest/test_crashing.html b/dom/plugins/test/mochitest/test_crashing.html
index c9f5f04228d0..3878ff0943f3 100644
--- a/dom/plugins/test/mochitest/test_crashing.html
+++ b/dom/plugins/test/mochitest/test_crashing.html
@@ -7,15 +7,7 @@
   SimpleTest.waitForExplicitFinish();
 
   window.frameLoaded = function frameLoaded_toCrash() {
-    const isOSXLion = navigator.userAgent.indexOf("Mac OS X 10.7") != -1;
-    const isOSXMtnLion = navigator.userAgent.indexOf("Mac OS X 10.8") != -1;
-    if (isOSXLion || isOSXMtnLion) {
-      todo(false, "Can't test plugin crash notification on OS X 10.7 or 10.8, see bug 705047");
-      SimpleTest.finish();
-      return;
-    }
-
-    if (!SimpleTest.testPluginIsOOP()) {
+   if (!SimpleTest.testPluginIsOOP()) {
       ok(true, "Skipping this test when test plugin is not OOP.");
       SimpleTest.finish();
       return;
diff --git a/dom/plugins/test/mochitest/test_hanging.html b/dom/plugins/test/mochitest/test_hanging.html
index c7aeda251390..bd4cfa7779c9 100644
--- a/dom/plugins/test/mochitest/test_hanging.html
+++ b/dom/plugins/test/mochitest/test_hanging.html
@@ -6,13 +6,6 @@
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
 
-  const isOSXLion = navigator.userAgent.indexOf("Mac OS X 10.7") != -1;
-  const isOSXMtnLion = navigator.userAgent.indexOf("Mac OS X 10.8") != -1;
-  if (isOSXLion || isOSXMtnLion) {
-    todo(false, "Can't test plugin crash notification on OS X 10.7 or 10.8, see bug 705047");
-    SimpleTest.finish();
-  }
-
   window.frameLoaded = function frameLoaded_toCrash() {
     if (!SimpleTest.testPluginIsOOP()) {
       ok(true, "Skipping this test when test plugin is not OOP.");
diff --git a/dom/plugins/test/mochitest/test_idle_hang.xul b/dom/plugins/test/mochitest/test_idle_hang.xul
index 008a87e4c4e3..57c1953b1f4d 100644
--- a/dom/plugins/test/mochitest/test_idle_hang.xul
+++ b/dom/plugins/test/mochitest/test_idle_hang.xul
@@ -17,13 +17,6 @@
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
 
-const isOSXLion = navigator.userAgent.indexOf("Mac OS X 10.7") != -1;
-const isOSXMtnLion = navigator.userAgent.indexOf("Mac OS X 10.8") != -1;
-if (isOSXLion || isOSXMtnLion) {
-  todo(false, "Can't test plugin crash notification on OS X 10.7 or 10.8, see bug 705047");
-  SimpleTest.finish();
-}
-
 function runTests() {
   if (!SimpleTest.testPluginIsOOP()) {
     ok(true, "Skipping this test when test plugin is not OOP.");
diff --git a/toolkit/crashreporter/test/unit_ipc/xpcshell.ini b/toolkit/crashreporter/test/unit_ipc/xpcshell.ini
index 0a1f19c852e5..bc4fa04d1ea4 100644
--- a/toolkit/crashreporter/test/unit_ipc/xpcshell.ini
+++ b/toolkit/crashreporter/test/unit_ipc/xpcshell.ini
@@ -3,5 +3,3 @@ head =
 tail =
 
 [test_content_annotation.js]
-# Bug 706751: test fails on 10.7 and 10.8
-skip-if = os == "mac"