Move the tests from .html to .sky

R=abarth@chromium.org Review URL: https://codereview.chromium.org/685623002

Move the tests from .html to .sky
R=abarth@chromium.org Review URL: https://codereview.chromium.org/685623002
de0ba17e · Hixie · c198c321 · de0ba17e · de0ba17e · de0ba17e
83 changed file
--- a/tests/TestExpectations
+++ b/tests/TestExpectations
@@ -3,12 +3,12 @@
 crbug.com/1 editing/ [ Skip ]

 # These tests require gc() to be exposed.
-crbug.com/1 mutation-observer/observer-wrapper-dropoff-transient.html [ Skip ]
-crbug.com/1 mutation-observer/observer-wrapper-dropoff.html [ Skip ]
-crbug.com/1 mutation-observer/transient-gc-crash.html [ Skip ]
-crbug.com/1 mutation-observer/weak-callback-gc-crash.html [ Skip ]
+crbug.com/1 mutation-observer/observer-wrapper-dropoff-transient.sky [ Skip ]
+crbug.com/1 mutation-observer/observer-wrapper-dropoff.sky [ Skip ]
+crbug.com/1 mutation-observer/transient-gc-crash.sky [ Skip ]
+crbug.com/1 mutation-observer/weak-callback-gc-crash.sky [ Skip ]

 # We need to land the new inspector backend
 Bug(abarth) inspector [ Skip ]

-Bug(abarth) services/network.html [ Crash ]
+Bug(abarth) services/network.sky [ Crash ]
--- a/tests/custom-elements/constructor-calls-created-synchronously.html
+++ b/tests/custom-elements/constructor-calls-created-synchronously.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <body>
 <div id="container"></div>
 <script>

--- a/tests/custom-elements/document-register-basic.html
+++ b/tests/custom-elements/document-register-basic.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <body>
 <div id="container"></div>
 <script>

--- a/tests/custom-elements/document-register-reentrant-null-constructor.html
+++ b/tests/custom-elements/document-register-reentrant-null-constructor.html
 <html>
-<link rel="import" href="../resources/dump-as-text.html" />
-<link rel="import" href="resources/document-register-fuzz.html" as="fuzzer" />
+<link rel="import" href="../resources/dump-as-text.sky" />
+<link rel="import" href="resources/document-register-fuzz.sky" as="fuzzer" />
 <body>
 <div id="container"></div>
 Fuzzing document.registerElement() through getters. PASS unless crash.

--- a/tests/custom-elements/document-register-reentrant-returning-fake.html
+++ b/tests/custom-elements/document-register-reentrant-returning-fake.html
 <html>
-<link rel="import" href="../resources/dump-as-text.html" />
-<link rel="import" href="resources/document-register-fuzz.html" as="fuzzer" />
+<link rel="import" href="../resources/dump-as-text.sky" />
+<link rel="import" href="resources/document-register-fuzz.sky" as="fuzzer" />
 <body>
 <div id="container"></div>
 Fuzzing document.registerElement() through getters. PASS uless crash.

--- a/tests/custom-elements/document-register-reentrant-throwing-constructor.html
+++ b/tests/custom-elements/document-register-reentrant-throwing-constructor.html
 <html>
-<link rel="import" href="../resources/dump-as-text.html" />
-<link rel="import" href="resources/document-register-fuzz.html" as="fuzzer" />
+<link rel="import" href="../resources/dump-as-text.sky" />
+<link rel="import" href="resources/document-register-fuzz.sky" as="fuzzer" />
 <body>
 <div id="container"></div>
 Fuzzing document.registerElement() through getters. PASS unless crash.

--- a/tests/custom-elements/element-upgrade-no-register-and-leak.html
+++ b/tests/custom-elements/element-upgrade-no-register-and-leak.html
 <html>
-<link rel="import" href="../resources/dump-as-text.html" />
+<link rel="import" href="../resources/dump-as-text.sky" />
 <body>
 Tests unresolved element not leaking if never resolved.
 <div id="container"></div>

