Merge pull request EFForg#1341 from semenko/chrome-nits

jsha · jsha · commit 9fbb9c2da01b · 2015-04-03T10:02:23.000-07:00
[Chrome] A few cleanup nits
diff --git a/chromium/background.js b/chromium/background.js
@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Fetch and parse XML to be loaded as RuleSets.
  */
diff --git a/chromium/rules.js b/chromium/rules.js
@@ -45,7 +45,7 @@ RuleSet.prototype = {
         return null;
       }
     }
-    // If a rulset has a match_rule and it fails, go no further
+    // If a ruleset has a match_rule and it fails, go no further
     if (this.ruleset_match_c && !this.ruleset_match_c.test(urispec)) {
       log(VERB, "ruleset_match_c excluded " + urispec);
       return null;
@@ -290,24 +290,15 @@ RuleSets.prototype = {
     // If we passed that test, make up a random URL on the domain, and see if
     // we would HTTPSify that.
 
-    try {
-      var nonce_path = "/" + Math.random().toString();
-      nonce_path = nonce_path + nonce_path;
-      var test_uri = "http://" + domain + nonce_path;
-    } catch (e) {
-      log(WARN, "explosion in safeToSecureCookie for " + domain + "\n"
-                      + "(" + e + ")");
-      this.cookieHostCache.set(domain, false);
-      return false;
-    }
+    var nonce_path = "/" + Math.random().toString();
+    var test_uri = "http://" + domain + nonce_path + nonce_path;
 
     log(INFO, "Testing securecookie applicability with " + test_uri);
     var rs = this.potentiallyApplicableRulesets(domain);
     for (var i = 0; i < rs.length; ++i) {
       if (!rs[i].active) continue;
-      var rewrite = rs[i].apply(test_uri);
-      if (rewrite) {
-        log(INFO, "Cookie domain could be secured: " + rewrite);
+      if (rs[i].apply(test_uri)) {
+        log(INFO, "Cookie domain could be secured.");
         this.cookieHostCache.set(domain, true);
         return true;
       }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+"use strict";`
`1`	`2`	`/**`
`2`	`3`	`* Fetch and parse XML to be loaded as RuleSets.`
`3`	`4`	`*/`