Issue 6699 - Support the "circumvention" filter list as default subscription

lib/subscriptionInit.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 94 matching lines @@
   let matchCount = 0;
   for (let subscription of subscriptions)
   {
     let prefixes = subscription.getAttribute("prefixes");
     let prefix = prefixes && prefixes.split(",").find(
       lang => new RegExp("^" + lang + "\\b").test(Utils.appLocale)
     );
 
     let subscriptionType = subscription.getAttribute("type");
 
-    if (subscriptionType in ["ads", "circumvention"] &&
+    if ((subscriptionType == "ads" || subscriptionType == "circumvention") &&
         !selectedItem[subscriptionType])
       selectedItem[subscriptionType] = subscription;
 
     if (prefix)
     {
       // The "ads" subscription is the one driving the selection.
       if (subscriptionType == "ads")
       {
         if (!selectedPrefix || selectedPrefix.length < prefix.length)
         {
@@ skipping 87 matching lines @@
   // Add default ad blocking subscription (e.g. EasyList)
   if (shouldAddDefaultSubscription())
   {
     return fetch("subscriptions.xml")
       .then(response => response.text())
       .then(text =>
       {
         let doc = new DOMParser().parseFromString(text, "application/xml");
         let nodes = doc.getElementsByTagName("subscription");
 
-        let subs = chooseFilterSubscriptions(nodes);

[Manish Jethani, 2018/06/14 05:07:34]

Just a thought: Maybe a good idea to rename `subs` to `defaultSubscriptions`?
Not sure.

[hub, 2018/06/14 19:59:57]

Done.

-        if (subs)
+        let defaultSubscriptions = chooseFilterSubscriptions(nodes);
+        if (defaultSubscriptions)
         {
-          for (let name in subs)
+          for (let name in defaultSubscriptions)
           {
-            let node = subs[name];
+            let node = defaultSubscriptions[name];
             if (!node)
               continue;
 
             let url = node.getAttribute("url");
             if (url)
             {
               let subscription = Subscription.fromURL(url);
               subscription.disabled = false;
               subscription.title = node.getAttribute("title");
               subscription.homepage = node.getAttribute("homepage");
@@ skipping 85 matching lines @@
  *
  * @param {function} callback
  */
 exports.setSubscriptionsCallback = callback =>
 {
   subscriptionsCallback = callback;
 };
 
 // Exports for tests only
 exports.chooseFilterSubscriptions = chooseFilterSubscriptions;