Bug 812717 - Use the correct nsISupports pointer. r=dougt

--HG--
extra : transplant_source : %1F%98%01c%CF%08%1F%AC%DA%DDr%07%1DM9%9E%FD%AD%14%18

dom/src/notification/nsDesktopNotification.cpp

@@ -43,15 +43,7 @@ nsDOMDesktopNotification::PostDesktopNotification()
 
 DOMCI_DATA(DesktopNotification, nsDOMDesktopNotification)
 
-NS_IMPL_CYCLE_COLLECTION_CLASS(nsDOMDesktopNotification)
-
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsDOMDesktopNotification, nsDOMEventTargetHelper)
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsDOMDesktopNotification, nsDOMEventTargetHelper)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMDesktopNotification)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMDesktopNotification)
+NS_INTERFACE_MAP_BEGIN(nsDOMDesktopNotification)
   NS_INTERFACE_MAP_ENTRY(nsIDOMDesktopNotification)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DesktopNotification)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)

dom/src/notification/nsDesktopNotification.h

@@ -72,7 +72,6 @@ class nsDOMDesktopNotification : public nsDOMEventTargetHelper,
 
 public:
   NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDOMDesktopNotification,nsDOMEventTargetHelper)
   NS_DECL_NSIDOMDESKTOPNOTIFICATION
 
   nsDOMDesktopNotification(const nsAString & title,