Bug 1298930 - Remove the eRestarti386 and eRestartx86_64 constants. r=spohl
authorJosh Aas <jaas@kflag.net>
Tue, 29 Aug 2017 05:50:00 -0400
changeset 377572 a5c10d36a74cda774646079352a55ad8eab6db4f
parent 377571 b4322e848dd03067fb272044db28dd6495df68fe
child 377573 233bd64683bb67af0fc03eeb526ee4ddb92ea27b
push id94297
push userryanvm@gmail.com
push dateTue, 29 Aug 2017 20:50:08 +0000
treeherdermozilla-inbound@a5c10d36a74c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersspohl
bugs1298930
milestone57.0a1
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
Bug 1298930 - Remove the eRestarti386 and eRestartx86_64 constants. r=spohl
services/sync/tps/extensions/mozmill/resource/driver/controller.js
services/sync/tps/extensions/mozmill/resource/modules/frame.js
toolkit/components/startup/public/nsIAppStartup.idl
--- a/services/sync/tps/extensions/mozmill/resource/driver/controller.js
+++ b/services/sync/tps/extensions/mozmill/resource/driver/controller.js
@@ -428,18 +428,17 @@ MozMillController.prototype.startUserShu
 }
 
 /**
  * Restart the application
  *
  * @param {string} aNext
  *        Name of the next test function to run after restart
  * @param {boolean} [aFlags=undefined]
- *        Additional flags how to handle the shutdown or restart. The attributes
- *        eRestarti386 (0x20) and eRestartx86_64 (0x30) have not been documented yet.
+ *        Additional flags how to handle the shutdown or restart.
  * @see https://developer.mozilla.org/nsIAppStartup#Attributes
  */
 MozMillController.prototype.restartApplication = function (aNext, aFlags) {
   var flags = Ci.nsIAppStartup.eAttemptQuit | Ci.nsIAppStartup.eRestart;
 
   if (aFlags) {
     flags |= aFlags;
   }
@@ -456,18 +455,17 @@ MozMillController.prototype.restartAppli
 }
 
 /**
  * Stop the application
  *
  * @param {boolean} [aResetProfile=false]
  *        Whether to reset the profile during restart
  * @param {boolean} [aFlags=undefined]
- *        Additional flags how to handle the shutdown or restart. The attributes
- *        eRestarti386 and eRestartx86_64 have not been documented yet.
+ *        Additional flags how to handle the shutdown or restart.
  * @see https://developer.mozilla.org/nsIAppStartup#Attributes
  */
 MozMillController.prototype.stopApplication = function (aResetProfile, aFlags) {
   var flags = Ci.nsIAppStartup.eAttemptQuit;
 
   if (aFlags) {
     flags |= aFlags;
   }
--- a/services/sync/tps/extensions/mozmill/resource/modules/frame.js
+++ b/services/sync/tps/extensions/mozmill/resource/modules/frame.js
@@ -41,18 +41,17 @@ var modules = undefined;
 
 var timers = [];
 
 
 /**
  * Shutdown or restart the application
  *
  * @param {boolean} [aFlags=undefined]
- *        Additional flags how to handle the shutdown or restart. The attributes
- *        eRestarti386 and eRestartx86_64 have not been documented yet.
+ *        Additional flags how to handle the shutdown or restart.
  * @see https://developer.mozilla.org/nsIAppStartup#Attributes
  */
 function shutdownApplication(aFlags) {
   var flags = Ci.nsIAppStartup.eForceQuit;
 
   if (aFlags) {
     flags |= aFlags;
   }
--- a/toolkit/components/startup/public/nsIAppStartup.idl
+++ b/toolkit/components/startup/public/nsIAppStartup.idl
@@ -116,29 +116,17 @@ interface nsIAppStartup : nsISupports
      * Quit, damnit!
      */
     const uint32_t eForceQuit = 0x03;
 
     /**
      * Restart the application after quitting.  The application will be
      * restarted with the same profile and an empty command line.
      */
-    const uint32_t eRestart = 0x10; 
-
-    /**
-     * When restarting attempt to start in the i386 architecture. Only supported
-     * on OSX.
-     */
-    const uint32_t eRestarti386 = 0x20;
-
-    /**
-     * When restarting attempt to start in the x86_64 architecture. Only
-     * supported on OSX.
-     */
-    const uint32_t eRestartx86_64 = 0x40;
+    const uint32_t eRestart = 0x10;
 
     /**
      * Restart the application after quitting.  The application will be
      * restarted with an empty command line and the normal profile selection
      * process will take place on startup.
      */
     const uint32_t eRestartNotSameProfile = 0x100;