Backed out changeset 6ac0f97c0c09 (bug 1037030)
authorWes Kocher <wkocher@mozilla.com>
Mon, 14 Jul 2014 15:59:03 -0700
changeset 193901 2b340d6bf8ff3aac8fe386e589eaa273f80f2fcc
parent 193900 510ce894eaca52d053d1422e61e7edec66b79f6f
child 193902 3f6a695b80a442b17243a1d352180950e4dff86a
push id8886
push userkwierso@gmail.com
push dateMon, 14 Jul 2014 22:59:29 +0000
treeherderb2g-inbound@2b340d6bf8ff [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1037030
milestone33.0a1
backs out6ac0f97c0c0956f34ba743a731d0f4e1685bb522
Backed out changeset 6ac0f97c0c09 (bug 1037030)
dom/contacts/ContactManager.js
--- a/dom/contacts/ContactManager.js
+++ b/dom/contacts/ContactManager.js
@@ -253,37 +253,29 @@ ContactManager.prototype = {
     } else if (permValue == Ci.nsIPermissionManager.DENY_ACTION) {
       aCancelCallback();
     }
 
     // Create an array with a single nsIContentPermissionType element.
     let type = {
       type: "contacts",
       access: access,
-      options: [],
+      options: null,
       QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionType])
     };
     let typeArray = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
     typeArray.appendElement(type, false);
 
     // create a nsIContentPermissionRequest
     let request = {
       types: typeArray,
       principal: principal,
       QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionRequest]),
-      allow: aAllowCallback ||
-             function() {
-               if (DEBUG)
-                 debug("Default allow contacts callback. " + access +"\n");
-             },
-      cancel: aCancelCallback ||
-              function() {
-                if (DEBUG)
-                  debug("Default cancel contacts callback. " + access +"\n");
-              },
+      allow: aAllowCallback,
+      cancel: aCancelCallback,
       window: this._window
     };
 
     // Using askPermission from nsIDOMWindowUtils that takes care of the
     // remoting if needed.
     let windowUtils = this._window.QueryInterface(Ci.nsIInterfaceRequestor)
                           .getInterface(Ci.nsIDOMWindowUtils);
     windowUtils.askPermission(request);