From 175f8fdfe89d131508a74722ca1d9c39b7542cdc Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Mon, 3 Nov 2014 12:34:57 -0800
Subject: [PATCH] Replace <link rel="import"> with <import>

This CL is just a search-and-replace.

R=esprehn@chromium.org

Review URL: https://codereview.chromium.org/694423002
---
 .../constructor-calls-created-synchronously.sky      |  4 ++--
 .../custom-elements/document-register-basic.sky      |  4 ++--
 .../document-register-reentrant-null-constructor.sky |  4 ++--
 .../document-register-reentrant-returning-fake.sky   |  4 ++--
 ...ument-register-reentrant-throwing-constructor.sky |  4 ++--
 .../element-upgrade-no-register-and-leak.sky         |  2 +-
 .../html-element-type-extension-assert.sky           |  2 +-
 .../lifecycle-created-createElement-recursion.sky    |  2 +-
 .../lifecycle-created-createElement-reentrancy.sky   |  4 ++--
 .../lifecycle-created-parser-script.sky              |  4 ++--
 .../flutter/tests/inspector/css-computed-style.sky   |  4 ++--
 .../dom-mutation-modify-text-node-and-append.sky     |  2 +-
 engine/src/flutter/tests/inspector/dom-mutation.sky  |  4 ++--
 engine/src/flutter/tests/lowlevel/abarth.sky         |  2 +-
 .../flutter/tests/lowlevel/attribute-collection.sky  |  4 ++--
 engine/src/flutter/tests/lowlevel/camel-case.sky     |  4 ++--
 engine/src/flutter/tests/lowlevel/createElement.sky  |  4 ++--
 .../lowlevel/dom-implementation-create-document.sky  |  4 ++--
 engine/src/flutter/tests/lowlevel/hello-world.sky    |  2 +-
 engine/src/flutter/tests/lowlevel/query-selector.sky |  4 ++--
 engine/src/flutter/tests/lowlevel/scrollbar.sky      |  2 +-
 engine/src/flutter/tests/lowlevel/style-basic.sky    |  2 +-
 .../src/flutter/tests/lowlevel/style-specificity.sky |  4 ++--
 engine/src/flutter/tests/lowlevel/text.sky           |  2 +-
 engine/src/flutter/tests/mocha/describe-only.sky     |  4 ++--
 engine/src/flutter/tests/mocha/it-only.sky           |  4 ++--
 .../tests/mutation-observer/callback-arguments.sky   |  4 ++--
 .../clear-transient-without-delivery.sky             |  4 ++--
 .../mutation-observer/create-during-delivery.sky     |  4 ++--
 .../tests/mutation-observer/cross-document.sky       |  4 ++--
 .../tests/mutation-observer/delivery-order.sky       |  4 ++--
 .../mutation-observer/disconnect-cancel-pending.sky  |  4 ++--
 .../document-fragment-insertion.sky                  |  4 ++--
 .../mutation-observer/mutate-during-delivery.sky     |  4 ++--
 .../mutation-callback-non-element-crash.sky          |  2 +-
 .../mutation-observer-constructor.sky                |  4 ++--
 .../mutation-record-constructor.sky                  |  4 ++--
 .../mutation-observer/mutation-record-nullity.sky    |  4 ++--
 .../tests/mutation-observer/observe-attributes.sky   |  4 ++--
 .../mutation-observer/observe-characterdata.sky      |  4 ++--
 .../tests/mutation-observer/observe-childList.sky    |  4 ++--
 .../tests/mutation-observer/observe-exceptions.sky   |  4 ++--
 .../mutation-observer/observe-options-attributes.sky |  4 ++--
 .../observe-options-character-data.sky               |  4 ++--
 .../tests/mutation-observer/observe-subtree.sky      |  4 ++--
 .../observer-wrapper-dropoff-transient.sky           |  4 ++--
 .../tests/mutation-observer/script-append.sky        |  4 ++--
 .../flutter/tests/mutation-observer/shadow-dom.sky   |  4 ++--
 .../flutter/tests/mutation-observer/takeRecords.sky  |  4 ++--
 engine/src/flutter/tests/parser/comments.sky         |  2 +-
 engine/src/flutter/tests/parser/control-expected.txt |  2 +-
 engine/src/flutter/tests/parser/control.sky          |  2 +-
 engine/src/flutter/tests/parser/endtag-expected.txt  |  2 +-
 engine/src/flutter/tests/parser/endtag.sky           |  2 +-
 engine/src/flutter/tests/parser/entity-expected.txt  |  2 +-
 engine/src/flutter/tests/parser/entity.sky           |  2 +-
 engine/src/flutter/tests/parser/html-expected.txt    |  2 +-
 engine/src/flutter/tests/parser/html.sky             |  2 +-
 .../tests/parser/normaliser-crlf-expected.txt        |  2 +-
 engine/src/flutter/tests/parser/normaliser-crlf.sky  |  2 +-
 .../tests/parser/normaliser-null-expected.txt        |  2 +-
 engine/src/flutter/tests/parser/script-expected.txt  |  2 +-
 engine/src/flutter/tests/parser/script.sky           |  2 +-
 .../src/flutter/tests/parser/starttag-expected.txt   |  2 +-
 engine/src/flutter/tests/parser/starttag.sky         |  2 +-
 engine/src/flutter/tests/parser/style-expected.txt   |  2 +-
 engine/src/flutter/tests/parser/style.sky            |  2 +-
 engine/src/flutter/tests/parser/voidtag-expected.txt |  2 +-
 engine/src/flutter/tests/parser/voidtag.sky          |  2 +-
 engine/src/flutter/tests/services/buffer.sky         |  4 ++--
 engine/src/flutter/tests/services/codec.sky          |  4 ++--
 engine/src/flutter/tests/services/core.sky           |  4 ++--
 engine/src/flutter/tests/services/network.sky        | 12 ++++++------
 engine/src/flutter/tests/services/xhr.sky            |  6 +++---
 engine/src/flutter/tests/styles/border-parsing.sky   |  4 ++--
 engine/src/flutter/tests/styles/inline-style.sky     |  4 ++--
 76 files changed, 127 insertions(+), 127 deletions(-)

