Fixed and improved content-security-policy/media-src tests

Fixed and improved content-security-policy/media-src tests

Removed duplicated blink tests
Added new tests from the blink tests
Using oga/ogv instead of mp3/mp4 because content_shell can't do mp3/mp4

BUG=694525
Review-Url: https://codereview.chromium.org/2766913003
Cr-Commit-Position: refs/heads/master@{#459400}
Committed: https://chromium.googlesource.com/chromium/src/+/73f6c4b838a092a6e7e7eb29a288cc9b5930aeac

[andypaicu, 2017-03-22 15:47:21]

andypaicu@chromium.org changed reviewers:
+ mkwst@chromium.org

[andypaicu, 2017-03-22 15:47:26]

The CQ bit was checked by andypaicu@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-22 15:47:50]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-22 17:15:42]

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

[commit-bot: I haz the power, 2017-03-22 17:15:43]

Dry run: This issue passed the CQ dry run.

[Mike West, 2017-03-23 08:35:52]

LGTM with a nit, thanks!

https://codereview.chromium.org/2766913003/diff/1/third_party/WebKit/LayoutTe...
File
third_party/WebKit/LayoutTests/external/wpt/content-security-policy/media-src/media-src-blocked.html
(right):

https://codereview.chromium.org/2766913003/diff/1/third_party/WebKit/LayoutTe...
third_party/WebKit/LayoutTests/external/wpt/content-security-policy/media-src/media-src-blocked.html:21:
"//www2." +
For all of these, I'd recommend renaming the file to `*.sub.html`, and using
`{{domains[www]}}`, `{{domains[www2]}}`, etc. Hard-coding names is something we
should avoid to the extent possible.

[andypaicu, 2017-03-23 11:24:06]

The CQ bit was checked by andypaicu@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-23 11:24:16]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[andypaicu, 2017-03-23 11:25:59]

https://codereview.chromium.org/2766913003/diff/1/third_party/WebKit/LayoutTe...
File
third_party/WebKit/LayoutTests/external/wpt/content-security-policy/media-src/media-src-blocked.html
(right):

https://codereview.chromium.org/2766913003/diff/1/third_party/WebKit/LayoutTe...
third_party/WebKit/LayoutTests/external/wpt/content-security-policy/media-src/media-src-blocked.html:21:
"//www2." +
On 2017/03/23 at 08:35:52, Mike West wrote:
> For all of these, I'd recommend renaming the file to `*.sub.html`, and using
`{{domains[www]}}`, `{{domains[www2]}}`, etc. Hard-coding names is something we
should avoid to the extent possible.

done

[commit-bot: I haz the power, 2017-03-23 12:33:06]

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

[commit-bot: I haz the power, 2017-03-23 12:33:07]

Dry run: This issue passed the CQ dry run.

[andypaicu, 2017-03-23 12:35:57]

The CQ bit was checked by andypaicu@chromium.org

[andypaicu, 2017-03-23 12:35:57]

The patchset sent to the CQ was uploaded after l-g-t-m from mkwst@chromium.org
Link to the patchset: https://codereview.chromium.org/2766913003/#ps20001
(title: "Used placeholders instead of hardcoded URL values")

[commit-bot: I haz the power, 2017-03-23 12:36:12]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-23 12:41:36]

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

[commit-bot: I haz the power, 2017-03-23 12:41:38]

Failed to apply patch for third_party/WebKit/LayoutTests/TestExpectations:
While running git apply --index -p1;
  error: patch failed: third_party/WebKit/LayoutTests/TestExpectations:1865
  error: third_party/WebKit/LayoutTests/TestExpectations: patch does not apply

