Revise update-w3c-deps to check in tests directly

LayoutTests/W3CImportExpectations

 # This file controls which subdirectories of the w3c test repos we do (or don't) import.
 #
 # This file acts as a blacklist; directories and files not listed here will automatically
 # be found and imported.
 
-w3c/csswg-test/compositing-1 [ Skip ]
-w3c/csswg-test/css-align-3 [ Skip ]
-w3c/csswg-test/css-animations-1 [ Skip ]
-w3c/csswg-test/css-backgrounds-3 [ Skip ]
-w3c/csswg-test/css-box-3 [ Skip ]
-w3c/csswg-test/css-break-3 [ Skip ]
-w3c/csswg-test/css-color-3 [ Skip ]
-w3c/csswg-test/css-conditional-3 [ Skip ]
-w3c/csswg-test/css-counter-styles-3 [ Skip ]
-w3c/csswg-test/css-exclusions-1 [ Skip ]
-w3c/csswg-test/css-flexbox-1 [ Skip ]
-w3c/csswg-test/css-fonts-3 [ Skip ]
-w3c/csswg-test/css-gcpm-3 [ Skip ]
-w3c/csswg-test/css-grid-1 [ Skip ]
-w3c/csswg-test/css-images-3 [ Skip ]
-w3c/csswg-test/css-lists-3 [ Skip ]
-w3c/csswg-test/css-masking-1 [ Skip ]
-w3c/csswg-test/css-multicol-1 [ Skip ]
-w3c/csswg-test/css-namespaces-1 [ Skip ]
-w3c/csswg-test/css-page-3 [ Skip ]
-w3c/csswg-test/css-regions-1 [ Skip ]
-w3c/csswg-test/css-ruby-1 [ Skip ]
-w3c/csswg-test/css-shapes-1 [ Skip ]
-w3c/csswg-test/css-speech-1 [ Skip ]
-w3c/csswg-test/css-style-attr-1 [ Skip ]
-w3c/csswg-test/css-syntax-3 [ Skip ]
-w3c/csswg-test/css-tables-3 [ Skip ]
-w3c/csswg-test/css-text-3 [ Skip ]
-w3c/csswg-test/css-text-decor-3 [ Skip ]
-w3c/csswg-test/css-transforms-1 [ Skip ]
-w3c/csswg-test/css-transitions-1 [ Skip ]
-w3c/csswg-test/css-ui-3 [ Skip ]
-w3c/csswg-test/css-values-3 [ Skip ]
-w3c/csswg-test/css-variables-1 [ Skip ]
-w3c/csswg-test/css-writing-modes-3 [ Skip ]
-w3c/csswg-test/css1 [ Skip ]
-w3c/csswg-test/css21 [ Skip ]
-w3c/csswg-test/cssom-1 [ Skip ]
-w3c/csswg-test/cssom-view-1 [ Skip ]
-w3c/csswg-test/filters-1 [ Skip ]
-w3c/csswg-test/fonts [ Skip ]
-w3c/csswg-test/geometry-1 [ Skip ]
-w3c/csswg-test/mediaqueries-3 [ Skip ]
-w3c/csswg-test/selectors-3 [ Skip ]
-w3c/csswg-test/selectors-4 [ Skip ]
-w3c/csswg-test/support [ Skip ]
-w3c/csswg-test/tools [ Skip ]
-w3c/csswg-test/vendor-imports [ Skip ]
-w3c/csswg-test/work-in-progress [ Skip ]
-w3c/csswg-test/.gitmodules [ Skip ]
-w3c/csswg-test/.hgsubstate [ Skip ]
-w3c/csswg-test/.htaccess [ Skip ]
+imported/csswg-test/compositing-1 [ Skip ]
+imported/csswg-test/css-align-3 [ Skip ]
+imported/csswg-test/css-animations-1 [ Skip ]
+imported/csswg-test/css-backgrounds-3 [ Skip ]
+imported/csswg-test/css-box-3 [ Skip ]
+imported/csswg-test/css-break-3 [ Skip ]
+imported/csswg-test/css-color-3 [ Skip ]
+imported/csswg-test/css-conditional-3 [ Skip ]
+imported/csswg-test/css-counter-styles-3 [ Skip ]
+imported/csswg-test/css-exclusions-1 [ Skip ]
+imported/csswg-test/css-flexbox-1 [ Skip ]
+imported/csswg-test/css-fonts-3 [ Skip ]
+imported/csswg-test/css-gcpm-3 [ Skip ]
+imported/csswg-test/css-grid-1 [ Skip ]
+imported/csswg-test/css-images-3 [ Skip ]
+imported/csswg-test/css-lists-3 [ Skip ]
+imported/csswg-test/css-masking-1 [ Skip ]
+imported/csswg-test/css-multicol-1 [ Skip ]
+imported/csswg-test/css-namespaces-1 [ Skip ]
+imported/csswg-test/css-page-3 [ Skip ]
+imported/csswg-test/css-regions-1 [ Skip ]
+imported/csswg-test/css-ruby-1 [ Skip ]
+imported/csswg-test/css-shapes-1 [ Skip ]
+imported/csswg-test/css-speech-1 [ Skip ]
+imported/csswg-test/css-style-attr-1 [ Skip ]
+imported/csswg-test/css-syntax-3 [ Skip ]
+imported/csswg-test/css-tables-3 [ Skip ]
+imported/csswg-test/css-text-3 [ Skip ]
+imported/csswg-test/css-text-decor-3 [ Skip ]
+imported/csswg-test/css-transforms-1 [ Skip ]
+imported/csswg-test/css-transitions-1 [ Skip ]
+imported/csswg-test/css-ui-3 [ Skip ]
+imported/csswg-test/css-values-3 [ Skip ]
+imported/csswg-test/css-variables-1 [ Skip ]
+imported/csswg-test/css-writing-modes-3 [ Skip ]
+imported/csswg-test/css1 [ Skip ]
+imported/csswg-test/css21 [ Skip ]
+imported/csswg-test/cssom-1 [ Skip ]
+imported/csswg-test/cssom-view-1 [ Skip ]
+imported/csswg-test/filters-1 [ Skip ]
+imported/csswg-test/fonts [ Skip ]
+imported/csswg-test/geometry-1 [ Skip ]
+imported/csswg-test/mediaqueries-3 [ Skip ]
+imported/csswg-test/selectors-3 [ Skip ]
+imported/csswg-test/selectors-4 [ Skip ]
+imported/csswg-test/support [ Skip ]
+imported/csswg-test/tools [ Skip ]
+imported/csswg-test/vendor-imports [ Skip ]
+imported/csswg-test/work-in-progress [ Skip ]
+imported/csswg-test/.gitmodules [ Skip ]
+imported/csswg-test/.hgsubstate [ Skip ]
+imported/csswg-test/.htaccess [ Skip ]
 
