Issue #1234 - Remove 'CString' from PluginFilter.*

adblockplus.gyp

 {
   'includes': [
     'defaults.gypi',
     'common/common.gypi',
   ],
 
   'variables': {
     'build_type%': 'devbuild',
     'build_version%': '',
   },
@@ skipping 196 matching lines @@
     ],
     'sources': [
       'test/CommunicationTest.cpp',
       'test/DictionaryTest.cpp',
       'test/UtilTest.cpp',
       'test/UtilGetQueryStringTest.cpp',
       'test/UtilGetSchemeAndHierarchicalPartTest.cpp',
     ],
     'defines': ['WINVER=0x0501'],
     'link_settings': {
-      'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
+      'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-loleaut32'],
     },
     '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',
       'src/plugin/PluginUtil.h',
       'test/plugin/UtilTest.cpp',
+      'src/plugin/TokenSequence.h',
+      'test/plugin/TokenSequenceTest.cpp',
       #
       # required only for linking
       #
       'src/plugin/AdblockPlusClient.cpp',
       'src/plugin/AdblockPlusDomTraverser.cpp',
       'src/plugin/ATL_Deprecate.cpp',
       'src/plugin/NotificationMessage.cpp',
       'src/plugin/Plugin.cpp',
       'src/plugin/PluginClientBase.cpp',
       'src/plugin/PluginClientFactory.cpp',
@@ skipping 30 matching lines @@
           }, {
             'AdditionalLibraryDirectories': [
               '$(ADBLOCKPLUS_ATL)/lib/amd64',
             ],
           }
         ]],
       },
     },
   }]
 }