Issue #3593, #1197- fix isolate management

libadblockplus.gyp

 {
   'conditions': [[
     # We don't want to use curl on Windows and Android, skip the check there
     'OS=="win" or OS=="android"',
     {
       'variables': {
         'have_curl': 0
       }
     },
     {
@@ skipping 91 matching lines @@
     ],
     'actions': [{
       'action_name': 'convert_js',
       'variables': {
         'library_files': [
           'lib/info.js',
           'lib/io.js',
           'lib/prefs.js',
           'lib/utils.js',
           'lib/elemHideHitRegistration.js',
-          'adblockplus/lib/filterNotifier.js',
+          'adblockpluscore/lib/events.js',
+          'adblockpluscore/lib/filterNotifier.js',
           'lib/init.js',
-          'adblockplus/lib/filterClasses.js',
-          'adblockplus/lib/subscriptionClasses.js',
-          'adblockplus/lib/filterStorage.js',
-          'adblockplus/lib/elemHide.js',
-          'adblockplus/lib/matcher.js',
-          'adblockplus/lib/filterListener.js',
-          'adblockplus/lib/downloader.js',
-          'adblockplus/lib/notification.js',
+          'adblockpluscore/lib/filterClasses.js',
+          'adblockpluscore/lib/subscriptionClasses.js',
+          'adblockpluscore/lib/filterStorage.js',
+          'adblockpluscore/lib/elemHide.js',
+          'adblockpluscore/lib/cssRules.js',
+          'adblockpluscore/lib/matcher.js',
+          'adblockpluscore/lib/filterListener.js',
+          'adblockpluscore/lib/downloader.js',
+          'adblockpluscore/lib/notification.js',
           'lib/notificationShowRegistration.js',
-          'adblockplus/lib/synchronizer.js',
+          'adblockpluscore/lib/synchronizer.js',
           'lib/filterUpdateRegistration.js',
-          'adblockplus/chrome/content/ui/subscriptions.xml',
+          'adblockpluscore/chrome/content/ui/subscriptions.xml',
           'lib/updater.js',
         ],
         'load_before_files': [
           'lib/compat.js'
         ],
         'load_after_files': [
           'lib/api.js',
           'lib/publicSuffixList.js',
           'lib/punycode.js',
           'lib/basedomain.js',
@@ skipping 44 matching lines @@
       'test/WebRequest.cpp'
     ],
     'msvs_settings': {
       'VCLinkerTool': {
         'SubSystem': '1',   # Console
         'EntryPointSymbol': 'mainCRTStartup',
       },
     },
   }]
 }