-w3c/web-platform-tests/2dcontext [ Skip ]
-w3c/web-platform-tests/DOMEvents [ Skip ]
-w3c/web-platform-tests/FileAPI [ Skip ]
+imported/web-platform-tests/2dcontext [ Skip ]
+imported/web-platform-tests/DOMEvents [ Skip ]
+imported/web-platform-tests/FileAPI [ Skip ]
 # w3c/web-platform-tests/IndexedDB [ Pass ]
-w3c/web-platform-tests/WebCryptoAPI [ Skip ]
-w3c/web-platform-tests/WebIDL [ Skip ]
-w3c/web-platform-tests/XMLHttpRequest [ Skip ]
-w3c/web-platform-tests/ambient-light [ Skip ]
-w3c/web-platform-tests/animation-timing [ Skip ]
-w3c/web-platform-tests/app-uri [ Skip ]
-w3c/web-platform-tests/battery-status [ Skip ]
-w3c/web-platform-tests/common [ Skip ]
-w3c/web-platform-tests/config.default.json [ Skip ]
-w3c/web-platform-tests/conformance-checkers [ Skip ]
-w3c/web-platform-tests/content-security-policy [ Skip ]
-w3c/web-platform-tests/cors [ Skip ]
+imported/web-platform-tests/WebCryptoAPI [ Skip ]
+imported/web-platform-tests/WebIDL [ Skip ]
+imported/web-platform-tests/XMLHttpRequest [ Skip ]
+imported/web-platform-tests/ambient-light [ Skip ]
+imported/web-platform-tests/animation-timing [ Skip ]
+imported/web-platform-tests/app-uri [ Skip ]
+imported/web-platform-tests/battery-status [ Skip ]
+imported/web-platform-tests/common [ Skip ]
+imported/web-platform-tests/config.default.json [ Skip ]
+imported/web-platform-tests/conformance-checkers [ Skip ]
+imported/web-platform-tests/content-security-policy [ Skip ]
+imported/web-platform-tests/cors [ Skip ]
 # w3c/web-platform-tests/custom-elements [ Pass ]
