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

adblockplus.gyp

 {
   'includes': ['defaults.gypi'],
 
   'variables': {
     'build_type%': 'devbuild',
     'build_version%': '',
   },
 
   'target_defaults': {
     'conditions': [
@@ skipping 20 matching lines @@
   },
 
   'targets': [{
     'target_name': 'shared',
     'type': 'static_library',
     'sources': [
       'src/shared/AutoHandle.cpp',
       'src/shared/Communication.cpp',
       'src/shared/Dictionary.cpp',
       'src/shared/Utils.cpp',
-      ]
+      'src/shared/ContentType.h',
+      'src/shared/ContentType.cpp',
+    ],
+   'include_dirs': [
+      'libadblockplus/include',
+    ],
   },
   
   {
     'target_name': 'AdblockPlusEngine',
     'type': 'executable',
     'dependencies': [
       'shared',
       'libadblockplus/libadblockplus.gyp:libadblockplus',
     ],
     'sources': [
@@ skipping 83 matching lines @@
       'src/plugin/PluginWbPassThrough.h',
       'src/plugin/ProtocolCF.h',
       'src/plugin/ProtocolCF.inl',
       'src/plugin/ProtocolImpl.h',
       'src/plugin/ProtocolImpl.inl',
       'src/plugin/Resource.h',
       'src/plugin/SinkPolicy.h',
       'src/plugin/SinkPolicy.inl',
     ],
     'include_dirs': [
+      'libadblockplus/include',

[Oleksandr, 2015/01/11 09:22:46]

This feels wrong, IMHO. Conceptually, I think in AdblockPlus project we should
use 'shared' project, but not 'libadblockplus' directly. For example we are not
adding libadbockplus as a dependency here, yet adding the includes. See my
suggestion further about moving ContentType enum.

[sergei, 2015/01/11 23:34:05]

Yes, see the discussion about declaration in a separate header and wrong
`#include <header>`

       '$(WindowsSDK_IncludePath)',
       '$(VCInstallDir)atlmfc/include',
       '$(WINDDKDIR)/inc/atl71',
     ],
     # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL
     # That Is Brought into a Process" on the link here:
     # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85%29.aspx#using_manifests
     'defines': ['ISOLATION_AWARE_ENABLED'],
     'libraries': [
       '-lwinhttp',
@@ skipping 56 matching lines @@
       'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
     },
     'msvs_settings': {
       'VCLinkerTool': {
         'SubSystem': '1',   # Console
         'EntryPointSymbol': 'mainCRTStartup',
       },
     },
   }]
 }