Patch:       third_party/WebKit/LayoutTests/TestExpectations
Index: third_party/WebKit/LayoutTests/TestExpectations
diff --git a/third_party/WebKit/LayoutTests/TestExpectations
b/third_party/WebKit/LayoutTests/TestExpectations
index
4d4fe69708a6e2b1ee876f5abf448d766484fcb9..5091de084a3c33db221541f0b58258962075724c
100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -1865,6 +1865,7 @@ crbug.com/698077
inspector/sources/debugger/debug-inlined-scripts.html [ NeedsMa
 crbug.com/694525 external/wpt/content-security-policy [ Skip ]
 crbug.com/694525 external/wpt/content-security-policy/connect-src [ Pass ]
 crbug.com/694525 external/wpt/content-security-policy/inside-worker [ Pass ]
+crbug.com/694525 external/wpt/content-security-policy/media-src [ Pass ]
 crbug.com/694525 external/wpt/content-security-policy/securitypolicyviolation [
Pass ]
 crbug.com/694525 external/wpt/content-security-policy/worker-src [ Pass ]

[andypaicu, 2017-03-23 12:48:35]

The CQ bit was checked by andypaicu@chromium.org

[commit-bot: I haz the power, 2017-03-23 12:48:52]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-23 12:53:36]

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

[commit-bot: I haz the power, 2017-03-23 12:53:38]

Failed to apply patch for third_party/WebKit/LayoutTests/TestExpectations:
While running git apply --index -p1;
  error: patch failed: third_party/WebKit/LayoutTests/TestExpectations:1865
  error: third_party/WebKit/LayoutTests/TestExpectations: patch does not apply

Patch:       third_party/WebKit/LayoutTests/TestExpectations
Index: third_party/WebKit/LayoutTests/TestExpectations
diff --git a/third_party/WebKit/LayoutTests/TestExpectations
b/third_party/WebKit/LayoutTests/TestExpectations
index
4d4fe69708a6e2b1ee876f5abf448d766484fcb9..5091de084a3c33db221541f0b58258962075724c
100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -1865,6 +1865,7 @@ crbug.com/698077
inspector/sources/debugger/debug-inlined-scripts.html [ NeedsMa
 crbug.com/694525 external/wpt/content-security-policy [ Skip ]
 crbug.com/694525 external/wpt/content-security-policy/connect-src [ Pass ]
 crbug.com/694525 external/wpt/content-security-policy/inside-worker [ Pass ]
+crbug.com/694525 external/wpt/content-security-policy/media-src [ Pass ]
 crbug.com/694525 external/wpt/content-security-policy/securitypolicyviolation [
Pass ]
 crbug.com/694525 external/wpt/content-security-policy/worker-src [ Pass ]

[andypaicu, 2017-03-23 14:31:36]

The CQ bit was checked by andypaicu@chromium.org

[commit-bot: I haz the power, 2017-03-23 14:32:27]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-23 14:38:07]

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

[commit-bot: I haz the power, 2017-03-23 14:38:10]

Failed to apply patch for third_party/WebKit/LayoutTests/TestExpectations:
While running git apply --index -p1;
  error: patch failed: third_party/WebKit/LayoutTests/TestExpectations:1865
  error: third_party/WebKit/LayoutTests/TestExpectations: patch does not apply

Patch:       third_party/WebKit/LayoutTests/TestExpectations
Index: third_party/WebKit/LayoutTests/TestExpectations
diff --git a/third_party/WebKit/LayoutTests/TestExpectations
b/third_party/WebKit/LayoutTests/TestExpectations
index
4d4fe69708a6e2b1ee876f5abf448d766484fcb9..5091de084a3c33db221541f0b58258962075724c
100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -1865,6 +1865,7 @@ crbug.com/698077
inspector/sources/debugger/debug-inlined-scripts.html [ NeedsMa
 crbug.com/694525 external/wpt/content-security-policy [ Skip ]
 crbug.com/694525 external/wpt/content-security-policy/connect-src [ Pass ]
 crbug.com/694525 external/wpt/content-security-policy/inside-worker [ Pass ]
+crbug.com/694525 external/wpt/content-security-policy/media-src [ Pass ]
 crbug.com/694525 external/wpt/content-security-policy/securitypolicyviolation [
Pass ]
 crbug.com/694525 external/wpt/content-security-policy/worker-src [ Pass ]

[andypaicu, 2017-03-23 15:22:45]

The CQ bit was checked by andypaicu@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-23 15:23:18]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-23 16:21:58]

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

[commit-bot: I haz the power, 2017-03-23 16:22:00]

