Bug 1231784 - Fix toolkit/mozapps/update/chrome tests, r=rstrong

--HG--
extra : commitid : AmuYYOjXtDr
extra : rebase_source : a2a10ff821cd60f6a430820b028535e4312c1e12
extra : amend_source : ea6738fac9fa151c5a1bf1a8a0c4b4a3b1670e43

testing/mochitest/install.rdf

@@ -12,7 +12,8 @@
       <Description>
         <em:id>toolkit@mozilla.org</em:id>
 #expand        <em:minVersion>__MOZILLA_VERSION_U__</em:minVersion>
-#expand        <em:maxVersion>__MOZILLA_VERSION_U__</em:maxVersion>
+               <!-- Set to * so toolkit/mozapps/update/chrome tests pass. -->
+               <em:maxVersion>*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <!-- Front End MetaData -->

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

@@ -1295,17 +1295,18 @@ function setupAddons(aCallback) {
   // tests.
   AddonManager.getAllAddons(function(aAddons) {
     let disabledAddons = [];
+    let harnessAddons = ["special-powers@mozilla.org", "mochikit@mozilla.org"];
     aAddons.forEach(function(aAddon) {
       // If an addon's type equals plugin it is skipped since
       // checking plugins compatibility information isn't supported at this
       // time (also see bug 566787). Also, SCOPE_APPLICATION add-ons are
       // excluded by app update so there is no reason to disable them.
-      // Specialpowers is excluded as the test harness requires it to run
-      // the tests.
+      // Specialpowers and mochikit are excluded as the test harness requires
+      // them to run the tests.
       if (aAddon.type != "plugin" && !aAddon.appDisabled &&
           !aAddon.userDisabled &&
           aAddon.scope != AddonManager.SCOPE_APPLICATION &&
-          aAddon.id != "special-powers@mozilla.org") {
+          harnessAddons.indexOf(aAddon.id) == -1) {
         disabledAddons.push(aAddon);
         aAddon.userDisabled = true;
       }