Issue 5182, 4688 - improve IsSubscriptionDowloadAllowedCallback and corresponding tests

src/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 207 matching lines @@
 
 void FilterEngine::CreateAsync(const JsEnginePtr& jsEngine,
   const FilterEngine::OnCreatedCallback& onCreated,
   const FilterEngine::CreationParameters& params)
 {
   FilterEnginePtr filterEngine(new FilterEngine(jsEngine));
   {
     // TODO: replace weakFilterEngine by this when it's possible to control the
     // execution time of the asynchronous part below.
     std::weak_ptr<FilterEngine> weakFilterEngine = filterEngine;
-    auto isConnectionAllowedCallback = params.isConnectionAllowedCallback;
-    jsEngine->SetEventCallback("_isSubscriptionDownloadAllowed", [weakFilterEngine, isConnectionAllowedCallback](JsValueList&& params){
+    auto isSubscriptionDowloadAllowedCallback = params.isSubscriptionDowloadAllowedCallback;
+    jsEngine->SetEventCallback("_isSubscriptionDownloadAllowed", [weakFilterEngine, isSubscriptionDowloadAllowedCallback](JsValueList&& params){
       auto filterEngine = weakFilterEngine.lock();
       if (!filterEngine)
         return;
       auto jsEngine = filterEngine->GetJsEngine();
 
       // param[0] - nullable string Prefs.allowed_connection_type
       // param[1] - function(Boolean)
       bool areArgumentsValid = params.size() == 2 && (params[0].IsNull() || params[0].IsString()) && params[1].IsFunction();
       assert(areArgumentsValid && "Invalid argument: there should be two args and the second one should be a function");
       if (!areArgumentsValid)
         return;
-      if (!isConnectionAllowedCallback)
+      if (!isSubscriptionDowloadAllowedCallback)
       {
         params[1].Call(jsEngine->NewValue(true));
         return;
       }
       auto valuesID = jsEngine->StoreJsValues(params);
       auto callJsCallback = [weakFilterEngine, valuesID](bool isAllowed)
       {
         auto filterEngine = weakFilterEngine.lock();
         if (!filterEngine)
           return;
         auto jsEngine = filterEngine->GetJsEngine();
         auto jsParams = jsEngine->TakeJsValues(valuesID);
         jsParams[1].Call(jsEngine->NewValue(isAllowed));
       };
-      std::shared_ptr<std::string> allowedConnectionType = params[0].IsString() ? std::make_shared<std::string>(params[0].AsString()) : nullptr;
-      // temporary hack with thread:
-      std::thread([isConnectionAllowedCallback, allowedConnectionType, callJsCallback]
-      {
-        callJsCallback(isConnectionAllowedCallback(allowedConnectionType.get()));
-      }).detach();
+      std::string allowedConnectionType = params[0].IsString() ? params[0].AsString() : std::string();
+      isSubscriptionDowloadAllowedCallback(params[0].IsString() ? &allowedConnectionType : nullptr, callJsCallback);
     });
   }
   
   jsEngine->SetEventCallback("_init", [jsEngine, filterEngine, onCreated](JsValueList&& params)
   {
     filterEngine->firstRun = params.size() && params[0].AsBool();
     onCreated(filterEngine);
     jsEngine->RemoveEventCallback("_init");
   });
 
@@ skipping 358 matching lines @@
     FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parentUrl);
     if (filter)
     {
       return filter;
     }
     currentUrl = parentUrl;
   }
   while (urlIterator != documentUrls.end());
   return FilterPtr();
 }