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',
-    ],
+      'src/shared/Registry.h',
+      'src/shared/Registry.cpp',
+      'src/shared/IE_version.h',
+      'src/shared/IE_version.cpp',
+      ]
   },
   
   {
     'target_name': 'AdblockPlusEngine',
     'type': 'executable',
     'dependencies': [
       'shared',
       'libadblockplus/libadblockplus.gyp:libadblockplus',
     ],
     'sources': [
@@ skipping 15 matching lines @@
       'VCLinkerTool': {
         'DelayLoadDLLs': ['Shell32.dll'],
       },
     },
   },
 
   {
     'target_name': 'AdblockPlus',
     'type': 'shared_library',
     'dependencies': [
-      'shared'
+      'shared',
+      'libadblockplus/libadblockplus.gyp:libadblockplus',
     ],
     'sources': [
       'src/plugin/abp.h',
       'src/plugin/AdblockPlus.def',
       'src/plugin/AdblockPlus.idl',
       'src/plugin/AdblockPlus.rc',
       'src/plugin/AdblockPlus.rgs',
       'src/plugin/AdblockPlusClient.cpp',
       'src/plugin/AdblockPlusClient.h',
       'src/plugin/AdblockPlusDomTraverser.cpp',
@@ skipping 47 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 43 matching lines @@
   {
     'target_name': 'tests',
     'type': 'executable',
     'dependencies': [
       'shared',
       'libadblockplus/third_party/googletest.gyp:googletest_main',
     ],
     'sources': [
       'test/CommunicationTest.cpp',
       'test/DictionaryTest.cpp',
+      'test/RegistryTest.cpp',
+      'test/UtilTest.cpp',
     ],
     'defines': ['WINVER=0x0501'],
     'link_settings': {
       'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
     },
     'msvs_settings': {
       'VCLinkerTool': {
         'SubSystem': '1',   # Console
         'EntryPointSymbol': 'mainCRTStartup',
       },
     },
+  },
+
+  {
+    'target_name': 'tests_plugin',
+    'type': 'executable',
+    'dependencies': [
+      'shared',
+      'libadblockplus/libadblockplus.gyp:libadblockplus',
+      'libadblockplus/third_party/googletest.gyp:googletest_main',
+    ],
+    'sources': [
+      'src/plugin/PluginUserSettings.cpp',
+      'src/plugin/PluginUserSettings.h',
+      'test/plugin/UserSettingsTest.cpp',
+      #
+      # required only for linking
+      #
+      'src/plugin/AdblockPlusClient.cpp',
+      'src/plugin/AdblockPlusDomTraverser.cpp',
+      'src/plugin/AdblockPlusTab.cpp',
+      'src/plugin/ATL_Deprecate.cpp',
+      'src/plugin/NotificationMessage.cpp',
+      'src/plugin/Plugin.cpp',
+      'src/plugin/PluginClientBase.cpp',
+      'src/plugin/PluginClientFactory.cpp',
+      'src/plugin/PluginClass.cpp',
+      'src/plugin/PluginDebug.cpp',
+      'src/plugin/PluginFilter.cpp',
+      'src/plugin/PluginMimeFilterClient.cpp',
+      'src/plugin/PluginMutex.cpp',
+      'src/plugin/PluginSettings.cpp',
+      'src/plugin/PluginSystem.cpp',
+      'src/plugin/PluginTabBase.cpp',
+      'src/plugin/PluginUtil.cpp',
+      'src/plugin/PluginWbPassthrough.cpp',
+    ],
+    'include_dirs': [
+      '$(WINDDKDIR)/inc/atl71',
+    ],
+    'defines': [
+      'WINVER=0x0501',
+      'PRODUCT_ADBLOCKPLUS'
+    ],
+    'link_settings': {
+      'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32'],
+    },
+    'msvs_settings': {
+      'VCLinkerTool': {
+        'SubSystem': '1',   # Console
+        'EntryPointSymbol': 'mainCRTStartup',
+        'conditions': [[
+          'target_arch=="ia32"', {
+            'AdditionalLibraryDirectories': [
+              '$(VCInstallDir)atlmfc/lib',
+              '$(WindowsSDK_LibraryPath_x86)',
+              '$(WINDDKDIR)/lib/ATL/i386',
+            ],
+          }, {
+            'AdditionalLibraryDirectories': [
+              '$(VCInstallDir)atlmfc/lib/amd64',
+              '$(WindowsSDK_LibraryPath_x64)',
+              '$(WINDDKDIR)/lib/ATL/amd64',
+            ],
+          }
+        ]],
+      },
+    },
+    'configurations': {
+      # 'libraries' is not allowed under 'configurations' :-(
+      'Debug': {
+        'msvs_settings': {
+          'VCLinkerTool': {
+            'AdditionalDependencies': ['atlsd.lib'],
+          },
+        },
+      },
+      'Release': {
+        'msvs_settings': {
+          'VCLinkerTool': {
+            'AdditionalDependencies': ['atls.lib'],
+          },
+        },
+      },
+    },
   }]
 }