--- a/tests/custom-elements/html-element-type-extension-assert.html
+++ b/tests/custom-elements/html-element-type-extension-assert.html
 <html>
-<link rel="import" href="../resources/dump-as-text.html" />
+<link rel="import" href="../resources/dump-as-text.sky" />
 <body>
 <section id="a" is="x-a"></section>
 Tests that type extension of a element whose DOM interface is HTMLElement does not assert

--- a/tests/custom-elements/lifecycle-created-createElement-recursion.html
+++ b/tests/custom-elements/lifecycle-created-createElement-recursion.html
 <html>
-<link rel="import" href="../resources/dump-as-text.html" />
+<link rel="import" href="../resources/dump-as-text.sky" />
 <body>
 <script>
 document.registerElement("x-foo", { prototype: Object.create(HTMLElement.prototype, { createdCallback: { value: function () { this.innerHTML = "<x-foo>Hello</x-foo>"; } } }) });

--- a/tests/custom-elements/lifecycle-created-createElement-reentrancy.html
+++ b/tests/custom-elements/lifecycle-created-createElement-reentrancy.html
 <html>
-<link rel="import" href="../resources/dump-as-text.html" />
-<link rel="import" href="../resources/chai.html" />
+<link rel="import" href="../resources/dump-as-text.sky" />
+<link rel="import" href="../resources/chai.sky" />
 <body>
 This test ensures that  is visible in following script block.
 <script>

--- a/tests/custom-elements/lifecycle-created-parser-script.html
+++ b/tests/custom-elements/lifecycle-created-parser-script.html
 <html>
-<link rel="import" href="../resources/dump-as-text.html" />
-<link rel="import" href="../resources/chai.html" />
+<link rel="import" href="../resources/dump-as-text.sky" />
+<link rel="import" href="../resources/chai.sky" />
 <body>
 This test ensures that the lifecycle callback of a parser-made element is visible in following script block.
 <script>

--- a/tests/custom-elements/resources/document-register-fuzz.html
+++ b/tests/custom-elements/resources/document-register-fuzz.html
--- a/tests/editing/backspace.html
+++ b/tests/editing/backspace.html
--- a/tests/editing/replace.html
+++ b/tests/editing/replace.html
--- a/tests/editing/selection.html
+++ b/tests/editing/selection.html
--- a/tests/editing/typing.html
+++ b/tests/editing/typing.html
--- a/tests/http/conf/mime.types
+++ b/tests/http/conf/mime.types
@@ -543,6 +543,7 @@ text/rfc822-headers
 text/richtext			rtx
 text/rtf			rtf
 text/sgml			sgml sgm
+text/sky			sky
 text/t140
 text/tab-separated-values	tsv
 text/uri-list

--- a/tests/inspector/dom-mutation-modify-text-node-and-append.html
+++ b/tests/inspector/dom-mutation-modify-text-node-and-append.html
 <html>
-<link rel="import" href="inspector/backend/dom-agent.html" as="DOMAgent" />
+<link rel="import" href="inspector/backend/dom-agent.sky" as="DOMAgent" />
 <div></div>
 <script>
 // FIXME: This shows a bug in our DOM mutation handling, we should

--- a/tests/inspector/dom-mutation.html
+++ b/tests/inspector/dom-mutation.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="inspector/backend/dom-agent.html" as="DOMAgent" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="inspector/backend/dom-agent.sky" as="DOMAgent" />
 <div><div></div></div>
 <script>
 // setTimeout to flush pending DOM modifications and measure

--- a/tests/lowlevel/abarth.html
+++ b/tests/lowlevel/abarth.html
 <!DOCTYPE html>
 <html>
 <head>
