Cleanup after enabling WPTServe.

Cleanup after enabling WPTServe.

* webkitpy/layout_tests and LayoutTests/WPTServeExpectations
  Remove --enable_wptserve flag and related code.

* webkitpy/w3c and other files
  Stop copying testharnessreport.js, WebIDLParser.js, and vendor-prefix.js.
  We map LayoutTests/resources/{testharnessreport.js,vendor-prefix.js} into
  external/wpt by 'alias' feature of WPTServe. So we don't need to copy these
  files any longer.
  As for WebIDLParser.js, WPTServe maps /resources/WebIDLParser.js to
  /resources/webidl2/lib/webidl2.js by default [1]
  csswg-test doesn't use WPTServe, and we need to update blink_test_runner.cc
  so that /resoruces/testharness*.js point files in LayoutTests/resources.

[1] https://cs.chromium.org/chromium/src/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/serve/serve.py?type=cs&l=100

BUG=618366
Review-Url: https://codereview.chromium.org/2511333002
Cr-Commit-Position: refs/heads/master@{#445012}
Committed: https://chromium.googlesource.com/chromium/src/+/b39b2b6850398acf84f8bb86038dce754bf778d8

[tkent, 2016-11-18 04:23:25]

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

[commit-bot: I haz the power, 2016-11-18 04:24:12]

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

[tkent, 2016-11-18 05:08:40]

Description was changed from

==========
Cleanup after enabling WPTServe.

* webkity/layout_tests and LayoutTests/WPTServeExpectations
  Remove --enable_wptserve flag and related code.

* webkitpy/w3c and other files
  Stop copying testharnessreport.js, WebIDLParser.js, and vendor-prefix.js.
  We map LayoutTests/resources/{testharnessreport.js,vendor-prefix.js} into
  imported/wpt by 'alias' feature of WPTServe. So we don't need to copy these
  files any longer.
  As for WebIDLParser.js, WPTServe maps /resource/WebIDLParser.js to
  /resources/webidl2/lib/webidl2.js by default [1]

[1]
https://cs.chromium.org/chromium/src/third_party/WebKit/Tools/Scripts/webkitp...

BUG=618366
==========

to

==========
Cleanup after enabling WPTServe.

* webkitpy/layout_tests and LayoutTests/WPTServeExpectations
  Remove --enable_wptserve flag and related code.

* webkitpy/w3c and other files
  Stop copying testharnessreport.js, WebIDLParser.js, and vendor-prefix.js.
  We map LayoutTests/resources/{testharnessreport.js,vendor-prefix.js} into
  imported/wpt by 'alias' feature of WPTServe. So we don't need to copy these
  files any longer.
  As for WebIDLParser.js, WPTServe maps /resources/WebIDLParser.js to
  /resources/webidl2/lib/webidl2.js by default [1]

[1]
https://cs.chromium.org/chromium/src/third_party/WebKit/Tools/Scripts/webkitp...

BUG=618366
==========

[tkent, 2016-11-18 05:44:43]

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

[commit-bot: I haz the power, 2016-11-18 05:45:06]

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

[tkent, 2016-11-18 05:46:31]

Patchset #1 (id:1) has been deleted

[commit-bot: I haz the power, 2016-11-18 07:00:46]

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

[commit-bot: I haz the power, 2016-11-18 07:00:47]

Dry run: Try jobs failed on following builders:
  win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)

[tkent, 2016-11-18 08:16:14]

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

[commit-bot: I haz the power, 2016-11-18 08:16:30]

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

[tkent, 2016-11-18 08:35:25]

Description was changed from

==========
Cleanup after enabling WPTServe.

* webkitpy/layout_tests and LayoutTests/WPTServeExpectations
  Remove --enable_wptserve flag and related code.

* webkitpy/w3c and other files
  Stop copying testharnessreport.js, WebIDLParser.js, and vendor-prefix.js.
  We map LayoutTests/resources/{testharnessreport.js,vendor-prefix.js} into
  imported/wpt by 'alias' feature of WPTServe. So we don't need to copy these
  files any longer.
  As for WebIDLParser.js, WPTServe maps /resources/WebIDLParser.js to
  /resources/webidl2/lib/webidl2.js by default [1]

[1]
https://cs.chromium.org/chromium/src/third_party/WebKit/Tools/Scripts/webkitp...

BUG=618366
==========

to

==========
Cleanup after enabling WPTServe.

* webkitpy/layout_tests and LayoutTests/WPTServeExpectations
  Remove --enable_wptserve flag and related code.

