Issue 1557 - Update to the recent libadblockplus to reduce additional updates in the logic later.

src/plugin/AdblockPlusClient.h

Index: src/plugin/AdblockPlusClient.h
===================================================================
--- a/src/plugin/AdblockPlusClient.h
+++ b/src/plugin/AdblockPlusClient.h
@@ -6,6 +6,7 @@
 #include "PluginClientBase.h"
 #include "../shared/Communication.h"
 #include "../shared/CriticalSection.h"
+#include <AdblockPlus/FilterEngine.h>
 
 
 class CPluginFilter;
@@ -49,7 +50,7 @@
 
   // Removes the url from the list of whitelisted urls if present
   // Only called from ui thread
-  bool ShouldBlock(const std::wstring& src, int contentType, const std::wstring& domain, bool addDebug=false);
+  bool ShouldBlock(const std::wstring& src, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain, bool addDebug=false);
 
   bool IsElementHidden(const std::wstring& tag, IHTMLElement* pEl, const std::wstring& domain, const std::wstring& indent, CPluginFilter* filter);
   bool IsWhitelistedUrl(const std::wstring& url);
@@ -57,7 +58,7 @@
 
   int GetIEVersion();
 
-  bool Matches(const std::wstring& url, const std::wstring& contentType, const std::wstring& domain);
+  bool Matches(const std::wstring& url, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain);
   std::vector<std::wstring> GetElementHidingSelectors(const std::wstring& domain);
   std::vector<SubscriptionDescription> FetchAvailableSubscriptions();
   std::vector<SubscriptionDescription> GetListedSubscriptions();