Issue 4832 - remove API allowing changing of LogSystem after Initialization of JsEngine

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 71 matching lines @@
 FileSystemPtr AdblockPlus::CreateDefaultFileSystem()
 {
   return FileSystemPtr(new DefaultFileSystem(std::make_shared<DefaultFileSystemSync>()));
 }
 
 WebRequestPtr AdblockPlus::CreateDefaultWebRequest()
 {
   return WebRequestPtr(new DefaultWebRequest(std::unique_ptr<DefaultWebRequestSync>(new DefaultWebRequestSync())));
 }
 
+LogSystemPtr AdblockPlus::CreateDefaultLogSystem()
+{
+  return LogSystemPtr(new DefaultLogSystem());
+}
+
 AdblockPlus::ScopedV8Isolate::ScopedV8Isolate()
 {
   V8Initializer::Init();
   v8::Isolate::CreateParams isolateParams;
   isolateParams.array_buffer_allocator = v8::ArrayBuffer::Allocator::NewDefaultAllocator();
   isolate = v8::Isolate::New(isolateParams);
 }
 
 AdblockPlus::ScopedV8Isolate::~ScopedV8Isolate()
 {
@@ skipping 35 matching lines @@
 {
   auto timerParams = TakeJsValues(timerParamsID);
   JsValue callback = std::move(timerParams[0]);
 
   timerParams.erase(timerParams.begin()); // remove callback placeholder
   timerParams.erase(timerParams.begin()); // remove timeout param
   callback.Call(timerParams);
 }
 
 AdblockPlus::JsEngine::JsEngine(TimerPtr timer, FileSystemPtr fileSystem,
-  WebRequestPtr webRequest)
+  WebRequestPtr webRequest, LogSystemPtr logSystem)
   : fileSystem(std::move(fileSystem))
-  , logSystem(new DefaultLogSystem())
   , 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)
+  TimerPtr timer, FileSystemPtr fileSystem, WebRequestPtr webRequest, LogSystemPtr logSystem)
 {
   JsEnginePtr result(new JsEngine(std::move(timer),
                                   std::move(fileSystem),
-                                  std::move(webRequest)));
+                                  std::move(webRequest),
+                                  std::move(logSystem)));
 
   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();
   AdblockPlus::GlobalJsObject::Setup(*result, appInfo, global);
   return result;
@@ skipping 155 matching lines @@
 }
 
 void AdblockPlus::JsEngine::SetFileSystem(const AdblockPlus::FileSystemSyncPtr& val)
 {
   if (!val)
     throw std::runtime_error("FileSystem cannot be null");
 
   fileSystem.reset(new DefaultFileSystem(val));
 }
 
-AdblockPlus::LogSystemPtr AdblockPlus::JsEngine::GetLogSystem() const
+AdblockPlus::LogSystem& AdblockPlus::JsEngine::GetLogSystem()
 {
-  return logSystem;
+  return *logSystem;
 }
 
-void AdblockPlus::JsEngine::SetLogSystem(const AdblockPlus::LogSystemPtr& val)
-{
-  if (!val)
-    throw std::runtime_error("LogSystem cannot be null");
-
-  logSystem = val;
-}
-
-
 void AdblockPlus::JsEngine::SetGlobalProperty(const std::string& name,
                                               const AdblockPlus::JsValue& value)
 {
   auto global = GetGlobalObject();
   global.SetProperty(name, value);
 }