* webkitpy/w3c and other files
  Stop copying testharnessreport.js, WebIDLParser.js, and vendor-prefix.js.
  We map LayoutTests/resources/{testharnessreport.js,vendor-prefix.js} into
  imported/wpt by 'alias' feature of WPTServe. So we don't need to copy these
  files any longer.
  As for WebIDLParser.js, WPTServe maps /resources/WebIDLParser.js to
  /resources/webidl2/lib/webidl2.js by default [1]
  csswg-test doesn't use WPTServe, and we need to update blink_test_runner.cc
  so that /resoruces/testharness*.js point files in LayoutTests/resources.

[1]
https://cs.chromium.org/chromium/src/third_party/WebKit/Tools/Scripts/webkitp...

BUG=618366
==========

[commit-bot: I haz the power, 2016-11-18 09:22:30]

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

[commit-bot: I haz the power, 2016-11-18 09:22:31]

Dry run: This issue passed the CQ dry run.

[tkent, 2016-11-18 09:24:00]

tkent@chromium.org changed reviewers:
+ qyearsley@chromium.org

[tkent, 2016-11-18 09:24:01]

qyearsley@, would you review this please?

[qyearsley, 2016-11-30 19:06:33]

On 2016/11/18 at 09:24:01, tkent wrote:
> qyearsley@, would you review this please?

Hi, sorry for the delay! I was just away for the past week, and have just come
back, and will review now once I have time.

[Dirk Pranke, 2016-11-30 19:32:42]

Well, since I just disabled wptserve last night, we're not in a rush to land
this. We need to figure out why wptserve was hanging on startup first.

[tkent, 2017-01-19 08:30:46]

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

[commit-bot: I haz the power, 2017-01-19 08:31:04]

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

[tkent, 2017-01-19 08:31:35]

Description was changed from

==========
Cleanup after enabling WPTServe.

* webkitpy/layout_tests and LayoutTests/WPTServeExpectations
  Remove --enable_wptserve flag and related code.

* webkitpy/w3c and other files
  Stop copying testharnessreport.js, WebIDLParser.js, and vendor-prefix.js.
  We map LayoutTests/resources/{testharnessreport.js,vendor-prefix.js} into
  imported/wpt by 'alias' feature of WPTServe. So we don't need to copy these
  files any longer.
  As for WebIDLParser.js, WPTServe maps /resources/WebIDLParser.js to
  /resources/webidl2/lib/webidl2.js by default [1]
  csswg-test doesn't use WPTServe, and we need to update blink_test_runner.cc
  so that /resoruces/testharness*.js point files in LayoutTests/resources.

[1]
https://cs.chromium.org/chromium/src/third_party/WebKit/Tools/Scripts/webkitp...

BUG=618366
==========

to

==========
Cleanup after enabling WPTServe.

* webkitpy/layout_tests and LayoutTests/WPTServeExpectations
  Remove --enable_wptserve flag and related code.

* webkitpy/w3c and other files
  Stop copying testharnessreport.js, WebIDLParser.js, and vendor-prefix.js.
  We map LayoutTests/resources/{testharnessreport.js,vendor-prefix.js} into
  external/wpt by 'alias' feature of WPTServe. So we don't need to copy these
  files any longer.
  As for WebIDLParser.js, WPTServe maps /resources/WebIDLParser.js to
  /resources/webidl2/lib/webidl2.js by default [1]
  csswg-test doesn't use WPTServe, and we need to update blink_test_runner.cc
  so that /resoruces/testharness*.js point files in LayoutTests/resources.

[1]
https://cs.chromium.org/chromium/src/third_party/WebKit/Tools/Scripts/webkitp...

BUG=618366
==========

[commit-bot: I haz the power, 2017-01-19 09:33:07]

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

[commit-bot: I haz the power, 2017-01-19 09:33:08]

Dry run: Try jobs failed on following builders:
  linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[qyearsley, 2017-01-19 18:00:33]

https://codereview.chromium.org/2511333002/diff/60001/content/shell/renderer/...
File content/shell/renderer/layout_test/blink_test_runner.cc (right):

https://codereview.chromium.org/2511333002/diff/60001/content/shell/renderer/...
content/shell/renderer/layout_test/blink_test_runner.cc:227: // Note that this
isn't applied to imported/wpt because tests in imported/wpt
imported -> external

https://codereview.chromium.org/2511333002/diff/60001/content/shell/renderer/...
content/shell/renderer/layout_test/blink_test_runner.cc:248:
.Append(FILE_PATH_LITERAL("LayoutTests/"))
What does this change do?

https://codereview.chromium.org/2511333002/diff/60001/third_party/WebKit/Tool...
File
third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py
(left):

https://codereview.chromium.org/2511333002/diff/60001/third_party/WebKit/Tool...
third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py:80:
'-c', 'Alias /w3c/resources "%s"' % imported_resources_dir,
I'm not sure about the correctness of this, since I don't fully understand what
is done here.