-w3c/web-platform-tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass [ Skip ]
-w3c/web-platform-tests/dom [ Skip ]
-w3c/web-platform-tests/domparsing [ Skip ]
-w3c/web-platform-tests/domxpath [ Skip ]
-w3c/web-platform-tests/eventsource [ Skip ]
-w3c/web-platform-tests/ext-xhtml-pubid [ Skip ]
-w3c/web-platform-tests/fonts [ Skip ]
-w3c/web-platform-tests/geolocation-API [ Skip ]
-w3c/web-platform-tests/hr-time [ Skip ]
-w3c/web-platform-tests/html [ Skip ]
+imported/web-platform-tests/custom-elements/registering-custom-elements/unresolved-element-pseudoclass [ Skip ]
+imported/web-platform-tests/dom [ Skip ]
+imported/web-platform-tests/domparsing [ Skip ]
+imported/web-platform-tests/domxpath [ Skip ]
+imported/web-platform-tests/eventsource [ Skip ]
+imported/web-platform-tests/ext-xhtml-pubid [ Skip ]
+imported/web-platform-tests/fonts [ Skip ]
+imported/web-platform-tests/geolocation-API [ Skip ]
+imported/web-platform-tests/hr-time [ Skip ]
+imported/web-platform-tests/html [ Skip ]
 # w3c/web-platform-tests/html-imports [ Pass ]
-w3c/web-platform-tests/html-longdesc [ Skip ]
-w3c/web-platform-tests/html-media-capture [ Skip ]
-w3c/web-platform-tests/http [ Skip ]
-w3c/web-platform-tests/images [ Skip ]
-w3c/web-platform-tests/js [ Skip ]
-w3c/web-platform-tests/media [ Skip ]
-w3c/web-platform-tests/media-source [ Skip ]
+imported/web-platform-tests/html-longdesc [ Skip ]
+imported/web-platform-tests/html-media-capture [ Skip ]
+imported/web-platform-tests/http [ Skip ]
+imported/web-platform-tests/images [ Skip ]
+imported/web-platform-tests/js [ Skip ]
+imported/web-platform-tests/media [ Skip ]
+imported/web-platform-tests/media-source [ Skip ]
 # w3c/web-platform-tests/mediacapture-streams [ Pass ]
-w3c/web-platform-tests/microdata [ Skip ]
-w3c/web-platform-tests/navigation-timing [ Skip ]
-w3c/web-platform-tests/notifications [ Skip ]
-w3c/web-platform-tests/old-tests [ Skip ]
-w3c/web-platform-tests/page-visibility [ Skip ]
-w3c/web-platform-tests/performance-timeline [ Skip ]
-w3c/web-platform-tests/pointerevents [ Skip ]
-w3c/web-platform-tests/pointerlock [ Skip ]
-w3c/web-platform-tests/progress-events [ Skip ]
-w3c/web-platform-tests/proximity [ Skip ]
-w3c/web-platform-tests/quirks-mode [ Skip ]
-w3c/web-platform-tests/resource-timing [ Skip ]
-w3c/web-platform-tests/resources [ Skip ]
-w3c/web-platform-tests/selectors [ Skip ]
-w3c/web-platform-tests/selectors-api [ Skip ]
-w3c/web-platform-tests/serve.py [ Skip ]
-w3c/web-platform-tests/server-side.md [ Skip ]
-w3c/web-platform-tests/service-workers [ Skip ]
+imported/web-platform-tests/microdata [ Skip ]
+imported/web-platform-tests/navigation-timing [ Skip ]
+imported/web-platform-tests/notifications [ Skip ]
+imported/web-platform-tests/old-tests [ Skip ]
+imported/web-platform-tests/page-visibility [ Skip ]
+imported/web-platform-tests/performance-timeline [ Skip ]
+imported/web-platform-tests/pointerevents [ Skip ]
+imported/web-platform-tests/pointerlock [ Skip ]
+imported/web-platform-tests/progress-events [ Skip ]
+imported/web-platform-tests/proximity [ Skip ]
+imported/web-platform-tests/quirks-mode [ Skip ]
+imported/web-platform-tests/resource-timing [ Skip ]
+imported/web-platform-tests/resources [ Skip ]
+imported/web-platform-tests/selectors [ Skip ]
+imported/web-platform-tests/selectors-api [ Skip ]
+imported/web-platform-tests/serve.py [ Skip ]
+imported/web-platform-tests/server-side.md [ Skip ]
+imported/web-platform-tests/service-workers [ Skip ]
 # w3c/web-platform-tests/shadow-dom [ Pass ]
