Merge m-c to inbound. a=merge

toolkit/mozapps/update/tests/chrome/chrome.ini

@@ -18,6 +18,8 @@ support-files =
 [test_0015_check_incompat_basic_addons.xul]
 [test_0016_check_incompat_basic_license_addons.xul]
 [test_0017_check_staging_basic.xul]
+skip-if = os != 'win'
+reason = Bug 918029 and bug 1164560 - timeout caused by copying too many files.
 [test_0021_check_billboard.xul]
 [test_0022_check_billboard_license.xul]
 [test_0023_check_incompat_billboard.xul]
@@ -59,10 +61,10 @@ support-files =
 [test_0095_restartNotification_remoteInvalidNumber.xul]
 [test_0096_restartNotification_stagedBackground.xul]
 [test_0097_restartNotification_stagedServiceBackground.xul]
-skip-if = os != 'win'
-reason = only Windows has the maintenance service.
 [test_0101_background_restartNotification.xul]
 [test_0102_background_restartNotification_staging.xul]
+skip-if = os == 'linux'
+reason = Bug 918029 - timeout caused by copying too many files.
 [test_0103_background_restartNotification_stagingService.xul]
 skip-if = os != 'win'
 reason = only Windows has the maintenance service.

toolkit/mozapps/update/tests/chrome/utils.js

@@ -330,7 +330,6 @@ function runTestDefaultWaitForWindowClosed() {
 
     setupFiles();
     setupPrefs();
-    gEnv.set("MOZ_TEST_SKIP_UPDATE_STAGE", "1");
     removeUpdateDirsAndFiles();
     reloadUpdateManagerData();
     setupAddons(runTest);
@@ -359,7 +358,6 @@ function finishTestDefault() {
   verifyTestsRan();
 
   resetPrefs();
-  gEnv.set("MOZ_TEST_SKIP_UPDATE_STAGE", "");
   resetFiles();
   removeUpdateDirsAndFiles();
   reloadUpdateManagerData();

toolkit/mozapps/update/tests/data/shared.js

@@ -130,10 +130,6 @@ XPCOMUtils.defineLazyGetter(this, "gPrefRoot", function test_gPR() {
   return Services.prefs.getBranch(null);
 });
 
-XPCOMUtils.defineLazyServiceGetter(this, "gEnv",
-                                   "@mozilla.org/process/environment;1",
-                                   "nsIEnvironment");
-
 XPCOMUtils.defineLazyGetter(this, "gZipW", function test_gZipW() {
   return Cc["@mozilla.org/zipwriter;1"].
          createInstance(Ci.nsIZipWriter);

toolkit/mozapps/update/updater/archivereader.cpp

@@ -18,7 +18,7 @@
 // These are generated at compile time based on the DER file for the channel
 // being used
 #ifdef MOZ_VERIFY_MAR_SIGNATURE
-#ifdef TEST_UPDATER
+#ifdef UPDATER_XPCSHELL_CERT
 #include "../xpcshellCert.h"
 #else
 #include "primaryCert.h"
@@ -85,7 +85,7 @@ ArchiveReader::VerifySignature()
 #ifndef MOZ_VERIFY_MAR_SIGNATURE
   return OK;
 #else
-#ifdef TEST_UPDATER
+#ifdef UPDATER_XPCSHELL_CERT
   int rv = VerifyLoadedCert(mArchive, xpcshellCertData);
 #else
   int rv = VerifyLoadedCert(mArchive, primaryCertData);

toolkit/mozapps/update/updater/updater-xpcshell/moz.build

@@ -8,6 +8,6 @@ Program('updater-xpcshell')
 
 updater_rel_path = '../'
 DIST_INSTALL = False
-DEFINES['TEST_UPDATER'] = True
+DEFINES['UPDATER_XPCSHELL_CERT'] = True
 include('../updater-common.build')
 FAIL_ON_WARNINGS = True

toolkit/mozapps/update/updater/updater.cpp

@@ -2260,18 +2260,7 @@ UpdateThreadFunc(void *param)
 #endif
 
     if (rv == OK && sStagedUpdate && !sIsOSUpdate) {
-#ifdef TEST_UPDATER
-      // The MOZ_TEST_SKIP_UPDATE_STAGE environment variable prevents copying
-      // the files in dist/bin in the test updater when staging an update since
-      // this can cause tests to timeout.
-      if (getenv("MOZ_TEST_SKIP_UPDATE_STAGE")) {
-        rv = OK;
-      } else {
-        rv = CopyInstallDirToDestDir();
-      }
-#else
       rv = CopyInstallDirToDestDir();
-#endif
     }
 
     if (rv == OK) {

toolkit/mozapps/update/updater/updater.rc

@@ -4,7 +4,7 @@
 
 // Microsoft Visual C++ generated resource script.
 //
-#ifdef TEST_UPDATER
+#ifdef UPDATER_XPCSHELL_CERT
 #include "../resource.h"
 #define MANIFEST_PATH "../updater.exe.manifest"
 #define COMCTL32_MANIFEST_PATH "../updater.exe.comctl32.manifest"