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

adblockplus.gyp

Index: adblockplus.gyp
diff --git a/adblockplus.gyp b/adblockplus.gyp
index 0abb2cfd075781020fa9cd2313d5e0e4dbf05f6f..8a0b04a2c240f7b617084dd7894e1044c460b85c 100644
--- a/adblockplus.gyp
+++ b/adblockplus.gyp
@@ -42,7 +42,12 @@
       'src/shared/Registry.cpp',
       'src/shared/IE_version.h',
       'src/shared/IE_version.cpp',
-      ]
+      'src/shared/ContentType.h',
+      'src/shared/ContentType.cpp',
+    ],
+   'include_dirs': [

[Eric, 2015/01/13 17:29:36]

GYP has the syntax 'all_dependent_settings' and 'direct_dependent_settings' that
can propagate 'include_dirs' to dependent project without needing to explicitly
declare them everywhere there's a library dependency.

See http://codereview.adblockplus.org/6216090891845632/ for how this is used in
common.gypi.

[sergei, 2015/01/28 13:44:45]

Thanks for the tip.

Although I planned to get rid of it in the future because we haven't needed
ContentType in 'shared' project, Now we need it because I've put operators `>>`
and `<<` for ContentType there.

Changed.

+      'libadblockplus/include',
+    ],
   },
   
   {
@@ -146,6 +151,7 @@
       'src/plugin/SinkPolicy.inl',
     ],
     'include_dirs': [
+      'libadblockplus/include',
       '$(WindowsSDK_IncludePath)',
       '$(VCInstallDir)atlmfc/include',
       '$(WINDDKDIR)/inc/atl71',
@@ -257,6 +263,7 @@
       'src/plugin/PluginWbPassthrough.cpp',
     ],
     'include_dirs': [
+      'libadblockplus/include',
       '$(WINDDKDIR)/inc/atl71',
     ],
     'defines': [