diff --git a/engine/src/flutter/tests/custom-elements/constructor-calls-created-synchronously.sky b/engine/src/flutter/tests/custom-elements/constructor-calls-created-synchronously.sky
index 5c4cd1ac39..39aa5ca699 100644
--- a/engine/src/flutter/tests/custom-elements/constructor-calls-created-synchronously.sky
+++ b/engine/src/flutter/tests/custom-elements/constructor-calls-created-synchronously.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <body>
 <div id="container"></div>
 <script>
diff --git a/engine/src/flutter/tests/custom-elements/document-register-basic.sky b/engine/src/flutter/tests/custom-elements/document-register-basic.sky
index 43cf3c376b..6679362fb6 100644
--- a/engine/src/flutter/tests/custom-elements/document-register-basic.sky
+++ b/engine/src/flutter/tests/custom-elements/document-register-basic.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <body>
 <div id="container"></div>
 <script>
diff --git a/engine/src/flutter/tests/custom-elements/document-register-reentrant-null-constructor.sky b/engine/src/flutter/tests/custom-elements/document-register-reentrant-null-constructor.sky
index 9b7f9251f0..b455f9d484 100644
--- a/engine/src/flutter/tests/custom-elements/document-register-reentrant-null-constructor.sky
+++ b/engine/src/flutter/tests/custom-elements/document-register-reentrant-null-constructor.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/dump-as-text.sky" />
-<link rel="import" href="resources/document-register-fuzz.sky" as="fuzzer" />
+<import src="../resources/dump-as-text.sky" />
+<import src="resources/document-register-fuzz.sky" as="fuzzer" />
 <body>
 <div id="container"></div>
 Fuzzing document.registerElement() through getters. PASS unless crash.
diff --git a/engine/src/flutter/tests/custom-elements/document-register-reentrant-returning-fake.sky b/engine/src/flutter/tests/custom-elements/document-register-reentrant-returning-fake.sky
index 9aca0a525c..3b616f032f 100644
--- a/engine/src/flutter/tests/custom-elements/document-register-reentrant-returning-fake.sky
+++ b/engine/src/flutter/tests/custom-elements/document-register-reentrant-returning-fake.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/dump-as-text.sky" />
-<link rel="import" href="resources/document-register-fuzz.sky" as="fuzzer" />
+<import src="../resources/dump-as-text.sky" />
+<import src="resources/document-register-fuzz.sky" as="fuzzer" />
 <body>
 <div id="container"></div>
 Fuzzing document.registerElement() through getters. PASS uless crash.
diff --git a/engine/src/flutter/tests/custom-elements/document-register-reentrant-throwing-constructor.sky b/engine/src/flutter/tests/custom-elements/document-register-reentrant-throwing-constructor.sky
index 404052d269..56848976e1 100644
--- a/engine/src/flutter/tests/custom-elements/document-register-reentrant-throwing-constructor.sky
+++ b/engine/src/flutter/tests/custom-elements/document-register-reentrant-throwing-constructor.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/dump-as-text.sky" />
-<link rel="import" href="resources/document-register-fuzz.sky" as="fuzzer" />
+<import src="../resources/dump-as-text.sky" />
+<import src="resources/document-register-fuzz.sky" as="fuzzer" />
 <body>
 <div id="container"></div>
 Fuzzing document.registerElement() through getters. PASS unless crash.
diff --git a/engine/src/flutter/tests/custom-elements/element-upgrade-no-register-and-leak.sky b/engine/src/flutter/tests/custom-elements/element-upgrade-no-register-and-leak.sky
index f64b053f43..64a19165b5 100644
--- a/engine/src/flutter/tests/custom-elements/element-upgrade-no-register-and-leak.sky
+++ b/engine/src/flutter/tests/custom-elements/element-upgrade-no-register-and-leak.sky
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-text.sky" />
+<import src="../resources/dump-as-text.sky" />
 <body>
 Tests unresolved element not leaking if never resolved.
 <div id="container"></div>
diff --git a/engine/src/flutter/tests/custom-elements/html-element-type-extension-assert.sky b/engine/src/flutter/tests/custom-elements/html-element-type-extension-assert.sky
index e0b4495a97..812c5f64b6 100644
--- a/engine/src/flutter/tests/custom-elements/html-element-type-extension-assert.sky
+++ b/engine/src/flutter/tests/custom-elements/html-element-type-extension-assert.sky
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-text.sky" />
+<import src="../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
diff --git a/engine/src/flutter/tests/custom-elements/lifecycle-created-createElement-recursion.sky b/engine/src/flutter/tests/custom-elements/lifecycle-created-createElement-recursion.sky
index 14772ee1b9..360ed92b84 100644
--- a/engine/src/flutter/tests/custom-elements/lifecycle-created-createElement-recursion.sky
+++ b/engine/src/flutter/tests/custom-elements/lifecycle-created-createElement-recursion.sky
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-text.sky" />
+<import src="../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>"; } } }) });
diff --git a/engine/src/flutter/tests/custom-elements/lifecycle-created-createElement-reentrancy.sky b/engine/src/flutter/tests/custom-elements/lifecycle-created-createElement-reentrancy.sky
index 1e10246bfe..8e90dce0a5 100644
--- a/engine/src/flutter/tests/custom-elements/lifecycle-created-createElement-reentrancy.sky
+++ b/engine/src/flutter/tests/custom-elements/lifecycle-created-createElement-reentrancy.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/dump-as-text.sky" />
-<link rel="import" href="../resources/chai.sky" />
+<import src="../resources/dump-as-text.sky" />
+<import src="../resources/chai.sky" />
 <body>
 This test ensures that  is visible in following script block.
 <script>