Dry run: This issue passed the CQ dry run.

[andypaicu, 2017-03-24 08:10:19]

The CQ bit was checked by andypaicu@chromium.org

[andypaicu, 2017-03-24 08:10:20]

The patchset sent to the CQ was uploaded after l-g-t-m from mkwst@chromium.org
Link to the patchset: https://codereview.chromium.org/2766913003/#ps40001
(title: "rebase-update")

[commit-bot: I haz the power, 2017-03-24 08:10:40]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-24 08:15:02]

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

[commit-bot: I haz the power, 2017-03-24 08:15:03]

Failed to apply patch for third_party/WebKit/LayoutTests/TestExpectations:
While running git apply --index -p1;
  error: patch failed: third_party/WebKit/LayoutTests/TestExpectations:1867
  error: third_party/WebKit/LayoutTests/TestExpectations: patch does not apply

Patch:       third_party/WebKit/LayoutTests/TestExpectations
Index: third_party/WebKit/LayoutTests/TestExpectations
diff --git a/third_party/WebKit/LayoutTests/TestExpectations
b/third_party/WebKit/LayoutTests/TestExpectations
index
1cfddd9df2b8af78e7bc10eb85c8cf7fd405eebf..c6ba56234a6c4c41e2df130a516edc03437dff5e
100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -1867,6 +1867,7 @@ crbug.com/694525 external/wpt/content-security-policy [
Skip ]
 crbug.com/694525 external/wpt/content-security-policy/connect-src [ Pass ]
 crbug.com/694525 external/wpt/content-security-policy/img-src [ Pass ]
 crbug.com/694525 external/wpt/content-security-policy/inside-worker [ Pass ]
+crbug.com/694525 external/wpt/content-security-policy/media-src [ Pass ]
 crbug.com/694525 external/wpt/content-security-policy/securitypolicyviolation [
Pass ]
 crbug.com/694525 external/wpt/content-security-policy/worker-src [ Pass ]

[andypaicu, 2017-03-24 11:12:06]

The CQ bit was checked by andypaicu@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-24 11:12:29]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-24 12:09:32]

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

[commit-bot: I haz the power, 2017-03-24 12:09:33]

Dry run: This issue passed the CQ dry run.

[andypaicu, 2017-03-24 12:49:21]

The CQ bit was checked by andypaicu@chromium.org

[andypaicu, 2017-03-24 12:49:21]

The patchset sent to the CQ was uploaded after l-g-t-m from mkwst@chromium.org
Link to the patchset: https://codereview.chromium.org/2766913003/#ps60001
(title: "Re-edited TestExpectations after a rebase-update to try to make the
patch apply properly this time")

[commit-bot: I haz the power, 2017-03-24 12:49:40]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-24 13:21:19]

CQ is committing da patch.

Bot data: {"patchset_id": 60001, "attempt_start_ts": 1490359761353020,
"parent_rev": "cbfd644ca2d24fc324101ea15e6198ca71c804c1", "commit_rev":
"73f6c4b838a092a6e7e7eb29a288cc9b5930aeac"}

[commit-bot: I haz the power, 2017-03-24 13:22:05]

Description was changed from

==========
Fixed and improved content-security-policy/media-src tests

Removed duplicated blink tests
Added new tests from the blink tests
Using oga/ogv instead of mp3/mp4 because content_shell can't do mp3/mp4

BUG=694525
==========

to

==========
Fixed and improved content-security-policy/media-src tests

Removed duplicated blink tests
Added new tests from the blink tests
Using oga/ogv instead of mp3/mp4 because content_shell can't do mp3/mp4

BUG=694525

Review-Url: https://codereview.chromium.org/2766913003
Cr-Commit-Position: refs/heads/master@{#459400}
Committed:
https://chromium.googlesource.com/chromium/src/+/73f6c4b838a092a6e7e7eb29a288...
==========

[commit-bot: I haz the power, 2017-03-24 13:22:06]

Committed patchset #4 (id:60001) as
https://chromium.googlesource.com/chromium/src/+/73f6c4b838a092a6e7e7eb29a288...