imported patch 7-2.diff
authorBrian R. Bondy <netzen@gmail.com>
Thu, 26 Feb 2015 23:45:40 -0500
changeset 491385 74e980a7c5aa4f2bd425bd304760b385aeaef9ba
parent 491384 098bd2e6461eb22b2bdc0b0e9447923a1e47dcb9
child 491386 1413468cc54bfa1542cce237ca4439298b9b806a
push id47343
push userbmo:dothayer@mozilla.com
push dateWed, 01 Mar 2017 22:58:58 +0000
milestone38.0a1
imported patch 7-2.diff
toolkit/components/maintenanceservice/registrycertificates.cpp
toolkit/mozapps/update/tests/unit_aus_update/head_update.js
--- a/toolkit/components/maintenanceservice/registrycertificates.cpp
+++ b/toolkit/components/maintenanceservice/registrycertificates.cpp
@@ -53,17 +53,18 @@ DoesBinaryMatchAllowedCertificates(LPCWS
     retCode = RegOpenKeyExW(HKEY_LOCAL_MACHINE, 
                             TEST_ONLY_FALLBACK_KEY_PATH, 0,
                             KEY_READ | KEY_WOW64_64KEY, &baseKeyRaw);
     if (retCode != ERROR_SUCCESS) {
       LOG_WARN(("Could not open fallback key.  (%d)", retCode));
       return FALSE;
     } else if (allowFallbackKeySkip) {
       LOG_WARN(("Fallback key present, skipping VerifyCertificateTrustForFile "
-                "check and the cert attribute registry matching check."));
+                "check and the certificate attribute registry matching "
+                "check."));
       return TRUE;
     }
   }
   nsAutoRegKey baseKey(baseKeyRaw);
 
   // Get the number of subkeys.
   DWORD subkeyCount = 0;
   retCode = RegQueryInfoKeyW(baseKey, nullptr, nullptr, nullptr, &subkeyCount,
--- a/toolkit/mozapps/update/tests/unit_aus_update/head_update.js
+++ b/toolkit/mozapps/update/tests/unit_aus_update/head_update.js
@@ -1248,17 +1248,17 @@ function getTestDirPath() {
  * directory.
  *
  * @param   aRelPath (optional)
  *          The relative path to the file or directory to get from the root of
  *          the test's data directory. If not specified the test's data
  *          directory will be returned.
  * @param   aAllowNonExists (optional)
  *          Whether or not to throw an error if the path exists.
- *          If not specified, the false is used.
+ *          If not specified, then false is used.
  * @return  The nsIFile for the file in the test data directory.
  * @throws  If the file or directory does not exist.
  */
 function getTestDirFile(aRelPath, aAllowNonExists) {
   let relpath = getTestDirPath() + (aRelPath ? aRelPath : "");
   return do_get_file(relpath, !!aAllowNonExists);
 }
 
@@ -1745,18 +1745,16 @@ function setupAppFiles() {
       do_throw(e);
     }
   }
 
   // Required files for the application or the test that aren't listed in the
   // dependentlibs.list file.
   let appFiles = [ { relPath  : FILE_APP_BIN,
                      inGreDir : false },
-                   { relPath  : FILE_UPDATER_BIN,
-                     inGreDir : false },
                    { relPath  : FILE_APPLICATION_INI,
                      inGreDir : true },
                    { relPath  : "dependentlibs.list",
                      inGreDir : true } ];
 
   // On Linux the updater.png must also be copied
   if (IS_UNIX && !IS_MACOSX) {
     appFiles.push( { relPath  : "icons/updater.png",
@@ -1778,21 +1776,17 @@ function setupAppFiles() {
     hasMore = istream.readLine(line);
     appFiles.push( { relPath  : line.value,
                      inGreDir : false } );
   } while(hasMore);
 
   istream.close();
 
   appFiles.forEach(function CMAF_FLN_FE(aAppFile) {
-    // We use the updater binary after this loop from the data dir instead
-    // because it has the xpcshell certs.
-    if (aAppFile.relPath !== FILE_UPDATER_BIN) {
-      copyFileToTestAppDir(aAppFile.relPath, aAppFile.inGreDir);
-    }
+    copyFileToTestAppDir(aAppFile.relPath, aAppFile.inGreDir);
   });
 
   // Copy the xpcshell updater binary
   let updater = getTestDirFile("updater.app", true);
   if (!updater.exists()) {
     updater = getTestDirFile(FILE_UPDATER_BIN);
     if (!updater.exists()) {
       do_throw("Unable to find updater binary!");