Issue 2693 - Update adblockplus dependency

include/AdblockPlus/FilterEngine.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 168 matching lines @@
     /**
      * Callback type invoked when the filters change.
      * The first parameter is the action event code (see
      * [FilterNotifier.triggerListeners](https://adblockplus.org/jsdoc/adblockplus/symbols/FilterNotifier.html#.triggerListeners)
      * for the full list).
      * The second parameter is the filter/subscription object affected, if any.
      */
     typedef std::tr1::function<void(const std::string&, const JsValuePtr)> FilterChangeCallback;
 
     /**
+     * Container of name-value pairs representing a set of preferences.
+     */
+    typedef std::map<std::string, AdblockPlus::JsValuePtr> Prefs;
+
+    /**
      * Callback type invoked when a new notification should be shown.
      * The parameter is the Notification object to be shown.
      */
     typedef std::tr1::function<void(const NotificationPtr&)> ShowNotificationCallback;
 
     /**
      * Constructor.
      * @param jsEngine `JsEngine` instance used to run JavaScript code
      *        internally.
-     */
-    explicit FilterEngine(JsEnginePtr jsEngine);
+     * @param preconfiguredPrefs `AdblockPlus::FilterEngine::Prefs`
+     *        name-value list of preconfigured prefs.
+     */
+    explicit FilterEngine(JsEnginePtr jsEngine, 
+        const Prefs& preconfiguredPrefs = Prefs()
+      );
 
     /**
      * 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 191 matching lines @@
     void UpdateAvailable(UpdateAvailableCallback callback, JsValueList& params);
     void UpdateCheckDone(const std::string& eventName,
                          UpdateCheckDoneCallback callback, JsValueList& params);
     void FilterChanged(FilterChangeCallback callback, JsValueList& params);
     void ShowNotification(const ShowNotificationCallback& callback,
       const JsValueList& params);
   };
 }
 
 #endif