Split CSP into pre- and post-upgrade checks

third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/nonces/import-multiple-blocked.php

Index: third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/nonces/import-multiple-blocked.php
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/nonces/import-multiple-blocked.php b/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/nonces/import-multiple-blocked.php
index a63cf622c745c2841618a2ae1cf2ddc277429a81..49f31d8f5b8f90092596ee6d1e46d0fce8e9dfdd 100644
--- a/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/nonces/import-multiple-blocked.php
+++ b/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/nonces/import-multiple-blocked.php
@@ -14,18 +14,12 @@
         link.onerror = t.unreached_func("The import should load.");
         link.onload = t.step_func(_ => assert_true(!!link.import, "The import was loaded."));
 
-        var watcher = new EventWatcher(t, document, ['securitypolicyviolation', 'securitypolicyviolation']);
+        var watcher = new EventWatcher(t, document, ['securitypolicyviolation']);
         watcher
             .wait_for('securitypolicyviolation')
-            .then(t.step_func(e => {
-                assert_equals(e.blockedURI, "http://127.0.0.1:8000/security/resources/blank.html");
-                assert_equals(e.lineNumber, 27);
-                // TODO(mkwst): We shouldn't be generating another violation report here.
-                return watcher.wait_for('securitypolicyviolation');
-            }))
             .then(t.step_func_done(e => {
                 assert_equals(e.blockedURI, "http://127.0.0.1:8000/security/resources/blank.html");
-                assert_equals(e.lineNumber, 0);
+                assert_equals(e.lineNumber, 21);
             }));
 
         document.head.appendChild(link);