Issue #4711 - Rewrite legacy thread facilities

src/WebRequestJsObject.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <map>
 #include <AdblockPlus/JsValue.h>
 #include <AdblockPlus/WebRequest.h>
 
 #include "JsContext.h"
-#include "Thread.h"
 #include "Utils.h"
+#include "Scheduler.h"
 #include "WebRequestJsObject.h"
 
 namespace
 {
-  class WebRequestThread : public AdblockPlus::Thread
+  class WebRequestTask
   {
   public:
-    WebRequestThread(AdblockPlus::JsEnginePtr jsEngine, AdblockPlus::JsValueList& arguments)
-        : Thread(true), jsEngine(jsEngine), url(arguments[0]->AsString())
+    WebRequestTask(AdblockPlus::JsEnginePtr jsEngine, AdblockPlus::JsValueList& arguments)
+        : jsEngine(jsEngine), url(arguments[0]->AsString())
     {
       if (!url.length())
         throw std::runtime_error("Invalid string passed as first argument to GET");
 
       {
         AdblockPlus::JsValuePtr headersObj = arguments[1];
         if (!headersObj->IsObject())
           throw std::runtime_error("Second argument to GET must be an object");
 
         std::vector<std::string> properties = headersObj->GetOwnPropertyNames();
         for (std::vector<std::string>::iterator it = properties.begin();
             it != properties.end(); ++it)
         {
           std::string header = *it;
           std::string headerValue = headersObj->GetProperty(header)->AsString();
           if (header.length() && headerValue.length())
             headers.push_back(std::pair<std::string, std::string>(header, headerValue));
         }
       }
 
       callback = arguments[2];
       if (!callback->IsFunction())
         throw std::runtime_error("Third argument to GET must be a function");
     }
 
-    void Run()
+    void operator()()
     {
       AdblockPlus::ServerResponse result = jsEngine->GetWebRequest()->GET(url, headers);
 
       AdblockPlus::JsContext context(jsEngine);
 
       AdblockPlus::JsValuePtr resultObject = jsEngine->NewObject();
       resultObject->SetProperty("status", result.status);
       resultObject->SetProperty("responseStatus", result.responseStatus);
       resultObject->SetProperty("responseText", result.responseText);
 
@@ skipping 12 matching lines @@
 
   private:
     AdblockPlus::JsEnginePtr jsEngine;
     std::string url;
     AdblockPlus::HeaderList headers;
     AdblockPlus::JsValuePtr callback;
   };
 
   v8::Handle<v8::Value> GETCallback(const v8::Arguments& arguments)
   {
-    WebRequestThread* thread;
+    std::shared_ptr<WebRequestTask> thread;
     try
     {
       AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
       AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
       if (converted.size() != 3u)
         throw std::runtime_error("GET requires exactly 3 arguments");
-      thread = new WebRequestThread(jsEngine, converted);
+      thread = std::make_shared<WebRequestTask>(jsEngine, converted);
     }
     catch (const std::exception& e)
     {
       using AdblockPlus::Utils::ToV8String;
       v8::Isolate* isolate = arguments.GetIsolate();
       return v8::ThrowException(ToV8String(isolate, e.what()));
     }
-    thread->Start();
+    AdblockPlus::Scheduler::StartImmediatelyInSingleUseThread(AdblockPlus::MakeHeapFunction(thread));
     return v8::Undefined();
   }
 }
 
 AdblockPlus::JsValuePtr AdblockPlus::WebRequestJsObject::Setup(
     AdblockPlus::JsEnginePtr jsEngine, AdblockPlus::JsValuePtr obj)
 {
   obj->SetProperty("GET", jsEngine->NewCallback(::GETCallback));
   return obj;
 }