-<link rel="import" href="../resources/dump-as-render-tree.html" />
+<link rel="import" href="../resources/dump-as-render-tree.sky" />
 <title>Adam Barth</title>
 <style>
 html {

--- a/tests/lowlevel/attribute-collection.html
+++ b/tests/lowlevel/attribute-collection.html
 <html>
-<link rel="import" href="../resources/mocha.html" />
-<link rel="import" href="../resources/chai.html" />
+<link rel="import" href="../resources/mocha.sky" />
+<link rel="import" href="../resources/chai.sky" />
 <script>
 describe("Attribute collection", function() {
  var div;

--- a/tests/lowlevel/camel-case.html
+++ b/tests/lowlevel/camel-case.html
 <CamelCase>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('Element tag names', function() {
  it('should have various casing', function() {

--- a/tests/lowlevel/createElement.html
+++ b/tests/lowlevel/createElement.html
 <test>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('createElementNS tests from mozilla, attached to webkit bug 16833', function() {
  it('should behave like mozilla', function() {

--- a/tests/lowlevel/dom-implementation-create-document.html
+++ b/tests/lowlevel/dom-implementation-create-document.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('DOMImplementation', function() {
  it('should let you create a document', function() {

--- a/tests/lowlevel/hello-world.html
+++ b/tests/lowlevel/hello-world.html
-<foo>
-<link rel="import" href="../resources/dump-as-render-tree.html" />
-Hello World!
-</foo>
--- a/tests/lowlevel/hello-world.sky
+++ b/tests/lowlevel/hello-world.sky
+<foo>
+<link rel="import" href="../resources/dump-as-render-tree.sky" />
+Hello World!
+</foo>
--- a/tests/lowlevel/query-selector.html
+++ b/tests/lowlevel/query-selector.html
 <html>
-<link rel="import" href="../resources/mocha.html" />
-<link rel="import" href="../resources/chai.html" />
+<link rel="import" href="../resources/mocha.sky" />
+<link rel="import" href="../resources/chai.sky" />
 <div id="tests">
  <div id="id1">
    <div class="class2"></div>

--- a/tests/lowlevel/scrollbar.html
+++ b/tests/lowlevel/scrollbar.html
 <sky>
    <scroller style="overflow: scroll; height: 400px;">
-        <link rel="import" href="../resources/dump-as-render-tree.html" />
+        <link rel="import" href="../resources/dump-as-render-tree.sky" />
        <style>
            div { height: 100px; }
        </style>

--- a/tests/lowlevel/style-basic.html
+++ b/tests/lowlevel/style-basic.html
 <!DOCTYPE html>
 <html>
-<link rel="import" href="../resources/dump-as-text.html" />
+<link rel="import" href="../resources/dump-as-text.sky" />
 <style>
    #id1 { order: 1; }
    .class2 { order: 2; }

--- a/tests/lowlevel/style-specificity.html
+++ b/tests/lowlevel/style-specificity.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <style>
    #sandbox { color: red; }
    .blue { color: blue; }

--- a/tests/lowlevel/text.html
+++ b/tests/lowlevel/text.html
 <html>
-<link rel="import" href="../resources/dump-as-text.html" />
+<link rel="import" href="../resources/dump-as-text.sky" />
 <body>
 This is a dump-as-text test.
 </body>

--- a/tests/mocha/describe-only.html
+++ b/tests/mocha/describe-only.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>

 describe.only('This suite', function() {

--- a/tests/mocha/it-only.html
+++ b/tests/mocha/it-only.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>

 describe('This suite', function() {

--- a/tests/modules/basic-expected.txt
+++ b/tests/modules/basic-expected.txt
-PASS: pass.html succesfully exported this string.
+PASS: pass.sky succesfully exported this string.
--- a/tests/modules/basic.html
+++ b/tests/modules/basic.html
 <html>
-<link rel="import" href="../resources/dump-as-text.html" />
-<link rel="import" href="resources/pass.html" as="hello" />
+<link rel="import" href="../resources/dump-as-text.sky" />
+<link rel="import" href="resources/pass.sky" as="hello" />
 <div id="result">FAIL</div>
 <script>
 document.getElementById("result").textContent = hello;

--- a/tests/modules/imports-can-import-expected.txt
+++ b/tests/modules/imports-can-import-expected.txt
-{"message":"PASS: pass.html succesfully exported this string."}
+{"message":"PASS: pass.sky succesfully exported this string."}
--- a/tests/modules/imports-can-import.html
+++ b/tests/modules/imports-can-import.html
 <html>
-<link rel="import" href="resources/intermediate.html" as="chocolate" />
+<link rel="import" href="resources/intermediate.sky" as="chocolate" />
 <div id="result">FAIL</div>
 <script>
 document.getElementById("result").textContent = JSON.stringify(chocolate);

--- a/tests/modules/resources/intermediate.html
+++ b/tests/modules/resources/intermediate.html
-<link rel="import" href="../../resources/dump-as-text.html" />
-<link rel="import" href="pass.html" as="banana" />
+<link rel="import" href="../../resources/dump-as-text.sky" />
+<link rel="import" href="pass.sky" as="banana" />
 <script>
 this.exports = {
  message: banana,

--- a/tests/modules/resources/pass.html
+++ b/tests/modules/resources/pass.html
-<script>
-this.exports = "PASS: pass.html succesfully exported this string."
-</script>
--- a/tests/modules/resources/pass.sky
+++ b/tests/modules/resources/pass.sky
+<script>
+this.exports = "PASS: pass.sky succesfully exported this string."
+</script>
--- a/tests/mutation-observer/callback-arguments.html
+++ b/tests/mutation-observer/callback-arguments.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('MutationObserver', function() {
    it('should pass the callback and observer arguments', function(done) {

--- a/tests/mutation-observer/clear-transient-without-delivery.html
+++ b/tests/mutation-observer/clear-transient-without-delivery.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('Transient registrations', function() {
    it('should be cleared even without delivery', function(done) {

--- a/tests/mutation-observer/create-during-delivery.html
+++ b/tests/mutation-observer/create-during-delivery.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 window.jsTestIsAsync = true;


--- a/tests/mutation-observer/cross-document.html
+++ b/tests/mutation-observer/cross-document.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('MutationObserver cross document moves', function() {
    it('should handle basic observation', function(done) {

--- a/tests/mutation-observer/delivery-order.html
+++ b/tests/mutation-observer/delivery-order.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('MutationObserver', function() {
    it('should deliver in order of creation', function(done) {

--- a/tests/mutation-observer/disconnect-cancel-pending.html
+++ b/tests/mutation-observer/disconnect-cancel-pending.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('MutationObserver.disconnect', function() {
    it('should cancel pending delivery', function(done) {

--- a/tests/mutation-observer/document-fragment-insertion.html
+++ b/tests/mutation-observer/document-fragment-insertion.html
 <html>
-<link rel="import" href="../resources/mocha.html" />
-<link rel="import" href="../resources/chai.html" />
+<link rel="import" href="../resources/mocha.sky" />
+<link rel="import" href="../resources/chai.sky" />
 <script>
 describe('DocumentFragments should remove all children of the fragment before moving children, ', function() {
  var mutations;

--- a/tests/mutation-observer/mutate-during-delivery.html
+++ b/tests/mutation-observer/mutate-during-delivery.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('MutationObserver', function() {
  it('should not interrupt delivery order on getting mutations during delivery', function(done) {

--- a/tests/mutation-observer/mutation-callback-non-element-crash.html
+++ b/tests/mutation-observer/mutation-callback-non-element-crash.html
 <html>
-<link rel="import" href="../resources/dump-as-text.html" />
+<link rel="import" href="../resources/dump-as-text.sky" />
 <body id="body">
 <script>
 function mutationCallback(mutations, observer) {

--- a/tests/mutation-observer/mutation-observer-constructor.html
+++ b/tests/mutation-observer/mutation-observer-constructor.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('MutationObserver', function() {
    var observer = new MutationObserver(function(mutations) { });

--- a/tests/mutation-observer/mutation-record-constructor.html
+++ b/tests/mutation-observer/mutation-record-constructor.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('MutationRecord', function() {
  it('should be exposed on window but not constructable', function() {

--- a/tests/mutation-observer/mutation-record-nullity.html
+++ b/tests/mutation-observer/mutation-record-nullity.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('Non-relevant properties on mutation records should be null, except for NodeLists, which should be empty', function() {


--- a/tests/mutation-observer/observe-attributes.html
+++ b/tests/mutation-observer/observe-attributes.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('MutationObserver.observe on attributes', function() {
  it('should handle basic aspects of attribute observation', function(done) {

--- a/tests/mutation-observer/observe-characterdata.html
+++ b/tests/mutation-observer/observe-characterdata.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <body id="body">
 <script>
 document.body = document.getElementById("body");

--- a/tests/mutation-observer/observe-childList.html
+++ b/tests/mutation-observer/observe-childList.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('MutationObserver.observe on childList', function() {
  it('should handle basic observation', function(done) {

--- a/tests/mutation-observer/observe-exceptions.html
+++ b/tests/mutation-observer/observe-exceptions.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('MutationObserver observe', function() {
  it('should throw on invalid input', function() {

--- a/tests/mutation-observer/observe-options-attributes.html
+++ b/tests/mutation-observer/observe-options-attributes.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('MutationObserver.observe', function() {
  it('should observe attributes', function() {

--- a/tests/mutation-observer/observe-options-character-data.html
+++ b/tests/mutation-observer/observe-options-character-data.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('Test MutationObserver.observe', function() {
  it('should respect character data options', function() {

--- a/tests/mutation-observer/observe-subtree.html
+++ b/tests/mutation-observer/observe-subtree.html
 <!DOCTYPE html>
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('MutationObserver.observe on a subtree', function() {
  it('should handle basic aspects of subtree observation', function(done) {

--- a/tests/mutation-observer/observer-wrapper-dropoff-transient.html
+++ b/tests/mutation-observer/observer-wrapper-dropoff-transient.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('MutationObserver wrappers', function() {
    it('should survive GC for passing into the callback even if JS has lost references and the only remaining observations are transient.', function(done) {

--- a/tests/mutation-observer/observer-wrapper-dropoff.html
+++ b/tests/mutation-observer/observer-wrapper-dropoff.html
--- a/tests/mutation-observer/script-append.html
+++ b/tests/mutation-observer/script-append.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('MutationObserver', function() {
    it('should not invoke callbacks when appending a script', function() {

--- a/tests/mutation-observer/shadow-dom.html
+++ b/tests/mutation-observer/shadow-dom.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <div id="range"></div>
 <script>
 describe('MutationObservers', function() {

--- a/tests/mutation-observer/takeRecords.html
+++ b/tests/mutation-observer/takeRecords.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <script>
 describe('MutationObserver.takeRecords', function() {
  it('should allow taking records synchronously or getting a notification', function(done) {

--- a/tests/mutation-observer/transient-gc-crash.html
+++ b/tests/mutation-observer/transient-gc-crash.html
--- a/tests/mutation-observer/weak-callback-gc-crash.html
+++ b/tests/mutation-observer/weak-callback-gc-crash.html
--- a/tests/parser/comments.html
+++ b/tests/parser/comments.html
 <html>
-<link rel="import" href="../resources/dump-as-text.html" />
+<link rel="import" href="../resources/dump-as-text.sky" />
 <body>
 <
 <!

--- a/tests/parser/entity-expected.txt
+++ b/tests/parser/entity-expected.txt
 <html>
-<link rel="import" href="../resources/dump-as-markup.html"></link>
+<link rel="import" href="../resources/dump-as-markup.sky"></link>
 <body>
 <div>aaa'bbb</div>
 <div>&lt;</div>

--- a/tests/parser/entity.html
+++ b/tests/parser/entity.html
 <html>
-<link rel="import" href="../resources/dump-as-markup.html" />
+<link rel="import" href="../resources/dump-as-markup.sky" />
 <body>
 <div>aaa&apos;bbb</div>
 <div>&lt;</div>

--- a/tests/resources/chai.html
+++ b/tests/resources/chai.html
--- a/tests/resources/dump-as-markup.html
+++ b/tests/resources/dump-as-markup.html
--- a/tests/resources/dump-as-render-tree.html
+++ b/tests/resources/dump-as-render-tree.html
--- a/tests/resources/dump-as-text.html
+++ b/tests/resources/dump-as-text.html
--- a/tests/resources/js-test.html
+++ b/tests/resources/js-test.html
--- a/tests/resources/mocha.html
+++ b/tests/resources/mocha.html
--- a/tests/services/buffer.html
+++ b/tests/services/buffer.html
 <html>
-<link rel="import" href="../resources/dump-as-text.html" />
+<link rel="import" href="../resources/dump-as-text.sky" />
 <link rel="import" href="/mojo/public/html/buffer.html" as="buffer" />
 <div id="result">FAIL</div>
 <script>

--- a/tests/services/codec.html
+++ b/tests/services/codec.html
 <html>
-<link rel="import" href="../resources/dump-as-text.html" />
+<link rel="import" href="../resources/dump-as-text.sky" />
 <link rel="import" href="/mojo/public/html/codec.html" as="codec" />
 <div id="result">FAIL</div>
 <script>

--- a/tests/services/core.html
+++ b/tests/services/core.html
 <html>
-<link rel="import" href="../resources/dump-as-text.html" />
+<link rel="import" href="../resources/dump-as-text.sky" />
 <link rel="import" href="/mojo/public/html/core.html" as="core" />
 <div id="result">FAIL</div>
 <script>

--- a/tests/services/network.html
+++ b/tests/services/network.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <link rel="import" href="/mojo/public/html/core.html" as="core" />
 <link rel="import" href="/mojo/public/html/connection.html" as="connection" />
 <link rel="import" href="/mojo/services/public/interfaces/network/network_service.mojom.html" as="net" />

--- a/tests/styles/border-parsing.html
+++ b/tests/styles/border-parsing.html
 <html>
-<link rel="import" href="../resources/mocha.html" />
-<link rel="import" href="../resources/chai.html" />
+<link rel="import" href="../resources/mocha.sky" />
+<link rel="import" href="../resources/chai.sky" />
 <foo />
 <script>
 describe('Border', function() {

--- a/tests/styles/inline-style.html
+++ b/tests/styles/inline-style.html
 <html>
-<link rel="import" href="../resources/chai.html" />
-<link rel="import" href="../resources/mocha.html" />
+<link rel="import" href="../resources/chai.sky" />
+<link rel="import" href="../resources/mocha.sky" />
 <foo />
 <script>


--- a/tools/skydb
+++ b/tools/skydb
@@ -17,6 +17,7 @@ MOJO_SHELL_PATH = os.path.abspath(os.path.join(__file__, os.pardir, os.pardir,

 SUPPORTED_MIME_TYPES = [
    'text/html',
+    'text/sky',
    'text/plain',
 ]


--- a/tools/webkitpy/layout_tests/port/base.py
+++ b/tools/webkitpy/layout_tests/port/base.py
@@ -228,7 +228,7 @@ class Port(object):
        if driver_name == self.MOJO_SHELL_NAME:
            return [
                '--args-for=mojo://native_viewport_service/ --use-headless-config',
-                '--content-handlers=text/html,mojo://sky_viewer/',
+                '--content-handlers=text/sky,mojo://sky_viewer/',
                '--url-mappings=mojo:window_manager=mojo:sky_tester',
                'mojo:window_manager',
            ]
@@ -725,7 +725,7 @@ class Port(object):
        return [self.relative_test_filename(f) for f in files]

    # When collecting test cases, we include any file with these extensions.
-    _supported_file_extensions = set(['.html'])
+    _supported_file_extensions = set(['.sky'])

    @staticmethod
    # If any changes are made here be sure to update the isUsedInReftest method in old-run-webkit-tests as well.