diff --git a/engine/src/flutter/tests/custom-elements/lifecycle-created-parser-script.sky b/engine/src/flutter/tests/custom-elements/lifecycle-created-parser-script.sky
index d0099c40af..85dbfaaec5 100644
--- a/engine/src/flutter/tests/custom-elements/lifecycle-created-parser-script.sky
+++ b/engine/src/flutter/tests/custom-elements/lifecycle-created-parser-script.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/dump-as-text.sky" />
-<link rel="import" href="../resources/chai.sky" />
+<import src="../resources/dump-as-text.sky" />
+<import src="../resources/chai.sky" />
 <body>
 This test ensures that the lifecycle callback of a parser-made element is visible in following script block.
 <script>
diff --git a/engine/src/flutter/tests/inspector/css-computed-style.sky b/engine/src/flutter/tests/inspector/css-computed-style.sky
index 9662ca851b..f85b3bb367 100644
--- a/engine/src/flutter/tests/inspector/css-computed-style.sky
+++ b/engine/src/flutter/tests/inspector/css-computed-style.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="/sky/framework/inspector/css-agent.sky" as="CSSAgent" />
+<import src="../resources/chai.sky" />
+<import src="/sky/framework/inspector/css-agent.sky" as="CSSAgent" />
 <script>
 var fakeDOMAgent = {
   getNodeForId: function(id) {
diff --git a/engine/src/flutter/tests/inspector/dom-mutation-modify-text-node-and-append.sky b/engine/src/flutter/tests/inspector/dom-mutation-modify-text-node-and-append.sky
index b32e75025b..b5e32ac8fa 100644
--- a/engine/src/flutter/tests/inspector/dom-mutation-modify-text-node-and-append.sky
+++ b/engine/src/flutter/tests/inspector/dom-mutation-modify-text-node-and-append.sky
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="/sky/framework/inspector/dom-agent.sky" as="DOMAgent" />
+<import src="/sky/framework/inspector/dom-agent.sky" as="DOMAgent" />
 <div></div>
 <script>
 // FIXME: This shows a bug in our DOM mutation handling, we should
diff --git a/engine/src/flutter/tests/inspector/dom-mutation.sky b/engine/src/flutter/tests/inspector/dom-mutation.sky
index abc01911b9..8c6f1aed44 100644
--- a/engine/src/flutter/tests/inspector/dom-mutation.sky
+++ b/engine/src/flutter/tests/inspector/dom-mutation.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="/sky/framework/inspector/dom-agent.sky" as="DOMAgent" />
+<import src="../resources/chai.sky" />
+<import src="/sky/framework/inspector/dom-agent.sky" as="DOMAgent" />
 <div><div></div></div>
 <script>
 // setTimeout to flush pending DOM modifications and measure
diff --git a/engine/src/flutter/tests/lowlevel/abarth.sky b/engine/src/flutter/tests/lowlevel/abarth.sky
index 248fec8657..f604ce2199 100644
--- a/engine/src/flutter/tests/lowlevel/abarth.sky
+++ b/engine/src/flutter/tests/lowlevel/abarth.sky
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<link rel="import" href="../resources/dump-as-render-tree.sky" />
+<import src="../resources/dump-as-render-tree.sky" />
 <title>Adam Barth</title>
 <style>
 html {
diff --git a/engine/src/flutter/tests/lowlevel/attribute-collection.sky b/engine/src/flutter/tests/lowlevel/attribute-collection.sky
index f8c6f9e3ce..a402c2502c 100644
--- a/engine/src/flutter/tests/lowlevel/attribute-collection.sky
+++ b/engine/src/flutter/tests/lowlevel/attribute-collection.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/mocha.sky" />
-<link rel="import" href="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
 <script>
 describe("Attribute collection", function() {
   var div;
diff --git a/engine/src/flutter/tests/lowlevel/camel-case.sky b/engine/src/flutter/tests/lowlevel/camel-case.sky
index fade0ebc4f..98369abb13 100644
--- a/engine/src/flutter/tests/lowlevel/camel-case.sky
+++ b/engine/src/flutter/tests/lowlevel/camel-case.sky
@@ -1,6 +1,6 @@
 <CamelCase>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('Element tag names', function() {
   it('should have various casing', function() {
diff --git a/engine/src/flutter/tests/lowlevel/createElement.sky b/engine/src/flutter/tests/lowlevel/createElement.sky
index 165ddc3f57..0c9d9ec76a 100644
--- a/engine/src/flutter/tests/lowlevel/createElement.sky
+++ b/engine/src/flutter/tests/lowlevel/createElement.sky
@@ -1,6 +1,6 @@
 <test>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('createElementNS tests from mozilla, attached to webkit bug 16833', function() {
   it('should behave like mozilla', function() {
diff --git a/engine/src/flutter/tests/lowlevel/dom-implementation-create-document.sky b/engine/src/flutter/tests/lowlevel/dom-implementation-create-document.sky
index 810d96bab6..62e65b382b 100644
--- a/engine/src/flutter/tests/lowlevel/dom-implementation-create-document.sky
+++ b/engine/src/flutter/tests/lowlevel/dom-implementation-create-document.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('DOMImplementation', function() {
   it('should let you create a document', function() {
diff --git a/engine/src/flutter/tests/lowlevel/hello-world.sky b/engine/src/flutter/tests/lowlevel/hello-world.sky
index a9128e0d30..472440db8f 100644
--- a/engine/src/flutter/tests/lowlevel/hello-world.sky
+++ b/engine/src/flutter/tests/lowlevel/hello-world.sky
@@ -1,4 +1,4 @@
 <foo>
-<link rel="import" href="../resources/dump-as-render-tree.sky" />
+<import src="../resources/dump-as-render-tree.sky" />
 Hello World!
 </foo>
diff --git a/engine/src/flutter/tests/lowlevel/query-selector.sky b/engine/src/flutter/tests/lowlevel/query-selector.sky
index 74250783b6..dd7d2564e8 100644
--- a/engine/src/flutter/tests/lowlevel/query-selector.sky
+++ b/engine/src/flutter/tests/lowlevel/query-selector.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/mocha.sky" />
-<link rel="import" href="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
 <div id="tests">
   <div id="id1">
     <div class="class2"></div>
diff --git a/engine/src/flutter/tests/lowlevel/scrollbar.sky b/engine/src/flutter/tests/lowlevel/scrollbar.sky
index a4c668c115..8e6ee90c67 100644
--- a/engine/src/flutter/tests/lowlevel/scrollbar.sky
+++ b/engine/src/flutter/tests/lowlevel/scrollbar.sky
@@ -1,6 +1,6 @@
 <sky>
     <scroller style="overflow: scroll; height: 400px;">
-        <link rel="import" href="../resources/dump-as-render-tree.sky" />
+        <import src="../resources/dump-as-render-tree.sky" />
         <style>
             div { height: 100px; }
         </style>
diff --git a/engine/src/flutter/tests/lowlevel/style-basic.sky b/engine/src/flutter/tests/lowlevel/style-basic.sky
index 08d009f578..6d5b7ca24e 100644
--- a/engine/src/flutter/tests/lowlevel/style-basic.sky
+++ b/engine/src/flutter/tests/lowlevel/style-basic.sky
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-<link rel="import" href="../resources/dump-as-text.sky" />
+<import src="../resources/dump-as-text.sky" />
 <style>
     #id1 { order: 1; }
     .class2 { order: 2; }
diff --git a/engine/src/flutter/tests/lowlevel/style-specificity.sky b/engine/src/flutter/tests/lowlevel/style-specificity.sky
index 7844451136..e9b559064b 100644
--- a/engine/src/flutter/tests/lowlevel/style-specificity.sky
+++ b/engine/src/flutter/tests/lowlevel/style-specificity.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <style>
     #sandbox { color: red; }
     .blue { color: blue; }
diff --git a/engine/src/flutter/tests/lowlevel/text.sky b/engine/src/flutter/tests/lowlevel/text.sky
index 8bdce6e8b5..b0a4834265 100644
--- a/engine/src/flutter/tests/lowlevel/text.sky
+++ b/engine/src/flutter/tests/lowlevel/text.sky
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-text.sky" />
+<import src="../resources/dump-as-text.sky" />
 <body>
 This is a dump-as-text test.
 </body>
diff --git a/engine/src/flutter/tests/mocha/describe-only.sky b/engine/src/flutter/tests/mocha/describe-only.sky
index ac5424c255..62da377d81 100644
--- a/engine/src/flutter/tests/mocha/describe-only.sky
+++ b/engine/src/flutter/tests/mocha/describe-only.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 
 describe.only('This suite', function() {
diff --git a/engine/src/flutter/tests/mocha/it-only.sky b/engine/src/flutter/tests/mocha/it-only.sky
index de7706d3e4..616016a96b 100644
--- a/engine/src/flutter/tests/mocha/it-only.sky
+++ b/engine/src/flutter/tests/mocha/it-only.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 
 describe('This suite', function() {
diff --git a/engine/src/flutter/tests/mutation-observer/callback-arguments.sky b/engine/src/flutter/tests/mutation-observer/callback-arguments.sky
index 3fbdda491b..ea4a27266c 100644
--- a/engine/src/flutter/tests/mutation-observer/callback-arguments.sky
+++ b/engine/src/flutter/tests/mutation-observer/callback-arguments.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('MutationObserver', function() {
     it('should pass the callback and observer arguments', function(done) {
diff --git a/engine/src/flutter/tests/mutation-observer/clear-transient-without-delivery.sky b/engine/src/flutter/tests/mutation-observer/clear-transient-without-delivery.sky
index 3eb91f72a0..60938dcb85 100644
--- a/engine/src/flutter/tests/mutation-observer/clear-transient-without-delivery.sky
+++ b/engine/src/flutter/tests/mutation-observer/clear-transient-without-delivery.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('Transient registrations', function() {
     it('should be cleared even without delivery', function(done) {
diff --git a/engine/src/flutter/tests/mutation-observer/create-during-delivery.sky b/engine/src/flutter/tests/mutation-observer/create-during-delivery.sky
index 71e5fe23f6..40158e24f1 100644
--- a/engine/src/flutter/tests/mutation-observer/create-during-delivery.sky
+++ b/engine/src/flutter/tests/mutation-observer/create-during-delivery.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 window.jsTestIsAsync = true;
 
diff --git a/engine/src/flutter/tests/mutation-observer/cross-document.sky b/engine/src/flutter/tests/mutation-observer/cross-document.sky
index 05f3cfb2f4..580e3b72ef 100644
--- a/engine/src/flutter/tests/mutation-observer/cross-document.sky
+++ b/engine/src/flutter/tests/mutation-observer/cross-document.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('MutationObserver cross document moves', function() {
     it('should handle basic observation', function(done) {
diff --git a/engine/src/flutter/tests/mutation-observer/delivery-order.sky b/engine/src/flutter/tests/mutation-observer/delivery-order.sky
index 5139e95156..2a1f65a951 100644
--- a/engine/src/flutter/tests/mutation-observer/delivery-order.sky
+++ b/engine/src/flutter/tests/mutation-observer/delivery-order.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('MutationObserver', function() {
     it('should deliver in order of creation', function(done) {
diff --git a/engine/src/flutter/tests/mutation-observer/disconnect-cancel-pending.sky b/engine/src/flutter/tests/mutation-observer/disconnect-cancel-pending.sky
index 234580f853..83cab7c17e 100644
--- a/engine/src/flutter/tests/mutation-observer/disconnect-cancel-pending.sky
+++ b/engine/src/flutter/tests/mutation-observer/disconnect-cancel-pending.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('MutationObserver.disconnect', function() {
     it('should cancel pending delivery', function(done) {
diff --git a/engine/src/flutter/tests/mutation-observer/document-fragment-insertion.sky b/engine/src/flutter/tests/mutation-observer/document-fragment-insertion.sky
index ee9e83eb4a..ddaff1c110 100644
--- a/engine/src/flutter/tests/mutation-observer/document-fragment-insertion.sky
+++ b/engine/src/flutter/tests/mutation-observer/document-fragment-insertion.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/mocha.sky" />
-<link rel="import" href="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
 <script>
 describe('DocumentFragments should remove all children of the fragment before moving children, ', function() {
   var mutations;
diff --git a/engine/src/flutter/tests/mutation-observer/mutate-during-delivery.sky b/engine/src/flutter/tests/mutation-observer/mutate-during-delivery.sky
index 76a0632579..41ec4c787e 100644
--- a/engine/src/flutter/tests/mutation-observer/mutate-during-delivery.sky
+++ b/engine/src/flutter/tests/mutation-observer/mutate-during-delivery.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('MutationObserver', function() {
   it('should not interrupt delivery order on getting mutations during delivery', function(done) {
diff --git a/engine/src/flutter/tests/mutation-observer/mutation-callback-non-element-crash.sky b/engine/src/flutter/tests/mutation-observer/mutation-callback-non-element-crash.sky
index 9e5eb65a5b..a6c4ff401d 100644
--- a/engine/src/flutter/tests/mutation-observer/mutation-callback-non-element-crash.sky
+++ b/engine/src/flutter/tests/mutation-observer/mutation-callback-non-element-crash.sky
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-text.sky" />
+<import src="../resources/dump-as-text.sky" />
 <body id="body">
 <script>
 function mutationCallback(mutations, observer) {
diff --git a/engine/src/flutter/tests/mutation-observer/mutation-observer-constructor.sky b/engine/src/flutter/tests/mutation-observer/mutation-observer-constructor.sky
index 385f45e2cf..ce6749a575 100644
--- a/engine/src/flutter/tests/mutation-observer/mutation-observer-constructor.sky
+++ b/engine/src/flutter/tests/mutation-observer/mutation-observer-constructor.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('MutationObserver', function() {
     var observer = new MutationObserver(function(mutations) { });
diff --git a/engine/src/flutter/tests/mutation-observer/mutation-record-constructor.sky b/engine/src/flutter/tests/mutation-observer/mutation-record-constructor.sky
index df1c999e52..2c1d9de58f 100644
--- a/engine/src/flutter/tests/mutation-observer/mutation-record-constructor.sky
+++ b/engine/src/flutter/tests/mutation-observer/mutation-record-constructor.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('MutationRecord', function() {
   it('should be exposed on window but not constructable', function() {
diff --git a/engine/src/flutter/tests/mutation-observer/mutation-record-nullity.sky b/engine/src/flutter/tests/mutation-observer/mutation-record-nullity.sky
index 93a751b013..f32da64092 100644
--- a/engine/src/flutter/tests/mutation-observer/mutation-record-nullity.sky
+++ b/engine/src/flutter/tests/mutation-observer/mutation-record-nullity.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('Non-relevant properties on mutation records should be null, except for NodeLists, which should be empty', function() {
 
diff --git a/engine/src/flutter/tests/mutation-observer/observe-attributes.sky b/engine/src/flutter/tests/mutation-observer/observe-attributes.sky
index 9710bf0e51..c824351fc7 100644
--- a/engine/src/flutter/tests/mutation-observer/observe-attributes.sky
+++ b/engine/src/flutter/tests/mutation-observer/observe-attributes.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('MutationObserver.observe on attributes', function() {
   it('should handle basic aspects of attribute observation', function(done) {
diff --git a/engine/src/flutter/tests/mutation-observer/observe-characterdata.sky b/engine/src/flutter/tests/mutation-observer/observe-characterdata.sky
index 146b7b0fa2..21f2de6cea 100644
--- a/engine/src/flutter/tests/mutation-observer/observe-characterdata.sky
+++ b/engine/src/flutter/tests/mutation-observer/observe-characterdata.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <body id="body">
 <script>
 document.body = document.getElementById("body");
diff --git a/engine/src/flutter/tests/mutation-observer/observe-childList.sky b/engine/src/flutter/tests/mutation-observer/observe-childList.sky
index f2aa91ba70..63b8532114 100644
--- a/engine/src/flutter/tests/mutation-observer/observe-childList.sky
+++ b/engine/src/flutter/tests/mutation-observer/observe-childList.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('MutationObserver.observe on childList', function() {
   it('should handle basic observation', function(done) {
diff --git a/engine/src/flutter/tests/mutation-observer/observe-exceptions.sky b/engine/src/flutter/tests/mutation-observer/observe-exceptions.sky
index 7d8a107b42..973940396f 100644
--- a/engine/src/flutter/tests/mutation-observer/observe-exceptions.sky
+++ b/engine/src/flutter/tests/mutation-observer/observe-exceptions.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('MutationObserver observe', function() {
   it('should throw on invalid input', function() {
diff --git a/engine/src/flutter/tests/mutation-observer/observe-options-attributes.sky b/engine/src/flutter/tests/mutation-observer/observe-options-attributes.sky
index f7d756b765..b284bbb654 100644
--- a/engine/src/flutter/tests/mutation-observer/observe-options-attributes.sky
+++ b/engine/src/flutter/tests/mutation-observer/observe-options-attributes.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('MutationObserver.observe', function() {
   it('should observe attributes', function() {
diff --git a/engine/src/flutter/tests/mutation-observer/observe-options-character-data.sky b/engine/src/flutter/tests/mutation-observer/observe-options-character-data.sky
index ce56a62adb..2c37510ae7 100644
--- a/engine/src/flutter/tests/mutation-observer/observe-options-character-data.sky
+++ b/engine/src/flutter/tests/mutation-observer/observe-options-character-data.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('Test MutationObserver.observe', function() {
   it('should respect character data options', function() {
diff --git a/engine/src/flutter/tests/mutation-observer/observe-subtree.sky b/engine/src/flutter/tests/mutation-observer/observe-subtree.sky
index 8840532f79..98800a1d88 100644
--- a/engine/src/flutter/tests/mutation-observer/observe-subtree.sky
+++ b/engine/src/flutter/tests/mutation-observer/observe-subtree.sky
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('MutationObserver.observe on a subtree', function() {
   it('should handle basic aspects of subtree observation', function(done) {
diff --git a/engine/src/flutter/tests/mutation-observer/observer-wrapper-dropoff-transient.sky b/engine/src/flutter/tests/mutation-observer/observer-wrapper-dropoff-transient.sky
index 1c5fcb3e8b..30465437c5 100644
--- a/engine/src/flutter/tests/mutation-observer/observer-wrapper-dropoff-transient.sky
+++ b/engine/src/flutter/tests/mutation-observer/observer-wrapper-dropoff-transient.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../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) {
diff --git a/engine/src/flutter/tests/mutation-observer/script-append.sky b/engine/src/flutter/tests/mutation-observer/script-append.sky
index 837358894b..fa2d747727 100644
--- a/engine/src/flutter/tests/mutation-observer/script-append.sky
+++ b/engine/src/flutter/tests/mutation-observer/script-append.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('MutationObserver', function() {
     it('should not invoke callbacks when appending a script', function() {
diff --git a/engine/src/flutter/tests/mutation-observer/shadow-dom.sky b/engine/src/flutter/tests/mutation-observer/shadow-dom.sky
index ca7b8857eb..43a20f6ba2 100644
--- a/engine/src/flutter/tests/mutation-observer/shadow-dom.sky
+++ b/engine/src/flutter/tests/mutation-observer/shadow-dom.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <div id="range"></div>
 <script>
 describe('MutationObservers', function() {
diff --git a/engine/src/flutter/tests/mutation-observer/takeRecords.sky b/engine/src/flutter/tests/mutation-observer/takeRecords.sky
index 1dceae896f..ba8a274aec 100644
--- a/engine/src/flutter/tests/mutation-observer/takeRecords.sky
+++ b/engine/src/flutter/tests/mutation-observer/takeRecords.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <script>
 describe('MutationObserver.takeRecords', function() {
   it('should allow taking records synchronously or getting a notification', function(done) {
diff --git a/engine/src/flutter/tests/parser/comments.sky b/engine/src/flutter/tests/parser/comments.sky
index 81cfd5b0dc..7a8d70f79b 100644
--- a/engine/src/flutter/tests/parser/comments.sky
+++ b/engine/src/flutter/tests/parser/comments.sky
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-text.sky" />
+<import src="../resources/dump-as-text.sky" />
 <body>
 <
 <!
diff --git a/engine/src/flutter/tests/parser/control-expected.txt b/engine/src/flutter/tests/parser/control-expected.txt
index bf614e3e03..dbe196fcb5 100644
--- a/engine/src/flutter/tests/parser/control-expected.txt
+++ b/engine/src/flutter/tests/parser/control-expected.txt
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky"></link>
+<import src="../resources/dump-as-markup.sky"></import>
 <body>
 THIS TEST SHOULD PASS
 (control test for success)
diff --git a/engine/src/flutter/tests/parser/control.sky b/engine/src/flutter/tests/parser/control.sky
index ddcd9cc118..07751126d6 100644
--- a/engine/src/flutter/tests/parser/control.sky
+++ b/engine/src/flutter/tests/parser/control.sky
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky" />
+<import src="../resources/dump-as-markup.sky" />
 <body>
 THIS TEST SHOULD PASS
 (control test for success)
diff --git a/engine/src/flutter/tests/parser/endtag-expected.txt b/engine/src/flutter/tests/parser/endtag-expected.txt
index 908013bea6..3ac826c6c4 100644
--- a/engine/src/flutter/tests/parser/endtag-expected.txt
+++ b/engine/src/flutter/tests/parser/endtag-expected.txt
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky"></link>
+<import src="../resources/dump-as-markup.sky"></import>
 <body>
 
 <diva>1</diva>
diff --git a/engine/src/flutter/tests/parser/endtag.sky b/engine/src/flutter/tests/parser/endtag.sky
index 6f0a6f6342..d130002319 100644
--- a/engine/src/flutter/tests/parser/endtag.sky
+++ b/engine/src/flutter/tests/parser/endtag.sky
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky"></link>
+<import src="../resources/dump-as-markup.sky"></import>
 <body>
 
 <diva>1</diva>
diff --git a/engine/src/flutter/tests/parser/entity-expected.txt b/engine/src/flutter/tests/parser/entity-expected.txt
index a7750f157e..84a78d314d 100644
--- a/engine/src/flutter/tests/parser/entity-expected.txt
+++ b/engine/src/flutter/tests/parser/entity-expected.txt
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky"></link>
+<import src="../resources/dump-as-markup.sky"></import>
 <body>
 <div>aaa'bbb</div>
 <div>&lt;</div>
diff --git a/engine/src/flutter/tests/parser/entity.sky b/engine/src/flutter/tests/parser/entity.sky
index 95227d3a49..42593c448c 100644
--- a/engine/src/flutter/tests/parser/entity.sky
+++ b/engine/src/flutter/tests/parser/entity.sky
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky" />
+<import src="../resources/dump-as-markup.sky" />
 <body>
 <div>aaa&apos;bbb</div>
 <div>&lt;</div>
diff --git a/engine/src/flutter/tests/parser/html-expected.txt b/engine/src/flutter/tests/parser/html-expected.txt
index 63c2f1cdde..d050c426dc 100644
--- a/engine/src/flutter/tests/parser/html-expected.txt
+++ b/engine/src/flutter/tests/parser/html-expected.txt
@@ -1,6 +1,6 @@
 &lt;!DOCTYPE HTML&gt;
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky"></link>
+<import src="../resources/dump-as-markup.sky"></import>
 <body>
 
 A &lt;!DOCTYPE HTMLAGAIN&gt;
diff --git a/engine/src/flutter/tests/parser/html.sky b/engine/src/flutter/tests/parser/html.sky
index eb16312bf4..58d455ad35 100644
--- a/engine/src/flutter/tests/parser/html.sky
+++ b/engine/src/flutter/tests/parser/html.sky
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky"></link>
+<import src="../resources/dump-as-markup.sky"></import>
 <body>
 
 A <!DOCTYPE HTMLAGAIN>
diff --git a/engine/src/flutter/tests/parser/normaliser-crlf-expected.txt b/engine/src/flutter/tests/parser/normaliser-crlf-expected.txt
index 964136e0e2..d2ba21350e 100644
--- a/engine/src/flutter/tests/parser/normaliser-crlf-expected.txt
+++ b/engine/src/flutter/tests/parser/normaliser-crlf-expected.txt
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky"></link>
+<import src="../resources/dump-as-markup.sky"></import>
 <body>
 <div>
 </div>
diff --git a/engine/src/flutter/tests/parser/normaliser-crlf.sky b/engine/src/flutter/tests/parser/normaliser-crlf.sky
index b898f2b435..6ecbdaad6c 100644
--- a/engine/src/flutter/tests/parser/normaliser-crlf.sky
+++ b/engine/src/flutter/tests/parser/normaliser-crlf.sky
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky" />
+<import src="../resources/dump-as-markup.sky" />
 <body>
 <div></div>
 <div>
diff --git a/engine/src/flutter/tests/parser/normaliser-null-expected.txt b/engine/src/flutter/tests/parser/normaliser-null-expected.txt
index 18b4d1ea2b..cd143f83de 100644
--- a/engine/src/flutter/tests/parser/normaliser-null-expected.txt
+++ b/engine/src/flutter/tests/parser/normaliser-null-expected.txt
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky" />
+<import src="../resources/dump-as-markup.sky" />
 <body>
 <div>�</div>
 <div>�����</div>
diff --git a/engine/src/flutter/tests/parser/script-expected.txt b/engine/src/flutter/tests/parser/script-expected.txt
index 76e4aae64b..60eeb70e70 100644
--- a/engine/src/flutter/tests/parser/script-expected.txt
+++ b/engine/src/flutter/tests/parser/script-expected.txt
@@ -13,7 +13,7 @@ SOURCE: http://127.0.0.1:8000/parser/script.sky:38
 ERROR: Uncaught SyntaxError: Unexpected token } 
 SOURCE: http://127.0.0.1:8000/parser/script.sky:43
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky"></link>
+<import src="../resources/dump-as-markup.sky"></import>
 <body>
 
 <script>
diff --git a/engine/src/flutter/tests/parser/script.sky b/engine/src/flutter/tests/parser/script.sky
index 7d44eb3ebe..d715a8c4ef 100644
--- a/engine/src/flutter/tests/parser/script.sky
+++ b/engine/src/flutter/tests/parser/script.sky
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky"></link>
+<import src="../resources/dump-as-markup.sky"></import>
 <body>
 
 <script>
diff --git a/engine/src/flutter/tests/parser/starttag-expected.txt b/engine/src/flutter/tests/parser/starttag-expected.txt
index db3ad5c293..90b05d1bfc 100644
--- a/engine/src/flutter/tests/parser/starttag-expected.txt
+++ b/engine/src/flutter/tests/parser/starttag-expected.txt
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky"></link>
+<import src="../resources/dump-as-markup.sky"></import>
 <body>
 
  <a>1</a>
diff --git a/engine/src/flutter/tests/parser/starttag.sky b/engine/src/flutter/tests/parser/starttag.sky
index fc56f31436..e5c80d1f16 100644
--- a/engine/src/flutter/tests/parser/starttag.sky
+++ b/engine/src/flutter/tests/parser/starttag.sky
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky"></link>
+<import src="../resources/dump-as-markup.sky"></import>
 <body>
 
  <a>1</a>
diff --git a/engine/src/flutter/tests/parser/style-expected.txt b/engine/src/flutter/tests/parser/style-expected.txt
index 2c4eb18f13..23df5d5042 100644
--- a/engine/src/flutter/tests/parser/style-expected.txt
+++ b/engine/src/flutter/tests/parser/style-expected.txt
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky"></link>
+<import src="../resources/dump-as-markup.sky"></import>
 <body>
 
 <style>
diff --git a/engine/src/flutter/tests/parser/style.sky b/engine/src/flutter/tests/parser/style.sky
index c3bec9f15f..61ae3a6939 100644
--- a/engine/src/flutter/tests/parser/style.sky
+++ b/engine/src/flutter/tests/parser/style.sky
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky"></link>
+<import src="../resources/dump-as-markup.sky"></import>
 <body>
 
 <style>
diff --git a/engine/src/flutter/tests/parser/voidtag-expected.txt b/engine/src/flutter/tests/parser/voidtag-expected.txt
index 14aa6a5171..53031b9ace 100644
--- a/engine/src/flutter/tests/parser/voidtag-expected.txt
+++ b/engine/src/flutter/tests/parser/voidtag-expected.txt
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky"></link>
+<import src="../resources/dump-as-markup.sky"></import>
 <body>
 
  <p></p>               a 
diff --git a/engine/src/flutter/tests/parser/voidtag.sky b/engine/src/flutter/tests/parser/voidtag.sky
index 54d6c11250..7f7df4a975 100644
--- a/engine/src/flutter/tests/parser/voidtag.sky
+++ b/engine/src/flutter/tests/parser/voidtag.sky
@@ -1,5 +1,5 @@
 <html>
-<link rel="import" href="../resources/dump-as-markup.sky"></link>
+<import src="../resources/dump-as-markup.sky"></import>
 <body>
 
  <p/>               a </p>
diff --git a/engine/src/flutter/tests/services/buffer.sky b/engine/src/flutter/tests/services/buffer.sky
index 1f2d6b2df4..3a9312000a 100644
--- a/engine/src/flutter/tests/services/buffer.sky
+++ b/engine/src/flutter/tests/services/buffer.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/dump-as-text.sky" />
-<link rel="import" href="/mojo/public/sky/buffer.sky" as="buffer" />
+<import src="../resources/dump-as-text.sky" />
+<import src="/mojo/public/sky/buffer.sky" as="buffer" />
 <div id="result">FAIL</div>
 <script>
 document.getElementById("result").textContent =
diff --git a/engine/src/flutter/tests/services/codec.sky b/engine/src/flutter/tests/services/codec.sky
index 8ddd1a9f0f..e2a3cbcfd9 100644
--- a/engine/src/flutter/tests/services/codec.sky
+++ b/engine/src/flutter/tests/services/codec.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/dump-as-text.sky" />
-<link rel="import" href="/mojo/public/sky/codec.sky" as="codec" />
+<import src="../resources/dump-as-text.sky" />
+<import src="/mojo/public/sky/codec.sky" as="codec" />
 <div id="result">FAIL</div>
 <script>
 document.getElementById("result").textContent =
diff --git a/engine/src/flutter/tests/services/core.sky b/engine/src/flutter/tests/services/core.sky
index 1a8a3cded5..58bbe32b26 100644
--- a/engine/src/flutter/tests/services/core.sky
+++ b/engine/src/flutter/tests/services/core.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/dump-as-text.sky" />
-<link rel="import" href="/mojo/public/sky/core.sky" as="core" />
+<import src="../resources/dump-as-text.sky" />
+<import src="/mojo/public/sky/core.sky" as="core" />
 <div id="result">FAIL</div>
 <script>
 document.getElementById("result").textContent =
diff --git a/engine/src/flutter/tests/services/network.sky b/engine/src/flutter/tests/services/network.sky
index 54d1549496..01c54ff887 100644
--- a/engine/src/flutter/tests/services/network.sky
+++ b/engine/src/flutter/tests/services/network.sky
@@ -1,10 +1,10 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
-<link rel="import" href="/mojo/public/sky/core.sky" as="core" />
-<link rel="import" href="/mojo/public/sky/connection.sky" as="connection" />
-<link rel="import" href="/mojo/services/public/interfaces/network/network_service.mojom.sky" as="net" />
-<link rel="import" href="/mojo/services/public/interfaces/network/url_loader.mojom.sky" as="loader" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
+<import src="/mojo/public/sky/core.sky" as="core" />
+<import src="/mojo/public/sky/connection.sky" as="connection" />
+<import src="/mojo/services/public/interfaces/network/network_service.mojom.sky" as="net" />
+<import src="/mojo/services/public/interfaces/network/url_loader.mojom.sky" as="loader" />
 <script>
 describe('Mojo network_service', function() {
   this.enableTimeouts(false);
diff --git a/engine/src/flutter/tests/services/xhr.sky b/engine/src/flutter/tests/services/xhr.sky
index 5a3f3d2f93..cc96cdc0a8 100644
--- a/engine/src/flutter/tests/services/xhr.sky
+++ b/engine/src/flutter/tests/services/xhr.sky
@@ -1,7 +1,7 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
-<link rel="import" href="/sky/framework/xmlhttprequest.sky" as="XMLHttpRequest" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
+<import src="/sky/framework/xmlhttprequest.sky" as="XMLHttpRequest" />
 <script>
 describe('XMLHttpRequest', function() {
   this.enableTimeouts(false);
diff --git a/engine/src/flutter/tests/styles/border-parsing.sky b/engine/src/flutter/tests/styles/border-parsing.sky
index dff2db427b..c9ffcbd03d 100644
--- a/engine/src/flutter/tests/styles/border-parsing.sky
+++ b/engine/src/flutter/tests/styles/border-parsing.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/mocha.sky" />
-<link rel="import" href="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
 <foo />
 <script>
 describe('Border', function() {
diff --git a/engine/src/flutter/tests/styles/inline-style.sky b/engine/src/flutter/tests/styles/inline-style.sky
index acdbf6b728..429a37061e 100644
--- a/engine/src/flutter/tests/styles/inline-style.sky
+++ b/engine/src/flutter/tests/styles/inline-style.sky
@@ -1,6 +1,6 @@
 <html>
-<link rel="import" href="../resources/chai.sky" />
-<link rel="import" href="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <foo />
 <script>