Bug 1404098 - Don't disable multi for extensions. r=krizsa

Now that the addons code will refuse to allow any non-webextension that hasn't
been vetted to work with e10s-multi, we can allow all extensions in the
rollout addon.

MozReview-Commit-ID: L8RVJDTo7Ir

--HG--
extra : rebase_source : 855f34edb617ed2a55d4e8742dfdc3ad0b8d908a

browser/extensions/e10srollout/bootstrap.js

@@ -21,20 +21,17 @@ const TEST_THRESHOLD = {
 // If a user qualifies for the e10s-multi experiement, this is how many
 // content processes to use and whether to allow addons for the experiment.
 const MULTI_EXPERIMENT = {
-  "beta": { buckets: { 4: 1, }, // 4 processes: 100%
+  "beta": { buckets: { 4: 1 }, // 4 processes: 100%
 
-            // When on the "beta" channel, getAddonsDisqualifyForMulti
-            // will return true if any addon installed is not a web extension.
-            // Therefore, this returns true if and only if all addons
-            // installed are web extensions or if no addons are installed
-            // at all.
-            addonsDisableExperiment(prefix) { return getAddonsDisqualifyForMulti(); } },
+            // The extensions code only allows webextensions and legacy-style
+            // extensions that have been verified to work with multi.
+            // Therefore, we can allow all extensions.
+            addonsDisableExperiment(prefix) { return false; } },
 
   "release": { buckets: { 4: 1 }, // 4 processes: 100%
 
-               // See above for an explanation of this: we only allow users
-               // with no extensions or users with WebExtensions.
-               addonsDisableExperiment(prefix) { return getAddonsDisqualifyForMulti(); } }
+               // See the comment above the "beta" addonsDisableExperiment.
+               addonsDisableExperiment(prefix) { return false; } }
 };
 
 const ADDON_ROLLOUT_POLICY = {

browser/extensions/e10srollout/install.rdf.in

@@ -10,7 +10,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>e10srollout@mozilla.org</em:id>
-    <em:version>3.00</em:version>
+    <em:version>3.05</em:version>
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>