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
2014-11-03 12:34:57 -08:00 · 2014-11-03 12:34:57 -08:00 · 175f8fdfe8
commit 175f8fdfe8
parent 5473994cea
76 changed files with 127 additions and 127 deletions
--- 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>
--- 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>
--- 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.
--- 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.
--- 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.
--- 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>
--- 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
--- 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>"; } } }) });
--- 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>
--- 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>
--- 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) {
--- 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
--- 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
--- 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 {
--- 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;
--- 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() {
--- 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() {
--- 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() {
--- 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>
--- 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>
--- 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>
--- 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; }
--- 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; }
--- 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>
--- 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() {
--- 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() {
--- 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) {
--- 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) {
--- 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;

--- 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) {
--- 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) {
--- 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) {
--- 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;
--- 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) {
--- 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) {
--- 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) { });
--- 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() {
--- 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() {

--- 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) {
--- 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");
--- 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) {
--- 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() {
--- 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() {
--- 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() {
--- 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) {
--- 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) {
--- 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() {
--- 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() {
--- 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) {
--- 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>
 <
 <!
--- 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)
--- 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)
--- 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>
--- 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>
--- 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>
--- 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>
--- 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;
--- 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>
--- 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>
--- 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>
--- 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><3E></div>
 <div><3E><><EFBFBD><EFBFBD><EFBFBD></div>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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 
--- 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>
--- 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 =
--- 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 =
--- 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 =
--- 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);
--- 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);
--- 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() {
--- 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>