Backed out changeset 1024e72d4ef9 (bug 826146) because of test failures
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 03 Jan 2013 22:59:44 -0500
changeset 126666 e9cbccc2814cb7cb6e4b1822473e0d0a2b6f9f9f
parent 126665 1940c5a8eec5ba6d87783c73e68f9077181ad025
child 126667 cf9f18d9c698ef3e6961d35cc5d8afd013471640
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs826146
milestone20.0a1
backs out1024e72d4ef9e650369e99a80756cb0b09334554
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 1024e72d4ef9 (bug 826146) because of test failures
dom/apps/src/Webapps.jsm
testing/specialpowers/content/specialpowersAPI.js
--- a/dom/apps/src/Webapps.jsm
+++ b/dom/apps/src/Webapps.jsm
@@ -1377,24 +1377,18 @@ this.DOMApplicationRegistry = {
         if (!AppsUtils.checkManifest(app.manifest)) {
           sendError("INVALID_MANIFEST");
         } else if (!AppsUtils.checkInstallAllowed(app.manifest, app.installOrigin)) {
           sendError("INSTALL_FROM_DENIED");
         } else if (!checkAppStatus(app.manifest)) {
           sendError("INVALID_SECURITY_LEVEL");
         } else {
           app.etag = xhr.getResponseHeader("Etag");
-          // We allow bypassing the install confirmation process to facilitate
-          // automation.
-          if (Services.prefs.getBoolPref("dom.mozApps.auto_confirm_install")) {
-            this.confirmInstall(aData);
-          } else {
-            Services.obs.notifyObservers(aMm, "webapps-ask-install",
-                                         JSON.stringify(aData));
-          }
+          Services.obs.notifyObservers(aMm, "webapps-ask-install",
+                                       JSON.stringify(aData));
         }
       } else {
         sendError("MANIFEST_URL_ERROR");
       }
     }).bind(this), false);
 
     xhr.addEventListener("error", (function() {
       sendError("NETWORK_ERROR");
--- a/testing/specialpowers/content/specialpowersAPI.js
+++ b/testing/specialpowers/content/specialpowersAPI.js
@@ -714,24 +714,16 @@ SpecialPowersAPI.prototype = {
       if (pref.action == 'set') {
         this._setPref(pref.name, pref.type, pref.value, pref.Iid);
       } else if (pref.action == 'clear') {
         this.clearUserPref(pref.name);
       }
     }
   },
 
-  // Disables the app install prompt for the duration of this test. There is
-  // no need to re-enable the prompt at the end of the test.
-  //
-  // The provided callback is invoked once the prompt is disabled.
-  autoConfirmAppInstall: function(cb) {
-    this.pushPrefEnv({set: [['dom.mozApps.auto_confirm_install', true]]}, cb);
-  },
-
   addObserver: function(obs, notification, weak) {
     var obsvc = Cc['@mozilla.org/observer-service;1']
                    .getService(Ci.nsIObserverService);
     obsvc.addObserver(obs, notification, weak);
   },
   removeObserver: function(obs, notification) {
     var obsvc = Cc['@mozilla.org/observer-service;1']
                    .getService(Ci.nsIObserverService);