Split CSP into pre- and post-upgrade checks

third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/nonces/import-reportonly-allowed.php

Index: third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/nonces/import-reportonly-allowed.php
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/nonces/import-reportonly-allowed.php b/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/nonces/import-reportonly-allowed.php
index 34256fb999c941acb27ee8f8624626c6d3d39b63..0fa0ec4c073cb701baf12c1aab01ee3c21b91bfd 100644
--- a/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/nonces/import-reportonly-allowed.php
+++ b/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/nonces/import-reportonly-allowed.php
@@ -16,15 +16,9 @@
         var watcher = new EventWatcher(t, document, ['securitypolicyviolation', '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);