Issue #4692, #3595 - Stop sleeping in the implementation of `SetTimeout`

src/JsEngine.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 <AdblockPlus.h>
 #include "FileSystemJsObject.h"
 #include "GlobalJsObject.h"
 #include "JsContext.h"
 #include "JsEngineInternal.h"
 #include "JsEngineTransition.h"
 #include "JsError.h"
+#include "Timeout.h"
 #include "Utils.h"
 #include "WebRequestJsObject.h"
 
 const ImmediateSingleUseThreadType ImmediateSingleUseThread = {};
 
 namespace
 {
   v8::Handle<v8::Script> CompileScript(v8::Isolate* isolate,
     const std::string& source, const std::string& filename)
   {
@@ skipping 335 matching lines @@
   auto global = GetGlobalObject();
   if (!global)
     throw std::runtime_error("Global object cannot be null");
   global->SetProperty(name, value);
 }
 
 void JsEngineInternal::ScheduleTaskInternal(std::shared_ptr<TaskFunctionInterface>&& body)
 {
   // The present version of the scheduler only does immediate and single-use
   // It does not, however, detach threads like the legacy thread behavior did.
-  scheduler.Run(Task(this, std::move(body)));
+  scheduler.Run(std::forward<std::shared_ptr<TaskFunctionInterface>>(body),
+    shared_from_this());
 }
 
 void JsEngineInternal::WaitForQuietScheduler()
 {
+  scheduler.ShutDown();
   scheduler.JoinAll();
 }
 
 JsEngineInternal* ToInternal(AdblockPlus::JsEnginePtr p)
 {
   return static_cast<JsEngineInternal*>(p.get());
 }
 
 JsEngineInternal* ToInternal(AdblockPlus::JsEngine* p)
 {
   return static_cast<JsEngineInternal*>(p);
 }