Merge branch 'redwood' into 28.9-platform

1 files changed, 0 insertions, 111 deletions

diff --git a/toolkit/components/passwordmgr/test/chrome/notification_common.js b/toolkit/components/passwordmgr/test/chrome/notification_common.js
deleted file mode 100644
index e8a52929d..000000000
--- a/toolkit/components/passwordmgr/test/chrome/notification_common.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Initialization: for each test, remove any prior notifications.
- */
-function cleanUpPopupNotifications() {
-    var container = getPopupNotifications(window.top);
-    var notes = container._currentNotifications;
-    info(true, "Removing " + notes.length + " popup notifications.");
-    for (var i = notes.length - 1; i >= 0; i--) {
-	notes[i].remove();
-    }
-}
-cleanUpPopupNotifications();
-
-/*
- * getPopupNotifications
- *
- * Fetches the popup notification for the specified window.
- */
-function getPopupNotifications(aWindow) {
-    var Ci = SpecialPowers.Ci;
-    var Cc = SpecialPowers.Cc;
-    ok(Ci != null, "Access Ci");
-    ok(Cc != null, "Access Cc");
-
-    var chromeWin = SpecialPowers.wrap(aWindow)
-                                 .QueryInterface(Ci.nsIInterfaceRequestor)
-                                 .getInterface(Ci.nsIWebNavigation)
-                                 .QueryInterface(Ci.nsIDocShell)
-                                 .chromeEventHandler.ownerDocument.defaultView;
-
-    var popupNotifications = chromeWin.PopupNotifications;
-    return popupNotifications;
-}
-
-
-/**
- * Checks if we have a password popup notification
- * of the right type and with the right label.
- *
- * @deprecated Write a browser-chrome test instead and use the fork of this method there.
- * @returns the found password popup notification.
- */
-function getPopup(aPopupNote, aKind) {
-    ok(true, "Looking for " + aKind + " popup notification");
-    var notification = aPopupNote.getNotification("password");
-    if (notification) {
-      is(notification.options.passwordNotificationType, aKind, "Notification type matches.");
-      if (aKind == "password-change") {
-        is(notification.mainAction.label, "Update", "Main action label matches update doorhanger.");
-      } else if (aKind == "password-save") {
-        is(notification.mainAction.label, "Remember", "Main action label matches save doorhanger.");
-      }
-    }
-    return notification;
-}
-
-
-/**
- * @deprecated - Use a browser chrome test instead.
- *
- * Clicks the specified popup notification button.
- */
-function clickPopupButton(aPopup, aButtonIndex) {
-    ok(true, "Looking for action at index " + aButtonIndex);
-
-    var notifications = SpecialPowers.wrap(aPopup.owner).panel.childNodes;
-    ok(notifications.length > 0, "at least one notification displayed");
-    ok(true, notifications.length + " notifications");
-    var notification = notifications[0];
-
-    if (aButtonIndex == 0) {
-        ok(true, "Triggering main action");
-        notification.button.doCommand();
-    } else if (aButtonIndex <= aPopup.secondaryActions.length) {
-        var index = aButtonIndex;
-        ok(true, "Triggering secondary action " + index);
-        notification.childNodes[index].doCommand();
-    }
-}
-
-const kRememberButton = 0;
-const kNeverButton = 1;
-
-const kChangeButton = 0;
-const kDontChangeButton = 1;
-
-function dumpNotifications() {
-  try {
-    // PopupNotifications
-    var container = getPopupNotifications(window.top);
-    ok(true, "is popup panel open? " + container.isPanelOpen);
-    var notes = container._currentNotifications;
-    ok(true, "Found " + notes.length + " popup notifications.");
-    for (let i = 0; i < notes.length; i++) {
-        ok(true, "#" + i + ": " + notes[i].id);
-    }
-
-    // Notification bars
-    var chromeWin = SpecialPowers.wrap(window.top)
-                           .QueryInterface(Ci.nsIInterfaceRequestor)
-                           .getInterface(Ci.nsIWebNavigation)
-                           .QueryInterface(Ci.nsIDocShell)
-                           .chromeEventHandler.ownerDocument.defaultView;
-    var nb = chromeWin.getNotificationBox(window.top);
-    notes = nb.allNotifications;
-    ok(true, "Found " + notes.length + " notification bars.");
-    for (let i = 0; i < notes.length; i++) {
-        ok(true, "#" + i + ": " + notes[i].getAttribute("value"));
-    }
-  } catch (e) { todo(false, "WOAH! " + e); }
-}