Issue 4938 - fix race conditions and get rid of hacks related to DefaultFileSystem

src/JsEngine.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 67 matching lines @@
   }
 }
 
 using namespace AdblockPlus;
 
 TimerPtr AdblockPlus::CreateDefaultTimer()
 {
   return TimerPtr(new DefaultTimer());
 }
 
-FileSystemPtr AdblockPlus::CreateDefaultFileSystem()
+FileSystemPtr AdblockPlus::CreateDefaultFileSystem(const Scheduler& scheduler)
 {
-  return FileSystemPtr(new DefaultFileSystem(std::unique_ptr<DefaultFileSystemSync>(new DefaultFileSystemSync())));
+  return FileSystemPtr(new DefaultFileSystem(scheduler, std::unique_ptr<DefaultFileSystemSync>(new DefaultFileSystemSync())));
 }
 
 WebRequestPtr AdblockPlus::CreateDefaultWebRequest(const Scheduler& scheduler)
 {
   return WebRequestPtr(new DefaultWebRequest(scheduler, std::unique_ptr<DefaultWebRequestSync>(new DefaultWebRequestSync())));
 }
 
 LogSystemPtr AdblockPlus::CreateDefaultLogSystem()
 {
   return LogSystemPtr(new DefaultLogSystem());
@@ skipping 59 matching lines @@
   , timer(std::move(timer))
   , webRequest(std::move(webRequest))
   , logSystem(std::move(logSystem))
 {
 }
 
 AdblockPlus::JsEnginePtr AdblockPlus::JsEngine::New(const AppInfo& appInfo,
   TimerPtr timer, FileSystemPtr fileSystem, WebRequestPtr webRequest, LogSystemPtr logSystem)
 {
   JsEnginePtr result(new JsEngine(timer ? std::move(timer) : CreateDefaultTimer(),
-    fileSystem ? std::move(fileSystem) : CreateDefaultFileSystem(),
+    fileSystem ? std::move(fileSystem) : CreateDefaultFileSystem(::DummyScheduler),
     webRequest ? std::move(webRequest) : CreateDefaultWebRequest(::DummyScheduler),
     logSystem ? std::move(logSystem) : CreateDefaultLogSystem()));
 
   const v8::Locker locker(result->GetIsolate());
   const v8::Isolate::Scope isolateScope(result->GetIsolate());
   const v8::HandleScope handleScope(result->GetIsolate());
 
   result->context.reset(new v8::Global<v8::Context>(result->GetIsolate(),
     v8::Context::New(result->GetIsolate())));
   auto global = result->GetGlobalObject();
@@ skipping 160 matching lines @@
 {
   return *logSystem;
 }
 
 void AdblockPlus::JsEngine::SetGlobalProperty(const std::string& name,
                                               const AdblockPlus::JsValue& value)
 {
   auto global = GetGlobalObject();
   global.SetProperty(name, value);
 }