Fix some test failures.

Author: Edward Z. Yang ext:(%22)

tests/HTML5/TestDataTest.php

@@ -7,8 +7,8 @@ class HTML5_TestDataTest extends UnitTestCase
     function testSample() {
         $data = new HTML5_TestData(dirname(__FILE__) . '/TestDataTest/sample.dat');
         $this->assertIdentical($data->tests, array(
-            array('data' => "Foo\n", 'des' => "Bar\n"),
-            array('data' => "Foo\n")
+            array('data' => "Foo", 'des' => "Bar"),
+            array('data' => "Foo")
         ));
     }
     function testStrDom() {

tests/HTML5/TokenizerPositionTest.php

@@ -7,8 +7,8 @@ class HTML5_PositionTestableTokenizer extends HTML5_TestableTokenizer
     public $outputLines = array();
     public $outputCols  = array();
     private $characterTokens = array();
-    protected function emitToken($token, $checkStream = true) {
-        parent::emitToken($token, $checkStream);
+    protected function emitToken($token, $checkStream = true, $dry = false) {
+        parent::emitToken($token, $checkStream, $dry);
         // XXX: The tests should really include the parse errors, but I'm lazy.
         switch ($token['type']) {
             case self::PARSEERROR: