Simplify CSP policy code

Currently X-WebKit-CSP should use same syntax as
X-Content-Security-Policy - both have converged to same standard.
Sending old syntax for other WebKit based browsers is wrong as they have
also migrated to new WebKit core using new CSP syntax.