'SecurityPolicyViolation' event data errors.

'SecurityPolicyViolation' event data errors.

This patch fixes two small bugs with the data delivered in the
SecurityPolicyViolation event object:

1.  'blockedURI' is now 'inline' or 'eval' for those kinds of violations.
2.  'lineNumber' is populated correctly for inline violations.

BUG=615862
R=jochen@chromium.org

Committed: https://crrev.com/b31cfe4547ff32305bf02f6fed28229466a0ddf3
Cr-Commit-Position: refs/heads/master@{#397371}

[Mike West, 2016-05-30 14:38:59]

This looks like a big change, but most of the diff is moving tests from
`.../1.1/` to `.../securitypolicyviolation/`. WDYT?

[Mike West, 2016-06-01 06:36:45]

On 2016/05/30 at 14:38:59, Mike West (OOO until 30th) wrote:
> This looks like a big change, but most of the diff is moving tests from
`.../1.1/` to `.../securitypolicyviolation/`. WDYT?

Ping?

[jochen (gone - plz use gerrit), 2016-06-01 15:12:52]

it's a bit odd that an URI would be "inline", but hey, whatever the spec says

lgtm

[Mike West, 2016-06-01 15:16:57]

The CQ bit was checked by mkwst@chromium.org

[commit-bot: I haz the power, 2016-06-01 15:17:17]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2020053002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2020053002/40001

[Mike West, 2016-06-01 15:17:42]

On 2016/06/01 at 15:12:52, jochen wrote:
> it's a bit odd that an URI would be "inline", but hey, whatever the spec says

We've been shipping it for a while, so, odd or not... :)

> lgtm

Danke!

[commit-bot: I haz the power, 2016-06-01 17:05:15]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-01 17:05:16]

Failed to apply patch for
third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp:
While running git apply --index -3 -p1;
  error: patch failed:
third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp:92
  Falling back to three-way merge...
  Applied patch to
'third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp' with conflicts.
  U third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp

Patch:       third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp
Index: third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp
diff --git a/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp
b/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp
index
67246bb31ccc7b708d0ab4798c200ebf109ed85e..b732ad64e67865fe4bf74784cfb25ed2f1a75a80
100644
--- a/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp
+++ b/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp
@@ -92,7 +92,7 @@ void CSPDirectiveList::reportViolationWithLocation(const
String& directiveText,
 {
     String message = m_reportOnly ? "[Report Only] " + consoleMessage :
consoleMessage;
    
m_policy->logToConsole(ConsoleMessage::createWithCallStack(SecurityMessageSource,
ErrorMessageLevel, message, contextURL, contextLine.oneBasedInt(), 0));
-    m_policy->reportViolation(directiveText, effectiveDirective, message,
blockedURL, m_reportEndpoints, m_header,
ContentSecurityPolicy::InlineViolation);
+    m_policy->reportViolation(directiveText, effectiveDirective, message,
blockedURL, m_reportEndpoints, m_header, ContentSecurityPolicy::InlineViolation,
nullptr, RedirectStatus::NoRedirect, contextLine.oneBasedInt());
 }
 
 void CSPDirectiveList::reportViolationWithState(const String& directiveText,
const String& effectiveDirective, const String& message, const KURL& blockedURL,
ScriptState* scriptState, const ContentSecurityPolicy::ExceptionStatus
exceptionStatus) const

[commit-bot: I haz the power, 2016-06-01 17:05:20]

The CQ bit was unchecked by commit-bot@chromium.org

[Mike West, 2016-06-02 07:19:28]

The CQ bit was checked by mkwst@chromium.org

[Mike West, 2016-06-02 07:19:29]

The patchset sent to the CQ was uploaded after l-g-t-m from jochen@chromium.org
Link to the patchset: https://codereview.chromium.org/2020053002/#ps60001
(title: "Rebase")

[commit-bot: I haz the power, 2016-06-02 07:20:00]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2020053002/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2020053002/60001

[commit-bot: I haz the power, 2016-06-02 09:15:48]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-02 09:15:49]

Try jobs failed on following builders:
  linux_android_rel_ng on tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[Mike West, 2016-06-02 10:55:37]

The CQ bit was checked by mkwst@chromium.org

[commit-bot: I haz the power, 2016-06-02 10:56:06]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2020053002/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2020053002/60001

[commit-bot: I haz the power, 2016-06-02 11:52:45]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2016-06-02 11:53:53]

Description was changed from

==========
'SecurityPolicyViolation' event data errors.

This patch fixes two small bugs with the data delivered in the
SecurityPolicyViolation event object:

1.  'blockedURI' is now 'inline' or 'eval' for those kinds of violations.
2.  'lineNumber' is populated correctly for inline violations.

BUG=615862
R=jochen@chromium.org
==========

to

==========
'SecurityPolicyViolation' event data errors.

This patch fixes two small bugs with the data delivered in the
SecurityPolicyViolation event object:

1.  'blockedURI' is now 'inline' or 'eval' for those kinds of violations.
2.  'lineNumber' is populated correctly for inline violations.

BUG=615862
R=jochen@chromium.org

Committed: https://crrev.com/b31cfe4547ff32305bf02f6fed28229466a0ddf3
Cr-Commit-Position: refs/heads/master@{#397371}
==========

[commit-bot: I haz the power, 2016-06-02 11:53:54]

Patchset 4 (id:??) landed as
https://crrev.com/b31cfe4547ff32305bf02f6fed28229466a0ddf3
Cr-Commit-Position: refs/heads/master@{#397371}