Bug 846099: Avoid (GC-timing-sensitive) nsTraceRefcnt assertions from duplicate class names. r=mounir

dom/network/src/Connection.cpp

@@ -31,8 +31,10 @@ NS_INTERFACE_MAP_BEGIN(Connection)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozConnection)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)
 
-NS_IMPL_ADDREF_INHERITED(Connection, nsDOMEventTargetHelper)
-NS_IMPL_RELEASE_INHERITED(Connection, nsDOMEventTargetHelper)
+// Don't use |Connection| alone, since that confuses nsTraceRefcnt since
+// we're not the only class with that name.
+NS_IMPL_ADDREF_INHERITED(dom::network::Connection, nsDOMEventTargetHelper)
+NS_IMPL_RELEASE_INHERITED(dom::network::Connection, nsDOMEventTargetHelper)
 
 NS_IMPL_EVENT_HANDLER(Connection, change)
 

dom/network/tests/test_network_basics.html

@@ -12,12 +12,6 @@
 <pre id="test">
 <script type="application/javascript">
 
-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(11, 38);
-} else {
-  SimpleTest.expectAssertions(11);
-}
-
 /** Test for Network API **/
 
 function checkInterface(aInterface) {

dom/network/tests/test_tcpsocket_default_permissions.html

@@ -12,10 +12,6 @@
 <pre id="test">
 <script type="application/javascript">
 
-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 13);
-}
-
 /** Test to ensure TCPSocket permission is disabled by default **/
 
 try {

dom/network/tests/test_tcpsocket_enabled_no_perm.html

@@ -12,10 +12,6 @@
 <pre id="test">
 <script type="application/javascript">
 
-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 15);
-}
-
 /** Test to ensure TCPSocket permission being turned on enables 
   navigator.mozTCPSocket, but mozTCPSocket.open does not work
   in content.

dom/network/tests/test_tcpsocket_enabled_with_perm.html

@@ -12,12 +12,6 @@
 <pre id="test">
 <script type="application/javascript">
 
-if (navigator.platform.startsWith("Linux")) {
-  SimpleTest.expectAssertions(0, 1);
-} else if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 11);
-}
-
 /** Test to ensure TCPSocket permission being turned on enables 
   navigator.mozTCPSocket, and mozTCPSocket.open works when
   the tcp-socket permission has been granted.

dom/permission/tests/test_permission_basics.html

@@ -21,12 +21,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={770731}
 
 "use strict";
 
-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 34);
-} else {
-  SimpleTest.expectAssertions(0, 1);
-}
-
 var testPrivApp = {
   'manifestURL' : 'https://aprivileged.com/manifest.webapp'
 };

dom/plugins/test/mochitest/test_GCrace.html

@@ -22,8 +22,6 @@
       else {
         if (navigator.platform.startsWith("Win")) {
           SimpleTest.expectAssertions(0, 350);
-        } else {
-          SimpleTest.expectAssertions(0, 1);
         }
 
         setTimeout(checkGCRace, 1000);