Issue 2693 - Update adblockplus dependency

src/FilterEngine.cpp

 /*
  * 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 116 matching lines @@
   params.push_back(shared_from_this());
   JsValuePtr result = func->Call(params);
   return result->AsBool();
 }
 
 bool Subscription::operator==(const Subscription& subscription) const
 {
   return GetProperty("url")->AsString() == subscription.GetProperty("url")->AsString();
 }
 
-FilterEngine::FilterEngine(JsEnginePtr jsEngine)
+FilterEngine::FilterEngine(JsEnginePtr jsEngine, 
+                           const FilterEngine::Prefs& preconfiguredPrefs)
     : jsEngine(jsEngine), initialized(false), firstRun(false), updateCheckId(0)
 {
   jsEngine->SetEventCallback("_init", std::tr1::bind(&FilterEngine::InitDone,
       this, std::tr1::placeholders::_1));
 
   {
     // Lock the JS engine while we are loading scripts, no timeouts should fire
     // until we are done.
     const JsContext context(jsEngine);
+
+    // Set the preconfigured prefs
+    JsValuePtr preconfiguredPrefsObject = jsEngine->NewObject();
+    for (FilterEngine::Prefs::const_iterator it = preconfiguredPrefs.begin();
+         it != preconfiguredPrefs.end(); it++)
+    {
+      preconfiguredPrefsObject->SetProperty(it->first, it->second);
+    }
+    jsEngine->SetGlobalProperty("_preconfiguredPrefs", preconfiguredPrefsObject);
+    // Load adblockplus scripts
     for (int i = 0; !jsSources[i].empty(); i += 2)
       jsEngine->Evaluate(jsSources[i + 1], jsSources[i]);
   }
 
   // TODO: This should really be implemented via a conditional variable
   while (!initialized)
     ::Sleep(10);
 }
 
 namespace
@@ skipping 283 matching lines @@
 
 
 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2)
 {
   JsValueList params;
   params.push_back(jsEngine->NewValue(v1));
   params.push_back(jsEngine->NewValue(v2));
   JsValuePtr func = jsEngine->Evaluate("API.compareVersions");
   return func->Call(params)->AsInt();
 }