-w3c/web-platform-tests/tools [ Skip ]
-w3c/web-platform-tests/touch-events [ Skip ]
-w3c/web-platform-tests/typedarrays [ Skip ]
-w3c/web-platform-tests/url [ Skip ]
-w3c/web-platform-tests/user-timing [ Skip ]
-w3c/web-platform-tests/vibration [ Skip ]
-w3c/web-platform-tests/web-animations [ Skip ]
-w3c/web-platform-tests/webaudio [ Skip ]
-w3c/web-platform-tests/webdriver [ Skip ]
-w3c/web-platform-tests/webgl [ Skip ]
-w3c/web-platform-tests/webmessaging [ Skip ]
+imported/web-platform-tests/tools [ Skip ]
+imported/web-platform-tests/touch-events [ Skip ]
+imported/web-platform-tests/typedarrays [ Skip ]
+imported/web-platform-tests/url [ Skip ]
+imported/web-platform-tests/user-timing [ Skip ]
+imported/web-platform-tests/vibration [ Skip ]
+imported/web-platform-tests/web-animations [ Skip ]
+imported/web-platform-tests/webaudio [ Skip ]
+imported/web-platform-tests/webdriver [ Skip ]
+imported/web-platform-tests/webgl [ Skip ]
+imported/web-platform-tests/webmessaging [ Skip ]
 # w3c/web-platform-tests/webrtc [ Pass ]
-w3c/web-platform-tests/websockets [ Skip ]
-w3c/web-platform-tests/webstorage [ Skip ]
-w3c/web-platform-tests/webvtt [ Skip ]
-w3c/web-platform-tests/workers [ Skip ]
+imported/web-platform-tests/websockets [ Skip ]
+imported/web-platform-tests/webstorage [ Skip ]
+imported/web-platform-tests/webvtt [ Skip ]
+imported/web-platform-tests/workers [ Skip ]
 
 # Exceptions for individual files that fail due to bugs in the upstream tests
 # that we shouldn't bother importing until they are fixed.
 
 # Depends on spec bug: https://www.w3.org/Bugs/Public/show_bug.cgi?id=26492
-w3c/web-platform-tests/IndexedDB/key_invalid.htm [ Skip ]
+imported/web-platform-tests/IndexedDB/key_invalid.htm [ Skip ]
 
 # Many failures due to http://crbug.com/43394
-w3c/web-platform-tests/IndexedDB/interfaces.html [ Skip ]
+imported/web-platform-tests/IndexedDB/interfaces.html [ Skip ]
 
 # these contain an extraneous debug log div ..
-w3c/web-platform-tests/html-imports/link-import-null.html [ Skip ]
-w3c/web-platform-tests/html-imports/link-import.html [ Skip ]
-w3c/web-platform-tests/html-imports/loading-import.html [ Skip ]
+imported/web-platform-tests/html-imports/link-import-null.html [ Skip ]
+imported/web-platform-tests/html-imports/link-import.html [ Skip ]
+imported/web-platform-tests/html-imports/loading-import.html [ Skip ]
 
 # We'll never be able to test WebRTC deny tests since we always auto-allow
 # user media.
-w3c/web-platform-tests/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/deny.html [ Skip ]
+imported/web-platform-tests/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/deny.html [ Skip ]
 
 # crbug.com/404303: Was broken as of 2014-07-06.
-w3c/web-platform-tests/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/unknownkey-option-param.html
-w3c/web-platform-tests/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/empty-option-param.html
+imported/web-platform-tests/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/unknownkey-option-param.html
+imported/web-platform-tests/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/empty-option-param.html
 
 # uses link="reference" rather than link="match"
-w3c/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html [ Skip ]
-w3c/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html [ Skip ]
-w3c/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004.html [ Skip ]
-w3c/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005.html [ Skip ]
-w3c/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006.html [ Skip ]
-w3c/web-platform-tests/shadow-dom/shadow-trees/text-decoration-001.html [ Skip ]
-w3c/web-platform-tests/shadow-dom/styles/not-apply-in-shadow-root-001.html [ Skip ]
+imported/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html [ Skip ]
+imported/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html [ Skip ]
+imported/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004.html [ Skip ]
+imported/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005.html [ Skip ]
+imported/web-platform-tests/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006.html [ Skip ]
+imported/web-platform-tests/shadow-dom/shadow-trees/text-decoration-001.html [ Skip ]
+imported/web-platform-tests/shadow-dom/styles/not-apply-in-shadow-root-001.html [ Skip ]