Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests.

third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-style-intact-after-text.js

Index: third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-style-intact-after-text.js
diff --git a/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-style-intact-after-text.js b/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-style-intact-after-text.js
deleted file mode 100644
index ce0582a0794e89b8992d1a18beead75f3d119f96..0000000000000000000000000000000000000000
--- a/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-style-intact-after-text.js
+++ /dev/null
@@ -1,49 +0,0 @@
-description("Test that the rendering context's strokeStyle and fillStyle are intact after calling strokeText() and fillText()");
-var ctx = document.createElement('canvas').getContext('2d');
-
-ctx.fillStyle = 'red';
-ctx.fillRect(0, 0, 1, 1);
-
-debug("Checking initial state for sanity");
-var imageData = ctx.getImageData(0, 0, 2, 1);
-var imgdata = imageData.data;
-shouldBe("ctx.fillStyle", "'#ff0000'");
-shouldBe("imgdata[0]", "255");
-shouldBe("imgdata[1]", "0");
-shouldBe("imgdata[2]", "0");
-shouldBe("imgdata[3]", "255");
-shouldBe("imgdata[4]", "0");
-shouldBe("imgdata[5]", "0");
-shouldBe("imgdata[6]", "0");
-shouldBe("imgdata[7]", "0");
-
-debug("Calling fillText() to try and break the strokeStyle.");
-ctx.strokeStyle = 'green';
-ctx.lineWidth = 10;
-ctx.fillStyle = 'red';
-ctx.fillText("X", 0, 0);
-shouldBe("ctx.strokeStyle", "'#008000'");
-ctx.beginPath();
-ctx.moveTo(0, 0);
-ctx.lineTo(10, 10);
-ctx.stroke();
-imageData = ctx.getImageData(2, 2, 1, 1);
-imgdata = imageData.data;
-shouldBe("imgdata[0]", "0");
-shouldBe("imgdata[1]", "128");
-shouldBe("imgdata[2]", "0");
-shouldBe("imgdata[3]", "255");
-
-debug("Calling strokeText() to try and break the fillStyle.");
-ctx.strokeStyle = 'red';
-ctx.lineWidth = 100;
-ctx.fillStyle = 'green';
-ctx.strokeText("X", 0, 0);
-shouldBe("ctx.fillStyle", "'#008000'");
-ctx.fillRect(0, 0, 10, 10);
-imageData = ctx.getImageData(2, 2, 1, 1);
-imgdata = imageData.data;
-shouldBe("imgdata[0]", "0");
-shouldBe("imgdata[1]", "128");
-shouldBe("imgdata[2]", "0");
-shouldBe("imgdata[3]", "255");