Bug 1340195 - Remove e10s block for LastPass. r=mconley draft
authorFelipe Gomes <felipc@gmail.com>
Thu, 16 Feb 2017 14:52:56 -0200
changeset 485408 8b3646bced91b90d2e2c76c6f8af4d1cb27f826b
parent 485407 25929185c46777cf4e9eb3e9aad2f8a8a227178f
child 546008 55a6b45db4b8e94e47d188fe717656a25d291b69
push id45722
push userfelipc@gmail.com
push dateThu, 16 Feb 2017 16:53:51 +0000
reviewersmconley
bugs1340195
milestone54.0a1
Bug 1340195 - Remove e10s block for LastPass. r=mconley MozReview-Commit-ID: 3EiKLNsUGYR
browser/extensions/e10srollout/bootstrap.js
browser/extensions/e10srollout/install.rdf.in
--- a/browser/extensions/e10srollout/bootstrap.js
+++ b/browser/extensions/e10srollout/bootstrap.js
@@ -68,19 +68,17 @@ function defineCohort() {
   if (updateChannel in ADDON_ROLLOUT_POLICY) {
     addonPolicy = ADDON_ROLLOUT_POLICY[updateChannel];
     Preferences.set(PREF_E10S_ADDON_POLICY, addonPolicy);
     // This is also the proper place to set the blocklist pref
     // in case it is necessary.
 
     Preferences.set(PREF_E10S_ADDON_BLOCKLIST,
                     // bug 1185672 - Tab Mix Plus
-                    "{dc572301-7619-498c-a57d-39143191b318};" +
-                    // bug 1332692 - LastPass
-                    "support@lastpass.com;");
+                    "{dc572301-7619-498c-a57d-39143191b318};");
   } else {
     Preferences.reset(PREF_E10S_ADDON_POLICY);
   }
 
   let userOptedOut = optedOut();
   let userOptedIn = optedIn();
   let disqualified = (Services.appinfo.multiprocessBlockPolicy != 0);
   let testGroup = (getUserSample() < TEST_THRESHOLD[updateChannel]);
--- a/browser/extensions/e10srollout/install.rdf.in
+++ b/browser/extensions/e10srollout/install.rdf.in
@@ -5,17 +5,17 @@
 
 #filter substitution
 
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>e10srollout@mozilla.org</em:id>
-    <em:version>1.9</em:version>
+    <em:version>1.10</em:version>
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>
 
     <!-- Target Application this theme can install into,
         with minimum and maximum supported versions. -->
     <em:targetApplication>
       <Description>