Does this make it so that non-WPT HTTP tests (which use the apache server) would
now look for /w3c/resources in LayoutTests/resources instead of
LayoutTests/external/wpt/resources? But /w3c/resources/WebIDLParser.js is still
found at LayoutTests/external/wpt/resources/webidl2/lib/webidl2.js?

https://codereview.chromium.org/2511333002/diff/60001/third_party/WebKit/Tool...
File third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py (left):

https://codereview.chromium.org/2511333002/diff/60001/third_party/WebKit/Tool...
third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py:136: # WPTServe.
Excellent :-D

[tkent, 2017-01-19 23:43:58]

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

[commit-bot: I haz the power, 2017-01-19 23:44:52]

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

[tkent, 2017-01-19 23:49:59]

Patch Set 3 was broken because I removed LT/resources/testharnessreport.js
instead of LT/external/wpt/resources/tesrharnessreport.js in it.

https://codereview.chromium.org/2511333002/diff/60001/content/shell/renderer/...
File content/shell/renderer/layout_test/blink_test_runner.cc (right):

https://codereview.chromium.org/2511333002/diff/60001/content/shell/renderer/...
content/shell/renderer/layout_test/blink_test_runner.cc:227: // Note that this
isn't applied to imported/wpt because tests in imported/wpt
On 2017/01/19 at 18:00:33, qyearsley wrote:
> imported -> external

Done.

https://codereview.chromium.org/2511333002/diff/60001/content/shell/renderer/...
content/shell/renderer/layout_test/blink_test_runner.cc:248:
.Append(FILE_PATH_LITERAL("LayoutTests/"))
On 2017/01/19 at 18:00:33, qyearsley wrote:
> What does this change do?

This CL removes LayoutTests/external/wpt/resources/testharnessreport.js.  We
should refer to LayoutTests/resources/testharnessreport.js.

https://codereview.chromium.org/2511333002/diff/60001/third_party/WebKit/Tool...
File
third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py
(left):

https://codereview.chromium.org/2511333002/diff/60001/third_party/WebKit/Tool...
third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py:80:
'-c', 'Alias /w3c/resources "%s"' % imported_resources_dir,
On 2017/01/19 at 18:00:33, qyearsley wrote:
> I'm not sure about the correctness of this, since I don't fully understand
what is done here.
> 
> Does this make it so that non-WPT HTTP tests (which use the apache server)
would now look for /w3c/resources in LayoutTests/resources instead of
LayoutTests/external/wpt/resources? But /w3c/resources/WebIDLParser.js is still
found at LayoutTests/external/wpt/resources/webidl2/lib/webidl2.js?

Yes and yes.

[qyearsley, 2017-01-20 00:04:46]

LGTM

https://codereview.chromium.org/2511333002/diff/60001/content/shell/renderer/...
File content/shell/renderer/layout_test/blink_test_runner.cc (right):

https://codereview.chromium.org/2511333002/diff/60001/content/shell/renderer/...
content/shell/renderer/layout_test/blink_test_runner.cc:248:
.Append(FILE_PATH_LITERAL("LayoutTests/"))
On 2017/01/19 at 23:49:59, tkent wrote:
> On 2017/01/19 at 18:00:33, qyearsley wrote:
> > What does this change do?
> 
> This CL removes LayoutTests/external/wpt/resources/testharnessreport.js.  We
should refer to LayoutTests/resources/testharnessreport.js.

Ah - so if the input utf8_url is "file:///resources/testharnessreport.js"
(because the URL in the file is "/resources/testharnessreport.js", then the
returned new URL will be something like
"file:///full/path/to/chromium/src/third_party/WebKit/LayoutTests/resources/testharnessreport.js"
- is that right?

https://codereview.chromium.org/2511333002/diff/60001/third_party/WebKit/Tool...
File
third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py
(left):

https://codereview.chromium.org/2511333002/diff/60001/third_party/WebKit/Tool...
third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py:80:
'-c', 'Alias /w3c/resources "%s"' % imported_resources_dir,
On 2017/01/19 at 23:49:59, tkent wrote:
> On 2017/01/19 at 18:00:33, qyearsley wrote:
> > I'm not sure about the correctness of this, since I don't fully understand
what is done here.
> > 
> > Does this make it so that non-WPT HTTP tests (which use the apache server)
would now look for /w3c/resources in LayoutTests/resources instead of
LayoutTests/external/wpt/resources? But /w3c/resources/WebIDLParser.js is still
found at LayoutTests/external/wpt/resources/webidl2/lib/webidl2.js?
> 
> Yes and yes.

Alright :-)

[commit-bot: I haz the power, 2017-01-20 01:51:34]

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

