Issue 4931 - add possibility to not send data depending on connection properties

include/AdblockPlus/FilterEngine.h

 /*
  * 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
@@ skipping 204 matching lines @@
 
     /**
      * Callback function returning false when current connection is not
      * allowedConnectionType, e.g. because it is a metered connection.
      */
     typedef std::function<bool(const std::string* allowedConnectionType)> IsConnectionAllowedCallback;
 
     /**
      * FilterEngine creation parameters.
      */
-    struct CreateParameters
+    struct CreationParameters
     {
       /**
        * `AdblockPlus::FilterEngine::Prefs` name - value list of preconfigured
        * prefs.
        */
       Prefs preconfiguredPrefs;
       /**
        * `AdblockPlus::FilterEngine::IsConnectionAllowedCallback` a callback
        * checking whether the request from Adblock Plus should be blocked on
        * the current connection.
        */
-      IsConnectionAllowedCallback isConnectionAllowed;
+      IsConnectionAllowedCallback isConnectionAllowedCallback;
     };
 
     /**
     * Callback type invoked when FilterEngine is created.
     */
     typedef std::function<void(const FilterEnginePtr&)> OnCreatedCallback;
 
     /**
      * Asynchronously constructs FilterEngine.
      * @param jsEngine `JsEngine` instance used to run JavaScript code
      *        internally.
      * @param onCreated A callback which is called when FilterEngine is ready
      *        for use.
      * @param parameters optional creation parameters.
      */
     static void CreateAsync(const JsEnginePtr& jsEngine,
       const OnCreatedCallback& onCreated,
-      const CreateParameters& parameters = CreateParameters());
+      const CreationParameters& parameters = CreationParameters());
 
     /**
      * Synchronous interface to construct FilterEngine. For details see
      * asynchronous version CreateAsync.
      */
     static FilterEnginePtr Create(const JsEnginePtr& jsEngine,
-      const CreateParameters& params = CreateParameters());
+      const CreationParameters& params = CreationParameters());
 
     /**
      * Retrieves the `JsEngine` instance associated with this `FilterEngine`
      * instance.
      */
     JsEnginePtr GetJsEngine() const { return jsEngine; }
 
     /**
      * Checks if this is the first run of the application.
      * @return `true` if the application is running for the first time.
@@ skipping 180 matching lines @@
     /**
      * Stores the value indicating what connection types are allowed, it is
      * passed to CreateParameters::isConnectionAllowed callback.
      * @param value Stored value. nullptr means removing of any previously
      *        stored value.
      */
     void SetAllowedConnectionType(const std::string* value);
 
     /**
       * Retrieves previously stored allowed connection type.
-      * @return Preference value, or `null` if it doesn't exist.
+      * @return Preference value, or `nullptr` if it doesn't exist.
       */
-    JsValuePtr GetAllowedConnectionType();
+    std::unique_ptr<std::string> GetAllowedConnectionType();
 
     /**
      * Compares two version strings in
      * [Mozilla toolkit version format](https://developer.mozilla.org/en/docs/Toolkit_version_format).
      * @param v1 First version string.
      * @param v2 Second version string.
      * @return
      *         - `0` if `v1` and `v2` are identical.
      *         - A negative number if `v1` is less than `v2`.
      *         - A positive number if `v1` is greater than `v2`.
@@ skipping 35 matching lines @@
       const JsValueList& params);
     FilterPtr GetWhitelistingFilter(const std::string& url,
       ContentTypeMask contentTypeMask, const std::string& documentUrl) const;
     FilterPtr GetWhitelistingFilter(const std::string& url,
       ContentTypeMask contentTypeMask,
       const std::vector<std::string>& documentUrls) const;
   };
 }
 
 #endif