Fix http test

tests/compiler/dart2js/zero_termination_test.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // A regression test for issue 22667.
 //
 // Makes sure that we don't print a '\0' character for files that are not
 // properly new-line terminated.
 library zero_termination_test;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'package:async_helper/async_helper.dart';
 import 'package:expect/expect.dart';
 import 'package:path/path.dart' as path;
 
+import 'launch_helper.dart' show launchDart2Js;
+
 Uri pathOfData = Platform.script;
 Directory tempDir;
 String outFilePath;
 
 _sendNotFound(HttpResponse response) {
   response.statusCode = HttpStatus.NOT_FOUND;
   response.close();
 }
 
 Future handleRequest(HttpRequest request) {
@@ skipping 11 matching lines @@
   });
 }
 
 void cleanup() {
   File outFile = new File(outFilePath);
   if (outFile.existsSync()) {
     outFile.deleteSync();
   }
 }
 
-Future launchDart2Js(args) {
-  String dart2jsPath = path.normalize(
-      path.join(path.fromUri(Platform.script),
-        '../../../../pkg/compiler/lib/src/dart2js.dart'));
-  List allArgs = [];
-  if (Platform.packageRoot != null) {
-    allArgs.add('--package-root=${Platform.packageRoot}');
-  } else if (Platform.packageConfig != null) {
-    allArgs.add('--packages=${Platform.packageConfig}');
-  }
-  allArgs.add(dart2jsPath);
-  allArgs.addAll(args);
-  return Process.run(Platform.executable, allArgs, stdoutEncoding: null);
-}
-
 void check(ProcessResult result) {
   Expect.notEquals(0, result.exitCode);
   List<int> stdout = result.stdout;
   String stdoutString = UTF8.decode(stdout);
   Expect.isTrue(stdoutString.contains("Error"));
   // Make sure the "499" from the last line is in the output.
   Expect.isTrue(stdoutString.contains("499"));
 
   // Make sure that the output does not contain any 0 character.
   Expect.isFalse(stdout.contains(0));
 }
 
 Future testFile() async {
   String inFilePath =
       pathOfData.resolve('data/one_line_dart_program.dart').path;
   List<String> args = [inFilePath, "--out=" + outFilePath];
 
   await cleanup();
-  check(await launchDart2Js(args));
+  check(await launchDart2Js(args, noStdoutEncoding: true));
   await cleanup();
 }
 
 Future serverRunning(HttpServer server) async {
   int port = server.port;
   String inFilePath = "http://127.0.0.1:$port/data/one_line_dart_program.dart";
   List<String> args = [inFilePath, "--out=" + outFilePath];
 
   server.listen(handleRequest);
   try {
     await cleanup();
-    check(await launchDart2Js(args));
+    check(await launchDart2Js(args, noStdoutEncoding: true));
   } finally {
     await server.close();
     await cleanup();
   }
 }
 
 Future testHttp() {
   return HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 0)
       .then((HttpServer server) => serverRunning(server));
 }
 
 runTests() async {
   tempDir = Directory.systemTemp.createTempSync('directory_test');
   outFilePath = path.join(tempDir.path, "out.js");
 
   try {
     await testFile();
     await testHttp();
   } finally {
     await tempDir.delete(recursive:true);
   }
 }
 
 main() {
   asyncStart();
   runTests().whenComplete(asyncEnd);
 }