[commit-bot: I haz the power, 2017-01-20 01:51:35]

Dry run: This issue passed the CQ dry run.

[tkent, 2017-01-20 02:14:05]

https://codereview.chromium.org/2511333002/diff/60001/content/shell/renderer/...
File content/shell/renderer/layout_test/blink_test_runner.cc (right):

https://codereview.chromium.org/2511333002/diff/60001/content/shell/renderer/...
content/shell/renderer/layout_test/blink_test_runner.cc:248:
.Append(FILE_PATH_LITERAL("LayoutTests/"))
On 2017/01/20 at 00:04:46, qyearsley wrote:
> On 2017/01/19 at 23:49:59, tkent wrote:
> > On 2017/01/19 at 18:00:33, qyearsley wrote:
> > > What does this change do?
> > 
> > This CL removes LayoutTests/external/wpt/resources/testharnessreport.js.  We
should refer to LayoutTests/resources/testharnessreport.js.
> 
> Ah - so if the input utf8_url is "file:///resources/testharnessreport.js"
(because the URL in the file is "/resources/testharnessreport.js", then the
returned new URL will be something like
"file:///full/path/to/chromium/src/third_party/WebKit/LayoutTests/resources/testharnessreport.js"
- is that right?

Right.

[tkent, 2017-01-20 02:15:03]

tkent@chromium.org changed reviewers:
+ kinuko@chromium.org

[tkent, 2017-01-20 02:16:57]

tkent@chromium.org changed reviewers:
+ jochen@chromium.org
- kinuko@chromium.org

[tkent, 2017-01-20 02:17:10]

jochen@, would you approve
content/shell/renderer/layout_test/blink_test_runner.cc please?

[jochen (gone - plz use gerrit), 2017-01-20 07:31:59]

lgtm

[tkent, 2017-01-20 07:53:58]

The CQ bit was checked by tkent@chromium.org

[commit-bot: I haz the power, 2017-01-20 07:54:14]

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-01-20 07:57:59]

CQ is committing da patch.

Bot data: {"patchset_id": 80001, "attempt_start_ts": 1484898838541180,
"parent_rev": "6c59727f79b04675fdc9dc663fa36d16b23535b4", "commit_rev":
"b39b2b6850398acf84f8bb86038dce754bf778d8"}

[commit-bot: I haz the power, 2017-01-20 07:58:33]

Description was changed from

==========
Cleanup after enabling WPTServe.

* webkitpy/layout_tests and LayoutTests/WPTServeExpectations
  Remove --enable_wptserve flag and related code.

* webkitpy/w3c and other files
  Stop copying testharnessreport.js, WebIDLParser.js, and vendor-prefix.js.
  We map LayoutTests/resources/{testharnessreport.js,vendor-prefix.js} into
  external/wpt by 'alias' feature of WPTServe. So we don't need to copy these
  files any longer.
  As for WebIDLParser.js, WPTServe maps /resources/WebIDLParser.js to
  /resources/webidl2/lib/webidl2.js by default [1]
  csswg-test doesn't use WPTServe, and we need to update blink_test_runner.cc
  so that /resoruces/testharness*.js point files in LayoutTests/resources.

[1]
https://cs.chromium.org/chromium/src/third_party/WebKit/Tools/Scripts/webkitp...

BUG=618366
==========

to

==========
Cleanup after enabling WPTServe.

* webkitpy/layout_tests and LayoutTests/WPTServeExpectations
  Remove --enable_wptserve flag and related code.

* webkitpy/w3c and other files
  Stop copying testharnessreport.js, WebIDLParser.js, and vendor-prefix.js.
  We map LayoutTests/resources/{testharnessreport.js,vendor-prefix.js} into
  external/wpt by 'alias' feature of WPTServe. So we don't need to copy these
  files any longer.
  As for WebIDLParser.js, WPTServe maps /resources/WebIDLParser.js to
  /resources/webidl2/lib/webidl2.js by default [1]
  csswg-test doesn't use WPTServe, and we need to update blink_test_runner.cc
  so that /resoruces/testharness*.js point files in LayoutTests/resources.

[1]
https://cs.chromium.org/chromium/src/third_party/WebKit/Tools/Scripts/webkitp...

BUG=618366

Review-Url: https://codereview.chromium.org/2511333002
Cr-Commit-Position: refs/heads/master@{#445012}
Committed:
https://chromium.googlesource.com/chromium/src/+/b39b2b6850398acf84f8bb86038d...
==========

[commit-bot: I haz the power, 2017-01-20 07:58:34]

Committed patchset #4 (id:80001) as
https://chromium.googlesource.com/chromium/src/+/b39b2b6850398acf84f8bb86038d...