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

include/AdblockPlus/JsEngine.h

 /*
  * 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 48 matching lines @@
    * A factory to construct DefaultFileSystem.
    */
   FileSystemPtr CreateDefaultFileSystem();
 
   /**
    * A factory to construct DefaultWebRequest.
    */
   WebRequestPtr CreateDefaultWebRequest();
 
   /**
+   * A factory to construct LogSystem.
+   */
+  LogSystemPtr CreateDefaultLogSystem();
+
+  /**
    * Scope based isolate manager. Creates a new isolate instance on
    * constructing and disposes it on destructing.
    */
   class ScopedV8Isolate
   {
   public:
     ScopedV8Isolate();
     ~ScopedV8Isolate();
     v8::Isolate* Get()
     {
@@ skipping 40 matching lines @@
       friend class JsEngine;
       JsWeakValuesLists::const_iterator iterator;
     };
 
     /**
      * Creates a new JavaScript engine instance.
      * @param appInfo Information about the app.
      * @param timer Implementation of timer.
      * @param fileSystem Implementation of filesystem.
      * @param webRequest Implementation of web request.
+     * @param logSystem Implementation of log system.
      * @return New `JsEngine` instance.
      */
     static JsEnginePtr New(const AppInfo& appInfo = AppInfo(),
       TimerPtr timer = CreateDefaultTimer(),
       FileSystemPtr fileSystem = CreateDefaultFileSystem(),
-      WebRequestPtr webRequest = CreateDefaultWebRequest());
+      WebRequestPtr webRequest = CreateDefaultWebRequest(),
+      LogSystemPtr logSystem = CreateDefaultLogSystem());
 
     /**
      * Registers the callback function for an event.
      * @param eventName Event name. Note that this can be any string - it's a
      *        general purpose event handling mechanism.
      * @param callback Event callback function.
      */
     void SetEventCallback(const std::string& eventName, const EventCallback& callback);
 
     /**
@@ skipping 125 matching lines @@
     /**
      * Sets the synchronous `FileSystem` implementation used for all
      * file I/O. Setting this is optional, the engine will use the
      * implementation created by `CreateDefaultFileSystem()` by
      * default, which might be sufficient.
      * @param The `FileSystem` instance to use.
      */
     void SetFileSystem(const FileSystemSyncPtr& val);
 
     /**
-     * @see `SetLogSystem()`.
+     * Private functionality.
+     * @return The LogSystem implementation.
      */
-    LogSystemPtr GetLogSystem() const;
-
-    /**
-     * Sets the `LogSystem` implementation used for logging (e.g. to handle
-     * `console.log()` calls from JavaScript).
-     * Setting this is optional, the engine will use a `DefaultLogSystem`
-     * instance by default, which might be sufficient.
-     * @param The `LogSystem` instance to use.
-     */
-    void SetLogSystem(const LogSystemPtr& val);
+    LogSystem& GetLogSystem();
 
     /**
      * Sets a global property that can be accessed by all the scripts.
      * @param name Name of the property to set.
      * @param value Value of the property to set.
      */
     void SetGlobalProperty(const std::string& name, const AdblockPlus::JsValue& value);
 
     /**
      * Returns a pointer to associated v8::Isolate.
      */
     v8::Isolate* GetIsolate()
     {
       return isolate.Get();
     }
 
     /**
      * Notifies JS engine about critically low memory what should cause a
      * garbage collection.
      */
     void NotifyLowMemory();
   private:
     void CallTimerTask(const JsWeakValuesID& timerParamsID);
 
-    explicit JsEngine(TimerPtr timer, FileSystemPtr fileSystem, WebRequestPtr webRequest);
+    explicit JsEngine(TimerPtr timer, FileSystemPtr fileSystem, WebRequestPtr webRequest, LogSystemPtr logSystem);
 
     JsValue GetGlobalObject();
 
     /// Isolate must be disposed only after disposing of all objects which are
     /// using it.
     ScopedV8Isolate isolate;
 
     FileSystemPtr fileSystem;
     LogSystemPtr logSystem;
     std::unique_ptr<v8::Global<v8::Context>> context;
     EventMap eventCallbacks;
     std::mutex eventCallbacksMutex;
     JsWeakValuesLists jsWeakValuesLists;
     std::mutex jsWeakValuesListsMutex;
     TimerPtr timer;
     WebRequestPtr webRequest;
   };
 }
 
 #endif