Issue 4612 - enable AA on first run and make automatic adding of any subscription optional

test/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 142 matching lines @@
         {
           if (fileSystem->Stat(path).exists)
             fileSystem->Remove(path);
           return true;
         }
         catch (...)
         {
           return false;
         }
       };
-      int i = 100;
+      int i = 5;
       while ((i-- > 0 && weakJsEngine.lock()) || !safeRemove())
         std::this_thread::sleep_for(std::chrono::seconds(2));
     }
   };
 }
 
 TEST_F(FilterEngineTest, FilterCreation)
 {
   AdblockPlus::FilterPtr filter1 = filterEngine->GetFilter("foo");
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, filter1->GetType());
@@ skipping 408 matching lines @@
 
   ASSERT_TRUE(filterEngine->IsElemhideWhitelisted(
       "http://example.com",
       documentUrls1));
 
   ASSERT_FALSE(filterEngine->IsElemhideWhitelisted(
       "http://example.co.uk",
       documentUrls1));
 }
 
-TEST(NewFilterEngineTest, MemoryLeak_NoCircularReferences)
-{
-  std::weak_ptr<AdblockPlus::JsEngine> weakJsEngine;
-  {
-    auto jsEngine = AdblockPlus::JsEngine::New();
-    jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem()));
-    jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(new LazyWebRequest()));
-    jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new LazyLogSystem()));
-    auto filterEngine = FilterEnginePtr(new AdblockPlus::FilterEngine(jsEngine));
-  }
-  EXPECT_FALSE(weakJsEngine.lock());
-}
-
 TEST_F(FilterEngineWithFreshFolder, LangAndAASubscriptionsAreChosenOnFirstRun)
 {
   AppInfo appInfo;
   appInfo.locale = "zh";
   const std::string langSubscriptionUrl = "https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt";
   auto jsEngine = createJsEngine(appInfo);
   auto filterEngine = FilterEnginePtr(new AdblockPlus::FilterEngine(jsEngine));
   const auto subscriptions = filterEngine->GetListedSubscriptions();
   ASSERT_EQ(2u, subscriptions.size());
   const auto aaUrl = filterEngine->GetPref("subscriptions_exceptionsurl")->AsString();
@@ skipping 17 matching lines @@
 
 TEST_F(FilterEngineWithFreshFolder, DisableSubscriptionsAutoSelectOnFirstRun)
 {
   auto jsEngine = createJsEngine();
   FilterEngine::Prefs preSettings;
   preSettings["first_run_subscription_auto_select"] = jsEngine->NewValue(false);
   auto filterEngine = FilterEnginePtr(new AdblockPlus::FilterEngine(jsEngine, preSettings));
   const auto subscriptions = filterEngine->GetListedSubscriptions();
   EXPECT_EQ(0u, subscriptions.size());
 }