Avoid redundant statement branching in safeToSecureCookie() (EFForg#17736)

Chan Chak Shing · zoracon · commit 5ef57c31b376 · 2019-04-15T23:23:18.000-07:00
* Avoid redundant statement branching in safeToSecureCookie()
* Use ES6 let and avoid unnecessary assignments
* Reverse using ES6 let to simplify the changes
* Update rules.js
diff --git a/chromium/background-scripts/rules.js b/chromium/background-scripts/rules.js
@@ -626,11 +626,10 @@ RuleSets.prototype = {
     }
 
     var potentiallyApplicable = this.potentiallyApplicableRulesets(hostname);
-    for (let ruleset of potentiallyApplicable) {
+    for (const ruleset of potentiallyApplicable) {
       if (ruleset.cookierules !== null && ruleset.active) {
-        for (let cookierules of ruleset.cookierules) {
-          var cr = cookierules;
-          if (cr.host_c.test(cookie.domain) && cr.name_c.test(cookie.name)) {
+        for (const cookierule of ruleset.cookierules) {
+          if (cookierule.host_c.test(cookie.domain) && cookierule.name_c.test(cookie.name)) {
             return ruleset;
           }
         }
@@ -683,10 +682,7 @@ RuleSets.prototype = {
     util.log(util.INFO, "Testing securecookie applicability with " + test_uri);
     var potentiallyApplicable = this.potentiallyApplicableRulesets(domain);
     for (let ruleset of potentiallyApplicable) {
-      if (!ruleset.active) {
-        continue;
-      }
-      if (ruleset.apply(test_uri)) {
+      if (ruleset.active && ruleset.apply(test_uri)) {
         util.log(util.INFO, "Cookie domain could be secured.");
         this.cookieHostCache.set(domain, true);
         return true;
