Store csp= filters into main data structure

This commits make it so that `csp=` filters
are now stored in the same data structures as
all other static network filters rather than
being stored in a separate one.

This internal change is motivated by the wish
to bring session filters to the static network
filtering engine, as has already been done for
the static extended filtering engine in the
following commit:

59c9a34

src/js/background.js

@@ -142,7 +142,7 @@ const µBlock = (( ) => { // jshint ignore:line
         // Read-only
         systemSettings: {
             compiledMagic: 21,  // Increase when compiled format changes
-            selfieMagic: 21,    // Increase when selfie format changes
+            selfieMagic: 22,    // Increase when selfie format changes
         },
 
         restoreBackupSettings: {

src/js/messaging.js

@@ -1478,18 +1478,13 @@ const logCSPViolations = function(pageStore, request) {
     if ( cspData === undefined ) {
         cspData = new Map();
 
-        const policies = [];
-        const logData = [];
-        µb.staticNetFilteringEngine.matchAndFetchData(
-            'csp',
-            request.docURL,
-            policies,
-            logData
-        );
-        for ( let i = 0; i < policies.length; i++ ) {
-            cspData.set(policies[i], logData[i]);
+        const staticDirectives =
+            µb.staticNetFilteringEngine.matchAndFetchData(fctxt, 'csp');
+        for ( const directive of staticDirectives ) {
+            if ( directive.result !== 1 ) { continue; }
+            cspData.set(directive.data, directive.logData());
         }
-        
+
         fctxt.type = 'inline-script';
         fctxt.filter = undefined;
         if ( pageStore.filterRequest(fctxt) === 1 ) {