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

src/plugin/AdblockPlusClient.h

 #ifndef _ADBLOCK_PLUS_CLIENT_H_
 #define _ADBLOCK_PLUS_CLIENT_H_
 
 
 #include "PluginTypedef.h"
 #include "PluginClientBase.h"
 #include "../shared/Communication.h"
 #include "../shared/CriticalSection.h"
+#include <AdblockPlus/FilterEngine.h>
 
 
 class CPluginFilter;
 
 struct SubscriptionDescription
 {
   std::wstring url;
   std::wstring title;
   std::wstring specialization;
   bool listed;
@@ skipping 23 matching lines @@
 public:
 
   static CAdblockPlusClient* s_instance;
 
   ~CAdblockPlusClient();
 
   static CAdblockPlusClient* GetInstance();
 
   // 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);
   bool IsElemhideWhitelistedOnDomain(const std::wstring& url);
 
   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();
   bool IsAcceptableAdsEnabled();
   void SetSubscription(const std::wstring& url);
   void AddSubscription(const std::wstring& url);
   void RemoveSubscription(const std::wstring& url);
   void UpdateAllSubscriptions();
   std::vector<std::wstring> GetExceptionDomains();
   void AddFilter(const std::wstring& text);
   void RemoveFilter(const std::wstring& text);
   void SetPref(const std::wstring& name, const std::wstring& value);
   void SetPref(const std::wstring& name, const int64_t& value);
   void SetPref(const std::wstring& name, bool value);
   std::wstring GetPref(const std::wstring& name, const std::wstring& defaultValue = L"");
   std::wstring GetPref(const std::wstring& name, const wchar_t* defaultValue);
   bool GetPref(const std::wstring& name, bool defaultValue = false);
   int64_t GetPref(const std::wstring& name, int64_t defaultValue = 0);
   void CheckForUpdates(HWND callbackWindow);
   std::wstring GetAppLocale();
   std::wstring GetDocumentationLink();
   bool TogglePluginEnabled();
   std::wstring GetHostFromUrl(const std::wstring& url);
   int CompareVersions(const std::wstring& v1, const std::wstring& v2);
 
   bool IsFirstRun();
 };
 
 #endif // _ADBLOCK_PLUS_CLIENT_H_